FCL/sftools/fbf/projects/packages: changeset 141:27d9d356efbf

--- a/symbian3/app/camera/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/camera/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,14 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/app/camera/camerauis/activepalette/group"/>
@@ -87,9 +95,6 @@
           </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="/sf/app/camera/camera_plat/group"/>
-          </component>
           <component name="camera_plat_test" filter="s60,test,api_test" long-name="Camera Apps Platform API Tests" purpose="development">
             <!-- can only have one unit. #include from a single bld.inf? -->
             <unit bldFile="/sf/app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/>

--- a/symbian3/app/camera/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/camera/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,24 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="camera" name="Camera Apps">
-    <collection id="camerauis" name="Camera UIs">
-      <component id="activepalette" filter="s60" name="Active Palette">
-        <unit bldFile="camerauis/activepalette/group"/>
-      </component>
-      <component id="cameraapp" filter="s60" name="Camera Application">
-        <unit bldFile="camerauis/cameraapp/group"/>
-        <unit bldFile="camerauis/cameraapp/help/group"/>
-      </component>
-    </collection>
-    <collection id="camera_info" name="Camera Apps Info">
-      <component id="camera_plat" filter="s60" name="Camera Apps Platform Interfaces" class="api">
-        <unit bldFile="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="camera_plat/camcorder_ui_constants_api/tsrc/group"/>
-      	<unit bldFile="camera_plat/active_palette_2_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="camera" 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" href="camera_plat/camcorder_ui_constants_api/camcorder_ui_constants_api.metaxml"/>
+    <unit bldFile="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" href="camera_plat/active_palette_2_api/active_palette_2_api.metaxml"/>
+    <unit bldFile="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="camerauis/activepalette/group"/>
+   </component>
+   <component id="cameraapp" filter="s60" name="Camera Application">
+    <unit bldFile="camerauis/cameraapp/group"/>
+    <unit bldFile="camerauis/cameraapp/help/group"/>
+   </component>
+  </collection>
+  <collection id="camera_info" name="Camera Apps Info">
+   <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="camera_plat/camcorder_ui_constants_api/tsrc/group"/>
+    <unit bldFile="camera_plat/active_palette_2_api/tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/commonemail/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,82 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
-      <block name="commonemail" level="apps" long-name="Email Apps" levels="service support ui app">
+      <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/commonemail/emailservices/emailframework/group"/>
@@ -180,7 +196,7 @@
             <unit bldFile="/sf/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
           </component>
           <component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-            <!-- can the exports be broken up into the other components ?
+            <!-- can the exports be broken up into the other components ?
 			alternatively, move the exports into a RM Config component-->
             <unit bldFile="/sf/app/commonemail/meetingrequest/group"/>
           </component>
@@ -212,12 +228,6 @@
             <!-- 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="/sf/app/commonemail/email_plat/group"/>
-          </component>
-          <component name="email_pub" filter="s60" long-name="Email Apps Public Interfaces" class="api">
-            <unit bldFile="/sf/app/commonemail/email_pub/group"/>
-          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/app/commonemail/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/commonemail/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="commonemail" 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" href="email_pub/email_widget_api/email_widget_api.metaxml"/>
+    <unit bldFile="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" href="email_plat/email_client_api/email_client_api.metaxml"/>
+    <unit bldFile="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" href="email_plat/email_setup_plugin_api/email_setup_plugin_api.metaxml"/>
+    <unit bldFile="email_plat/email_setup_plugin_api/group"/>
+   </component>
+   <component id="email_crkeys_api" name="Email CenRep Keys API" class="api" filter="s60">
+    <unit bldFile="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="emailservices/emailframework/group"/>
@@ -139,12 +158,6 @@
       	<!-- 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="email_plat/group"/>
-      </component>
-      <component id="email_pub" filter="s60" class="api" name="Email Apps Public Interfaces">
-        <unit bldFile="email_pub/group"/>
-      </component>
     </collection>
   </package>
 </SystemDefinition>

--- a/symbian3/app/contacts/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/contacts/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,188 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_engine_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/cms_contactor_api/group"/>
+          </component>
+          <component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/contactpresence_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/contactpresence_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/presence_cache_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/presence_cache_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/contacts/contacts_plat/cca_launch_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/cca_launch_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/cca_view_plugin_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_client_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_rcl_api/tsrc/group" filter="test,api_test"/>
+          </component>
+        </collection>
         <collection name="contactextensions" long-name="Contacts Extensions" level="services">
           <component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
             <unit bldFile="/sf/app/contacts/contactextensions/predefinedcontacts/group"/>
@@ -163,28 +345,6 @@
           </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="/sf/app/contacts/contacts_plat/group"/>
-          </component>
-          <component name="contacts_plat_test" filter="s60,test,api_test" long-name="Contacts Apps Platform API Test">
-            <!-- can only have one unit. Use common bld.inf? -->
-            <unit bldFile="/sf/app/contacts/contacts_plat/cca_launch_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/contactpresence_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/presence_cache_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_engine_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/>
-            <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_rcl_api/tsrc/group"/>
-          </component>
-          <component name="contacts_pub" filter="s60" long-name="Contacts Apps Public Interfaces" class="api">
-            <unit bldFile="/sf/app/contacts/contacts_pub/group"/>
-          </component>
           <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
           </component>

--- a/symbian3/app/contacts/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/contacts/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,117 +1,332 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="contacts" name="Contacts Apps" levels="engine support services ui">
-    <collection id="contactextensions" name="Contacts Extensions" level="services">
-      <component id="predefinedcontacts" filter="s60" name="Predefined Contacts">
-        <unit bldFile="contactextensions/predefinedcontacts/group"/>
-      </component>
-    </collection>
-    <collection id="logsui" name="Logs UI" level="ui">
-      <component id="logsui_build" filter="s60" name="Logs UI Build">
-          <!-- component at too high a rank, should move down one directory -->
-        <unit bldFile="logsui/group"/>
-      </component>
-    </collection>
-    <collection id="phonebookui" name="Phonebook UI" level="ui">
-      <component id="phonebook" filter="s60" name="Phonebook">
-        <unit bldFile="phonebookui/phonebook/group"/>
-      </component>
-      <component id="speeddial" filter="s60" name="Speed Dial">
-        <unit bldFile="phonebookui/speeddial/group"/>
-      </component>
-      <component id="phonebook2" filter="s60" name="Phone Book 2">
-        <unit bldFile="phonebookui/phonebook2/group"/>
-      </component>
-    </collection>
-    <collection id="phonebookengines" name="Phonebook Engines" level="engine">
-      <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
-        <unit bldFile="phonebookengines/cntfindplugin/group"/>
-      </component>
-      <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
-        <unit bldFile="phonebookengines/cntsortplugin/group"/>
-      </component>
-      <component id="virtualphonebook" filter="s60" name="Virtual Phonebook" introduced="^2">
-        <unit bldFile="phonebookengines/virtualphonebook/group"/>
-      </component>
-      <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
-        <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
-      </component>
-    </collection>
-    <collection id="pimprotocols" name="PIM Protocols" level="services">
-      <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
-        <unit bldFile="pimprotocols/phonebooksync/group" mrp="pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-      </component>
-      <component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-        <unit bldFile="pimprotocols/pbap/group" mrp="pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-      </component>
-    </collection>
-    <collection id="ccservices" name="Contacts Centric Services" level="services">
-      <component id="cmsservices" filter="s60" name="Contact Method Selector Services" introduced="^2">
-        <unit bldFile="ccservices/cmsservices/group"/>
-      </component>
-    </collection>
-    <collection id="presencecache" name="Presence Cache" level="support">
-      <component id="presencecacheutils" filter="s60" name="Presence Cache Utils" introduced="^2">
-        <!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
-      </component>
-      <component id="presencecacheserver2" filter="s60" name="Presence Cache Server" introduced="^2">
-        <!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
-      </component>
-      <component id="presencecacheclient2" filter="s60" name="Presence Cache Client" introduced="^2">
-        <!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
-      </component>
-      <component id="presencecache_build" filter="s60" name="Presence Cache Build" introduced="^2">
-		<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
-        <unit bldFile="presencecache/group"/>
-      </component>
-    </collection>
-    <collection id="predictivesearch" name="Predictive Search" level="support">
-      <component id="pcsutils" filter="s60" name="PCS Utils" introduced="^2">
-        <unit bldFile="predictivesearch/pcsutils/group"/>
-      </component>
-      <component id="pcsserverclientapi" filter="s60" name="PCS Server Client API" introduced="^2">
-        <unit bldFile="predictivesearch/pcsserverclientapi/group"/>
-      </component>
-      <component id="pcsserver" filter="s60" name="PCS Server" introduced="^2">
-        <unit bldFile="predictivesearch/pcsserver/group"/>
-      </component>
-      <component id="pcsadapters" filter="s60" name="PCS Adapters" class="plugin" introduced="^2">
-        <unit bldFile="predictivesearch/adapters/contacts/group"/>
-      </component>
-      <component id="pcsalgorithm" filter="s60" name="PCS Algorithm" class="plugin" introduced="^2">
-        <unit bldFile="predictivesearch/pcsalgorithm/group"/>
-      </component>
-      <component id="predictivesearch_build" filter="s60" name="Predictive Search Build" introduced="^2">
-      	<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
-        <unit bldFile="predictivesearch/group"/>
-      </component>
-    </collection>
-    <collection id="contacts_info" name="Contacts Apps Info" level="ui">
-      <component id="contacts_plat" filter="s60" name="Contacts Apps Platform Interfaces" class="api">
-        <unit bldFile="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="contacts_plat/cca_launch_api/tsrc/group" />
-       <unit bldFile="contacts_plat/cca_view_plugin_api/tsrc/group" />
-       <unit bldFile="contacts_plat/contactpresence_api/tsrc/group" />
-       <unit bldFile="contacts_plat/presence_cache_api/tsrc/group" />
-       <unit bldFile="contacts_plat/virtual_phonebook_policy_api/tsrc/group" />
-       <unit bldFile="contacts_plat/virtual_phonebook_sim_services_api/tsrc/group" />        
-       <unit bldFile="contacts_plat/virtual_phonebook_store_api/tsrc/group" />        
-       <unit bldFile="contacts_plat/virtual_phonebook_vcard_api/tsrc/group" />        
-       <unit bldFile="contacts_plat/virtual_phonebook_view_definition_api/tsrc/group" />     
-       <unit bldFile="contacts_plat/virtual_phonebook_engine_api/tsrc/group" />     
-       <unit bldFile="contacts_plat/predictivesearch_client_api/tsrc/group" />        
-       <unit bldFile="contacts_plat/predictivesearch_utils_api/tsrc/group" />     
-       <unit bldFile="contacts_plat/phonebook_2_rcl_api/tsrc/group" />     
-     </component>
-      <component id="contacts_pub" filter="s60" name="Contacts Apps Public Interfaces" class="api">
-        <unit bldFile="contacts_pub/group"/>
-      </component>
-      <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>  
+ <package id="contacts" 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" href="contacts_pub/phonebook_fetch_ui_api/phonebook_fetch_ui_api.metaxml"/>
+    <unit bldFile="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" href="contacts_pub/phonebook_data_management_api/phonebook_data_management_api.metaxml"/>
+    <unit bldFile="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" href="contacts_pub/phonebook_vcard_importexport_api/phonebook_vcard_importexport_api.metaxml"/>
+    <unit bldFile="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" href="contacts_pub/phonebook_data_addedit_ui_api/phonebook_data_addedit_ui_api.metaxml"/>
+    <unit bldFile="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" href="contacts_pub/phonebook_ui_utilities_api/phonebook_ui_utilities_api.metaxml"/>
+    <unit bldFile="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" href="contacts_pub/phonebook_thumbnail_operation_api/phonebook_thumbnail_operation_api.metaxml"/>
+    <unit bldFile="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" href="contacts_pub/speed_dial_utility_control_api/speed_dial_utility_control_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_store_api/virtual_phonebook_store_api.metaxml"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_store_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_sim_services_api/virtual_phonebook_sim_services_api.metaxml"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_sim_services_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_configuration_api/virtual_phonebook_configuration_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_copy_policy_api/virtual_phonebook_copy_policy_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_policy_api/virtual_phonebook_policy_api.metaxml"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_policy_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_engine_api/virtual_phonebook_engine_api.metaxml"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_engine_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_migration_support_api/virtual_phonebook_migration_support_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_view_definition_api/virtual_phonebook_view_definition_api.metaxml"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_view_definition_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/virtual_phonebook_vcard_api/virtual_phonebook_vcard_api.metaxml"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_vcard_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/cms_contactor_api/cms_contactor_api.metaxml"/>
+    <unit bldFile="contacts_plat/cms_contactor_api/group"/>
+   </component>
+   <component id="contactpresence_api" name="Contact Presence API" class="api" filter="s60">
+    <meta rel="Api" href="contacts_plat/contactpresence_api/contactpresence_api.metaxml"/>
+    <unit bldFile="contacts_plat/contactpresence_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/presence_cache_api/presence_cache_api.metaxml"/>
+    <unit bldFile="contacts_plat/presence_cache_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_internal_common_api/phonebook_internal_common_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_internal_appfw_api/phonebook_internal_appfw_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_internal_data_management_api/phonebook_internal_data_management_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_xsp_extension_manager_api/phonebook_2_xsp_extension_manager_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_ui_controls_api/phonebook_ui_controls_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_image_management_api/phonebook_2_image_management_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_extension_api/phonebook_extension_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_public_constants_api/phonebook_public_constants_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_internal_ui_utilities_api/phonebook_internal_ui_utilities_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/logs_engine_api_extensions/logs_engine_api_extensions.metaxml"/>
+    <unit bldFile="contacts_plat/logs_engine_api_extensions/group"/>
+   </component>
+   <component id="phonebook_thumbnails_api" name="Phonebook Thumbnails API" class="api" filter="s60">
+    <meta rel="Api" href="contacts_plat/phonebook_thumbnails_api/phonebook_thumbnails_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_icon_api/phonebook_2_icon_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_engine_extension_api/phonebook_engine_extension_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_store_configuration_management_api/phonebook_2_store_configuration_management_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/logs_ui_command_line_api/logs_ui_command_line_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/speed_dial_dialogs_api/speed_dial_dialogs_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_xsp_view_activation_api/phonebook_2_xsp_view_activation_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/logs_timers_api/logs_timers_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_ui_extension_definition_api/phonebook_2_ui_extension_definition_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_common_ui_api/phonebook_2_common_ui_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_ui_extension_api/phonebook_2_ui_extension_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_store_property_api/phonebook_2_store_property_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_ui_extension_plugin_api/phonebook_2_ui_extension_plugin_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_ui_controls_api/phonebook_2_ui_controls_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_thin_ui_extension_plugin_api/phonebook_2_thin_ui_extension_plugin_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_commands_api/phonebook_2_commands_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_presentation_api/phonebook_2_presentation_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_ui_utilities_api/phonebook_2_ui_utilities_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_contact_related_icon_customization_api/phonebook_2_contact_related_icon_customization_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/cca_launch_api/cca_launch_api.metaxml"/>
+    <unit bldFile="contacts_plat/cca_launch_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/cca_view_plugin_api/cca_view_plugin_api.metaxml"/>
+    <unit bldFile="contacts_plat/cca_view_plugin_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/predictivesearch_client_api/predictivesearch_client_api.metaxml"/>
+    <unit bldFile="contacts_plat/predictivesearch_client_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/predictivesearch_utils_api/predictivesearch_utils_api.metaxml"/>
+    <unit bldFile="contacts_plat/predictivesearch_utils_api/group" fitler="!test"/>
+    <unit bldFile="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" href="contacts_plat/predictivesearch_adapters_api/predictivesearch_adapters_api.metaxml"/>
+    <unit bldFile="contacts_plat/predictivesearch_adapters_api/group"/>
+   </component>
+   <component id="predictivesearch_algorithm_api" name="Predictive Search Algorithm API" class="api" filter="s60">
+    <meta rel="Api" href="contacts_plat/predictivesearch_algorithm_api/predictivesearch_algorithm_api.metaxml"/>
+    <unit bldFile="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" href="contacts_plat/phonebook_2_rcl_api/phonebook_2_rcl_api.metaxml"/>
+    <unit bldFile="contacts_plat/phonebook_2_rcl_api/group" fitler="!test"/>
+    <unit bldFile="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="contactextensions/predefinedcontacts/group"/>
+   </component>
+  </collection>
+  <collection id="logsui" name="Logs UI" level="ui">
+   <component id="logsui_build" filter="s60" name="Logs UI Build">
+    <!-- component at too high a rank, should move down one directory -->
+    <unit bldFile="logsui/group"/>
+   </component>
+  </collection>
+  <collection id="phonebookui" name="Phonebook UI" level="ui">
+   <component id="phonebook" filter="s60" name="Phonebook">
+    <unit bldFile="phonebookui/phonebook/group"/>
+   </component>
+   <component id="speeddial" filter="s60" name="Speed Dial">
+    <unit bldFile="phonebookui/speeddial/group"/>
+   </component>
+   <component id="phonebook2" filter="s60" name="Phone Book 2">
+    <unit bldFile="phonebookui/phonebook2/group"/>
+   </component>
+  </collection>
+  <collection id="phonebookengines" name="Phonebook Engines" level="engine">
+   <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
+    <unit bldFile="phonebookengines/cntfindplugin/group"/>
+   </component>
+   <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
+    <unit bldFile="phonebookengines/cntsortplugin/group"/>
+   </component>
+   <component id="virtualphonebook" filter="s60" name="Virtual Phonebook" introduced="^2">
+    <unit bldFile="phonebookengines/virtualphonebook/group"/>
+   </component>
+   <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+    <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+   </component>
+  </collection>
+  <collection id="pimprotocols" name="PIM Protocols" level="services">
+   <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
+    <unit bldFile="pimprotocols/phonebooksync/group" mrp="pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+   </component>
+   <component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+    <unit bldFile="pimprotocols/pbap/group" mrp="pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+   </component>
+  </collection>
+  <collection id="ccservices" name="Contacts Centric Services" level="services">
+   <component id="cmsservices" filter="s60" name="Contact Method Selector Services" introduced="^2">
+    <unit bldFile="ccservices/cmsservices/group"/>
+   </component>
+  </collection>
+  <collection id="presencecache" name="Presence Cache" level="support">
+   <component id="presencecacheutils" filter="s60" name="Presence Cache Utils" introduced="^2">
+    <!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
+   </component>
+   <component id="presencecacheserver2" filter="s60" name="Presence Cache Server" introduced="^2">
+    <!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
+   </component>
+   <component id="presencecacheclient2" filter="s60" name="Presence Cache Client" introduced="^2">
+    <!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
+   </component>
+   <component id="presencecache_build" filter="s60" name="Presence Cache Build" introduced="^2">
+    <!-- should divide this bld.inf into the other components, or collapse them into a single component -->
+    <unit bldFile="presencecache/group"/>
+   </component>
+  </collection>
+  <collection id="predictivesearch" name="Predictive Search" level="support">
+   <component id="pcsutils" filter="s60" name="PCS Utils" introduced="^2">
+    <unit bldFile="predictivesearch/pcsutils/group"/>
+   </component>
+   <component id="pcsserverclientapi" filter="s60" name="PCS Server Client API" introduced="^2">
+    <unit bldFile="predictivesearch/pcsserverclientapi/group"/>
+   </component>
+   <component id="pcsserver" filter="s60" name="PCS Server" introduced="^2">
+    <unit bldFile="predictivesearch/pcsserver/group"/>
+   </component>
+   <component id="pcsadapters" filter="s60" name="PCS Adapters" class="plugin" introduced="^2">
+    <unit bldFile="predictivesearch/adapters/contacts/group"/>
+   </component>
+   <component id="pcsalgorithm" filter="s60" name="PCS Algorithm" class="plugin" introduced="^2">
+    <unit bldFile="predictivesearch/pcsalgorithm/group"/>
+   </component>
+   <component id="predictivesearch_build" filter="s60" name="Predictive Search Build" introduced="^2">
+    <!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
+    <unit bldFile="predictivesearch/group"/>
+   </component>
+  </collection>
+  <collection id="contacts_info" name="Contacts Apps Info" level="ui">
+   <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/contentcontrol/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/contentcontrol/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,23 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -91,11 +108,6 @@
             <unit bldFile="/sf/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="/sf/app/contentcontrol/contentctrl_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/contentcontrol/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/contentcontrol/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,24 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="contentcontrol" name="Content Control Daemons" levels="plugin app">
-    <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
-	   	<!-- Component at wrong rank, should move down a directory --> 
-      <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
-        <unit bldFile="dsdcmoadapter/group"/>
-      </component>
-    </collection>
-    <collection id="omads" name="OMA Data Sync" level="app">
-      <component id="omadsappui" filter="s60" name="OMA DS Application UI">
-        <unit bldFile="omads/omadsappui/group"/>
-      </component>
-      <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
-        <unit bldFile="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="contentctrl_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="contentcontrol" 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" href="contentctrl_plat/oma_ds_presync_plugin_api/oma_ds_presync_plugin_api.metaxml"/>
+    <unit bldFile="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" href="contentctrl_plat/ds_agenda_handler_plugin_api/ds_agenda_handler_plugin_api.metaxml"/>
+    <unit bldFile="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" href="contentctrl_plat/ds_folder_util_api/ds_folder_util_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_folder_util_api/group"/>
+   </component>
+   <component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60">
+    <meta rel="Api" href="contentctrl_plat/adapter_customization_api/adapter_customization_api.metaxml"/>
+    <unit bldFile="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" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
+   </component>
+  </collection>
+  <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+   <!-- Component at wrong rank, should move down a directory -->
+   <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+    <unit bldFile="dsdcmoadapter/group"/>
+   </component>
+  </collection>
+  <collection id="omads" name="OMA Data Sync" level="app">
+   <component id="omadsappui" filter="s60" name="OMA DS Application UI">
+    <unit bldFile="omads/omadsappui/group"/>
+   </component>
+   <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+    <unit bldFile="omads/omadsextensions/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/conversations/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/conversations/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,17 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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">
@@ -158,9 +169,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="/sf/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="/sf/app/conversations/group"/>

--- a/symbian3/app/conversations/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/conversations/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,94 +1,104 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="conversations" name="Conversation Apps" levels="settings utils plugin ui">
-    <collection id="uiservicetabsettings" name="UI Service Tab Settings" level="settings">
-    	<!-- this is really at the wrong rank. should move down a directory -->
-      <component id="vimpstsettings" filter="s60" name="VIMP Service Tab Settings">
-        <unit bldFile="uiservicetabsettings/group"/>
-      </component>
-    </collection>
-    <collection id="instantmessagesalert" name="Instant Messages Alert" level="utils">
-    	<!-- this is really at the wrong rank. should move down a directory -->
-      <component id="instantmessagesalert_build" filter="s60" name="Instant Messages Alert build" introduced="^3">
-        <unit bldFile="instantmessagesalert/group"/>
-      </component>
-    </collection>
-    <collection id="imstutils" name="IM Service Tab Utils" level="utils">
-      <component id="imstutils_help" filter="s60" name="IM Service Tab Help">
-        <unit bldFile="imstutils/help/group"/>
-      </component>
-      <component id="imconnectionprovider" filter="s60" name="IM Connection Provider" class="plugin">
-        <unit bldFile="imstutils/imconnectionprovider/group"/>
-      </component>
-      <component id="xmppadapter" filter="s60" name="XMPP Settings Adapter" class="plugin">
-        <unit bldFile="imstutils/xmppadapter/group"/>
-      </component>
-      <component id="imconversationview" filter="s60" name="IM Conversation View">
-        <unit bldFile="imstutils/imconversationview/group"/>
-      </component>
-      <component id="imstutils_config" filter="s60" name="IM Service Tab Utils config" class="config">
-      	<!-- remove the #includes and or moved ithe loc file into one the above components -->
-        <unit bldFile="imstutils/group"/>
-      </component>
-    </collection>
-    <collection id="uiservicetab" name="UI Service Tab" level="ui">
-      <component id="vimpstutils" filter="s60" name="VIMP Service Tab Utilities">
-      	<!-- need to spell out VIMP at least once -->
-        <unit bldFile="uiservicetab/vimpstutils/group"/>
-      </component>
-      <component id="vimpststorage" filter="s60" name="VIMP Service Tab Storage">
-        <unit bldFile="uiservicetab/vimpststorage/group"/>
-      </component>
-      <component id="vimpstengine" filter="s60" name="VIMP Service Tab Engine">
-        <unit bldFile="uiservicetab/vimpstengine/group"/>
-      </component>
-      <component id="vimpstcmdprocess" filter="s60" name="VIMP Service Tab Command Process">
-        <unit bldFile="uiservicetab/vimpstcmdprocess/group"/>
-      </component>
-      <component id="vimpstui" filter="s60" name="VIMP Service Tab UI">
-        <unit bldFile="uiservicetab/vimpstui/group"/>
-      </component>
-      <component id="vimpstdetailsviewplugin" filter="s60" name="VIMP ST Details View Plugin" class="plugin">
-        <unit bldFile="uiservicetab/vimpstdetailsviewplugin/group"/>
-      </component>
-      <component id="uiservicetab_build" filter="s60" name="UI Service Tab Build">
-      	<!-- can this be distributed into the above bld.infs? -->
-        <unit bldFile="uiservicetab/group"/>
-      </component>
-    </collection>
-    <collection id="servicewidget" name="Service Widget" level="ui">
-      <component id="servicewidgetdatapublisher" filter="s60" name="Service Widget Data Publisher" class="plugin">
-        <unit bldFile="servicewidget/servicewidgetdatapublisher/group"/>
-      </component>
-      <component id="themes" filter="s60" name="Service Widget Themes" class="config">
-		<!-- does this really need to have that number in the directory name? -->
-        <unit bldFile="servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
-      </component>
-      <component id="servicewidget_build" filter="s60" name="Service Widget Build">
-      	<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-        <unit bldFile="servicewidget/group"/>
-      </component>
-    </collection>
-    <collection id="instantmsgindicatorplugin" name="Instant Message Indicator Plugin" level="plugin">
-    	<!--  collection is really a component. should move down a directory -->
-      <component id="instantmsgindicatorplugin_build" filter="s60" name="Instant Message Indicator Plugin Build" class="plugin" introduced="^3">
-        <unit bldFile="instantmsgindicatorplugin/group"/>
-      </component>
-    </collection>
-    <collection id="imstatuspaneindicatorplugin" name="IM Status Pane Indicator Plugin" level="plugin">
-    	<!--  collection is really a component. should move down a directory -->
-      <component id="imstatuspaneindicatorplugin_build" filter="s60" name="IM Status Pane Indicator Plugin Build" class="plugin"  introduced="^3">
-        <unit bldFile="imstatuspaneindicatorplugin/group"/>
-      </component>
-    </collection>
-    <collection id="conversations_info" name="Conversation Apps Info" level="ui">
-      <component id="conversations_plat" filter="s60" name="Conversation Apps Platform Interfaces" class="api">
-        <unit bldFile="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="group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="conversations" 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" href="conversations_plat/im_cv_launcher_api/im_cv_launcher_api.metaxml"/>
+    <unit bldFile="conversations_plat/im_cv_launcher_api/group"/>
+   </component>
+   <component id="im_connection_api" name="IM Connection API" class="api" filter="s60">
+    <meta rel="Api" href="conversations_plat/im_connection_api/im_connection_api.metaxml"/>
+    <unit bldFile="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="conversations_plat/im_cv_appui_api/group"/>
+   </component>
+  </collection>
+  <collection id="uiservicetabsettings" name="UI Service Tab Settings" level="settings">
+   <!-- this is really at the wrong rank. should move down a directory -->
+   <component id="vimpstsettings" filter="s60" name="VIMP Service Tab Settings">
+    <unit bldFile="uiservicetabsettings/group"/>
+   </component>
+  </collection>
+  <collection id="instantmessagesalert" name="Instant Messages Alert" level="utils">
+   <!-- this is really at the wrong rank. should move down a directory -->
+   <component id="instantmessagesalert_build" filter="s60" name="Instant Messages Alert build" introduced="^3">
+    <unit bldFile="instantmessagesalert/group"/>
+   </component>
+  </collection>
+  <collection id="imstutils" name="IM Service Tab Utils" level="utils">
+   <component id="imstutils_help" filter="s60" name="IM Service Tab Help">
+    <unit bldFile="imstutils/help/group"/>
+   </component>
+   <component id="imconnectionprovider" filter="s60" name="IM Connection Provider" class="plugin">
+    <unit bldFile="imstutils/imconnectionprovider/group"/>
+   </component>
+   <component id="xmppadapter" filter="s60" name="XMPP Settings Adapter" class="plugin">
+    <unit bldFile="imstutils/xmppadapter/group"/>
+   </component>
+   <component id="imconversationview" filter="s60" name="IM Conversation View">
+    <unit bldFile="imstutils/imconversationview/group"/>
+   </component>
+   <component id="imstutils_config" filter="s60" name="IM Service Tab Utils config" class="config">
+    <!-- remove the #includes and or moved ithe loc file into one the above components -->
+    <unit bldFile="imstutils/group"/>
+   </component>
+  </collection>
+  <collection id="uiservicetab" name="UI Service Tab" level="ui">
+   <component id="vimpstutils" filter="s60" name="VIMP Service Tab Utilities">
+    <!-- need to spell out VIMP at least once -->
+    <unit bldFile="uiservicetab/vimpstutils/group"/>
+   </component>
+   <component id="vimpststorage" filter="s60" name="VIMP Service Tab Storage">
+    <unit bldFile="uiservicetab/vimpststorage/group"/>
+   </component>
+   <component id="vimpstengine" filter="s60" name="VIMP Service Tab Engine">
+    <unit bldFile="uiservicetab/vimpstengine/group"/>
+   </component>
+   <component id="vimpstcmdprocess" filter="s60" name="VIMP Service Tab Command Process">
+    <unit bldFile="uiservicetab/vimpstcmdprocess/group"/>
+   </component>
+   <component id="vimpstui" filter="s60" name="VIMP Service Tab UI">
+    <unit bldFile="uiservicetab/vimpstui/group"/>
+   </component>
+   <component id="vimpstdetailsviewplugin" filter="s60" name="VIMP ST Details View Plugin" class="plugin">
+    <unit bldFile="uiservicetab/vimpstdetailsviewplugin/group"/>
+   </component>
+   <component id="uiservicetab_build" filter="s60" name="UI Service Tab Build">
+    <!-- can this be distributed into the above bld.infs? -->
+    <unit bldFile="uiservicetab/group"/>
+   </component>
+  </collection>
+  <collection id="servicewidget" name="Service Widget" level="ui">
+   <component id="servicewidgetdatapublisher" filter="s60" name="Service Widget Data Publisher" class="plugin">
+    <unit bldFile="servicewidget/servicewidgetdatapublisher/group"/>
+   </component>
+   <component id="themes" filter="s60" name="Service Widget Themes" class="config">
+    <!-- does this really need to have that number in the directory name? -->
+    <unit bldFile="servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
+   </component>
+   <component id="servicewidget_build" filter="s60" name="Service Widget Build">
+    <!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
+    <unit bldFile="servicewidget/group"/>
+   </component>
+  </collection>
+  <collection id="instantmsgindicatorplugin" name="Instant Message Indicator Plugin" level="plugin">
+   <!--  collection is really a component. should move down a directory -->
+   <component id="instantmsgindicatorplugin_build" filter="s60" name="Instant Message Indicator Plugin Build" class="plugin" introduced="^3">
+    <unit bldFile="instantmsgindicatorplugin/group"/>
+   </component>
+  </collection>
+  <collection id="imstatuspaneindicatorplugin" name="IM Status Pane Indicator Plugin" level="plugin">
+   <!--  collection is really a component. should move down a directory -->
+   <component id="imstatuspaneindicatorplugin_build" filter="s60" name="IM Status Pane Indicator Plugin Build" class="plugin" introduced="^3">
+    <unit bldFile="imstatuspaneindicatorplugin/group"/>
+   </component>
+  </collection>
+  <collection id="conversations_info" name="Conversation Apps Info" level="ui">
+   <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="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/dictionary/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/dictionary/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,17 +77,17 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/app/dictionary/dictionary_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/dictionary/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/dictionary/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="dictionary" name="Dictionary" levels="utils ui">
-    <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="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="dictionary_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="dictionary" 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" href="dictionary_plat/menu_suites_macros_api/menu_suites_macros_api.metaxml"/>
+    <unit bldFile="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="userdict/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/files/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/files/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,11 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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">
@@ -112,11 +117,6 @@
             <unit bldFile="/sf/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="/sf/app/files/files_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/files/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/files/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="files" name="File Manager Apps" levels="support apps">
-    <collection id="deviceencryption" name="Device Encryption" level="support">
-		<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->		
-      <component id="devencnotifplugin" filter="s60" name="Device Encryption Notifier Plugin" class="plugin" introduced="^3">
-        <unit bldFile="deviceencryption/devencnotifplugin/group"/>
-      </component>
-      <component id="devencui" filter="s60" name="Device Encryption UI" introduced="^3">
-        <unit bldFile="deviceencryption/devencui/group"/>
-      </component>
-      <component id="devencdmadapter" filter="s60" name="Device Encryption DM Adapter" class="plugin" introduced="^3">
-        <unit bldFile="deviceencryption/devencdmadapter/group"/>
-      </component>
-      <component id="devencgsplugin" filter="s60" name="Device Encryption GS Plugin" class="plugin" introduced="^3">
-        <unit bldFile="deviceencryption/devencgsplugin/group"/>
-      </component>
-      <component id="deviceencryption_help" filter="s60" name="Device Encryption Help" introduced="^3">
-        <unit bldFile="deviceencryption/help/group"/>
-      </component>
-      <component id="deviceencryption_build" filter="s60" name="Device Encryption Build" introduced="^3">
-        <unit bldFile="deviceencryption/group"/>
-      </component>
-    </collection>
-    <collection id="filemanager" name="File Manager" level="apps">
-		<!-- this is really a component, should move down a directory -->
-      <component id="filemanager_build" filter="s60" name="File Manager Build">
-        <unit bldFile="filemanager/group"/>
-      </component>
-    </collection>
-    <collection id="filesystemuis" name="File System UIs" level="support">
-      <component id="memscaneng" filter="s60" name="Memory Scan Server">
-        <unit bldFile="filesystemuis/memscaneng/group"/>
-      </component>
-      <component id="memstatepopup" filter="s60" name="Memory State Popup">
-        <unit bldFile="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="files_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="files" 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" href="files_plat/memory_scan_popup_ui_api/memory_scan_popup_ui_api.metaxml"/>
+    <unit bldFile="files_plat/memory_scan_popup_ui_api/group"/>
+   </component>
+  </collection>
+  <collection id="deviceencryption" name="Device Encryption" level="support">
+   <!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
+   <component id="devencnotifplugin" filter="s60" name="Device Encryption Notifier Plugin" class="plugin" introduced="^3">
+    <unit bldFile="deviceencryption/devencnotifplugin/group"/>
+   </component>
+   <component id="devencui" filter="s60" name="Device Encryption UI" introduced="^3">
+    <unit bldFile="deviceencryption/devencui/group"/>
+   </component>
+   <component id="devencdmadapter" filter="s60" name="Device Encryption DM Adapter" class="plugin" introduced="^3">
+    <unit bldFile="deviceencryption/devencdmadapter/group"/>
+   </component>
+   <component id="devencgsplugin" filter="s60" name="Device Encryption GS Plugin" class="plugin" introduced="^3">
+    <unit bldFile="deviceencryption/devencgsplugin/group"/>
+   </component>
+   <component id="deviceencryption_help" filter="s60" name="Device Encryption Help" introduced="^3">
+    <unit bldFile="deviceencryption/help/group"/>
+   </component>
+   <component id="deviceencryption_build" filter="s60" name="Device Encryption Build" introduced="^3">
+    <unit bldFile="deviceencryption/group"/>
+   </component>
+  </collection>
+  <collection id="filemanager" name="File Manager" level="apps">
+   <!-- this is really a component, should move down a directory -->
+   <component id="filemanager_build" filter="s60" name="File Manager Build">
+    <unit bldFile="filemanager/group"/>
+   </component>
+  </collection>
+  <collection id="filesystemuis" name="File System UIs" level="support">
+   <component id="memscaneng" filter="s60" name="Memory Scan Server">
+    <unit bldFile="filesystemuis/memscaneng/group"/>
+   </component>
+   <component id="memstatepopup" filter="s60" name="Memory State Popup">
+    <unit bldFile="filesystemuis/memstatepopup/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/graphicsuis/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/graphicsuis/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,9 +77,15 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
           </component>
         </collection>
         <collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">

--- a/symbian3/app/graphicsuis/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/graphicsuis/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="graphicsuis" 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="graphicsuis_plat/group"/>
-      </component>
-    </collection>
-    <collection id="svgtviewer" name="SVG-T Viewer" level="ui">
-      <component id="svgtviewerplugin" filter="s60" name="SVG-T Viewer Plugin">
-        <unit bldFile="svgtviewer/svgtviewerplugin/group"/>
-      </component>
-    </collection>
-  </package>
+  <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" href="graphicsuis_plat/svgt_viewer_ui_api/svgt_viewer_ui_api.metaxml"/>
+    <unit bldFile="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" href="graphicsuis_plat/svg_application_observer_utility_api/svg_application_observer_utility_api.metaxml"/>
+    <unit bldFile="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" href="graphicsuis_plat/svgt_file_view_details_dialog_api/svgt_file_view_details_dialog_api.metaxml"/>
+    <unit bldFile="graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
+   </component>
+  </collection>
+  <collection id="svgtviewer" name="SVG-T Viewer" level="ui">
+   <component id="svgtviewerplugin" filter="s60" name="SVG-T Viewer Plugin">
+    <unit bldFile="svgtviewer/svgtviewerplugin/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/homescreen/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/homescreen/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,17 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/app/homescreen/idlehomescreen/nativeuicontroller/group"/>
@@ -139,11 +150,6 @@
             <unit bldFile="/sf/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="/sf/app/homescreen/homescreen_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/homescreen/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/homescreen/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,76 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="homescreen" name="Home Screen Apps" levels="fw support apps">
-    <collection id="idlehomescreen" name="Idle Home Screen" level="apps">
-      <component id="nativeuicontroller" filter="s60" name="Native UI Controller">
-        <unit bldFile="idlehomescreen/nativeuicontroller/group"/>
-      </component>
-      <component id="exths" filter="s60" name="Active Idle Container" class="plugin">
-      	<!-- why is the ID so different from the name? Is one wrong? -->
-        <unit bldFile="idlehomescreen/exths/group"/>
-      </component>
-      <component id="hscontentcontrol" filter="s60" name="Home Screen Content Control" introduced="^3">
-        <unit bldFile="idlehomescreen/hscontentcontrol/group"/>
-      </component>
-      <component id="hssapiwrapper" filter="s60" name="HS SAPI Wrapper" introduced="^3">
-      	<!--  can only have one unit. #include from a common bld.inf, or split into two components -->
-        <unit bldFile="idlehomescreen/sapiwrapper/cpswrapper/group"/>
-        <unit bldFile="idlehomescreen/sapiwrapper/hspswrapper/group"/>
-      </component>
-      <component id="xmluirendering" filter="s60" name="XML UI Rendering" introduced="^3">
-        <unit bldFile="idlehomescreen/xmluirendering/group"/>
-      </component>
-      <component id="xmluicontroller" filter="s60" name="XML UI Controller" introduced="^3">
-        <unit bldFile="idlehomescreen/xmluicontroller/group"/>
-      </component>
-      <component id="widgetmanager" filter="s60" name="Widget Manager" introduced="^3">
-        <unit bldFile="idlehomescreen/widgetmanager/group"/>
-      </component>
-      <component id="idlehomescreen_help" filter="s60" name="Idle Home Screen Help">
-        <unit bldFile="idlehomescreen/help/group"/>
-      </component>
-      <component id="idlehomescreen_data" filter="s60" name="Idle Home Screen Data">
-        <meta rel="config">
-        	<defined condition="FF_HOMESCREEN_COMMON_IDLEFW"/>
-        		<!-- currently always on, so safe to define here for now -->
-        </meta>
-        <unit bldFile="idlehomescreen/data/group"/>
-      </component>
-      <component id="idlehomescreen_build" filter="s60" name="Idle Home Screen Build">
-      	<!-- can the loc file be moved to another comopnent and this one removed? -->
-        <unit bldFile="idlehomescreen/group"/>
-      </component>
-      <component id="homescreen_test" filter="s60,test,unit_test" purpose="development" name="Home Screen Apps Test">
-        <unit bldFile="idlehomescreen/widgetmanager/tsrc/wmunittest/group"/>
-      </component>      
-    </collection>
-    <collection id="menufw" name="Menu Framework" level="fw">
-      <component id="hierarchynavigator" filter="s60" name="Hierarchy Navigator">
-        <unit bldFile="menufw/hierarchynavigator/group"/>
-      </component>
-      <component id="menufwui" filter="s60" name="Menu Framework UI">
-        <unit bldFile="menufw/menufwui/group"/>
-      </component>
-      <component id="menusuites" filter="s60" name="Menu Suites">
-        <unit bldFile="menufw/menusuites/group"/>
-      </component>
-      <component id="menufw_build" filter="s60" name="Menu Framework Build">
-      	<!-- can the exports be exported by the other components? -->
-        <unit bldFile="menufw/group"/>
-      </component>
-    </collection>
-    <collection id="taskswitcher" name="Task Switcher" level="support">
-      <component id="contextengine" filter="s60" name="Context Engine" introduced="^3">
-        <unit bldFile="taskswitcher/contextengine/group"/>
-      </component>
-      <component id="taskswitcherui" filter="s60" name="Task Switcher UI" introduced="^3">
-        <unit bldFile="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="homescreen_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="homescreen" 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" href="homescreen_plat/menu_settings_api/menu_settings_api.metaxml"/>
+    <unit bldFile="homescreen_plat/menu_settings_api/group"/>
+   </component>
+   <component id="hs_content_control_ui" name="HS Content Control Ui" class="api" filter="s60">
+    <unit bldFile="homescreen_plat/hs_content_control_ui/group"/>
+   </component>
+   <component id="hs_renderingplugin_api" name="HS Rendering Plugin API" class="api" filter="s60">
+    <unit bldFile="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="idlehomescreen/nativeuicontroller/group"/>
+   </component>
+   <component id="exths" filter="s60" name="Active Idle Container" class="plugin">
+    <!-- why is the ID so different from the name? Is one wrong? -->
+    <unit bldFile="idlehomescreen/exths/group"/>
+   </component>
+   <component id="hscontentcontrol" filter="s60" name="Home Screen Content Control" introduced="^3">
+    <unit bldFile="idlehomescreen/hscontentcontrol/group"/>
+   </component>
+   <component id="hssapiwrapper" filter="s60" name="HS SAPI Wrapper" introduced="^3">
+    <!--  can only have one unit. #include from a common bld.inf, or split into two components -->
+    <unit bldFile="idlehomescreen/sapiwrapper/cpswrapper/group"/>
+    <unit bldFile="idlehomescreen/sapiwrapper/hspswrapper/group"/>
+   </component>
+   <component id="xmluirendering" filter="s60" name="XML UI Rendering" introduced="^3">
+    <unit bldFile="idlehomescreen/xmluirendering/group"/>
+   </component>
+   <component id="xmluicontroller" filter="s60" name="XML UI Controller" introduced="^3">
+    <unit bldFile="idlehomescreen/xmluicontroller/group"/>
+   </component>
+   <component id="widgetmanager" filter="s60" name="Widget Manager" introduced="^3">
+    <unit bldFile="idlehomescreen/widgetmanager/group"/>
+   </component>
+   <component id="idlehomescreen_help" filter="s60" name="Idle Home Screen Help">
+    <unit bldFile="idlehomescreen/help/group"/>
+   </component>
+   <component id="idlehomescreen_data" filter="s60" name="Idle Home Screen Data">
+    <meta rel="config">
+     <defined condition="FF_HOMESCREEN_COMMON_IDLEFW"/>
+     <!-- currently always on, so safe to define here for now -->
+    </meta>
+    <unit bldFile="idlehomescreen/data/group"/>
+   </component>
+   <component id="idlehomescreen_build" filter="s60" name="Idle Home Screen Build">
+    <!-- can the loc file be moved to another comopnent and this one removed? -->
+    <unit bldFile="idlehomescreen/group"/>
+   </component>
+   <component id="homescreen_test" filter="s60,test,unit_test" purpose="development" name="Home Screen Apps Test">
+    <unit bldFile="idlehomescreen/widgetmanager/tsrc/wmunittest/group"/>
+   </component>
+  </collection>
+  <collection id="menufw" name="Menu Framework" level="fw">
+   <component id="hierarchynavigator" filter="s60" name="Hierarchy Navigator">
+    <unit bldFile="menufw/hierarchynavigator/group"/>
+   </component>
+   <component id="menufwui" filter="s60" name="Menu Framework UI">
+    <unit bldFile="menufw/menufwui/group"/>
+   </component>
+   <component id="menusuites" filter="s60" name="Menu Suites">
+    <unit bldFile="menufw/menusuites/group"/>
+   </component>
+   <component id="menufw_build" filter="s60" name="Menu Framework Build">
+    <!-- can the exports be exported by the other components? -->
+    <unit bldFile="menufw/group"/>
+   </component>
+  </collection>
+  <collection id="taskswitcher" name="Task Switcher" level="support">
+   <component id="contextengine" filter="s60" name="Context Engine" introduced="^3">
+    <unit bldFile="taskswitcher/contextengine/group"/>
+   </component>
+   <component id="taskswitcherui" filter="s60" name="Task Switcher UI" introduced="^3">
+    <unit bldFile="taskswitcher/taskswitcherui/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/im/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/im/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,17 +77,17 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/app/im/im_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/im/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/im/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="im" name="Instant Messaging Apps" levels="support prot engine apps">
-    <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="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="im_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="im" 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" href="im_plat/wv_sap_settings_api/wv_sap_settings_api.metaxml"/>
+    <unit bldFile="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="wvsettings20/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/imgeditor/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/imgeditor/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,23 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/imgeditor/imageeditor/pb/group"/>
@@ -165,11 +182,6 @@
             <unit bldFile="/sf/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="/sf/app/imgeditor/imgeditor_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/imgeditor/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/imgeditor/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="imgeditor" 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" href="imgeditor_plat/image_editor_debug_utilities_api/image_editor_debug_utilities_api.metaxml"/>
+        <unit bldFile="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" href="imgeditor_plat/image_editor_utilities_api/image_editor_utilities_api.metaxml"/>
+        <unit bldFile="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" href="imgeditor_plat/image_editor_definitions_api/image_editor_definitions_api.metaxml"/>
+        <unit bldFile="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" href="imgeditor_plat/image_editor_system_parameters_api/image_editor_system_parameters_api.metaxml"/>
+        <unit bldFile="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" href="imgeditor_plat/image_processing_engine_api/image_processing_engine_api.metaxml"/>
+        <unit bldFile="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="imageeditor/pb/group"/>
@@ -89,10 +111,5 @@
         <unit bldFile="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="imgeditor_plat/group"/>
-      </component>
-    </collection>
   </package>
 </SystemDefinition>

--- a/symbian3/app/iptelephony/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/iptelephony/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,26 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+          </component>
+          <component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/app/iptelephony/commsconfig/cscgsplugin/group"/>
@@ -183,11 +203,6 @@
             <unit bldFile="/sf/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="/sf/app/iptelephony/iptel_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/iptelephony/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/iptelephony/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,116 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="iptelephony" name="IP Telephony" levels="eng plugin util ui">
-    <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="commsconfig/cscgsplugin/group"/>
-      </component>
-      <component id="cscsipvoipcleanupplugin" filter="s60" name="CSC SIP VoIP Cleanup Plugin" class="plugin" introduced="^2">
-        <unit bldFile="commsconfig/cscsipvoipcleanupplugin/group"/>
-      </component>
-      <component id="cscengine" filter="s60" name="Connection Service Configurator Engine" introduced="^2">
-        <unit bldFile="commsconfig/cscengine/group"/>
-      </component>
-      <component id="cscsettingsui" filter="s60" name="CSC Settings UI" introduced="^2">
-        <unit bldFile="commsconfig/cscsettingsui/group"/>
-      </component>
-      <component id="cscapplicationui" filter="s60" name="CSC Application UI" introduced="^2">
-        <unit bldFile="commsconfig/cscapplicationui/group"/>
-      </component>
-      <component id="commsconfig_build" filter="s60" name="Comms Config Build" introduced="^2">
-      	<!--  consider distributing this into the above components -->
-        <unit bldFile="commsconfig/group"/>
-      </component>
-    </collection>
-    <collection id="convergedconnectionhandler" name="Converged Connection Handler" level="eng">
-      <component id="cchserver" filter="s60" name="CCH Server" introduced="^2">
-        <unit bldFile="convergedconnectionhandler/cchserver/group"/>
-      </component>
-      <component id="cchclient" filter="s60" name="CCH Client" introduced="^2">
-        <unit bldFile="convergedconnectionhandler/cchclient/group"/>
-      </component>
-      <component id="cchclientapi" filter="s60" name="CCH Client API" introduced="^2">
-        <unit bldFile="convergedconnectionhandler/cchclientapi/group"/>
-      </component>
-      <component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
-      	<!--  consider distributing this into the above components, or collapse the collection into a single component. 
+ <package id="iptelephony" 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="iptel_plat/richcallsettingsengine_api/group"/>
+   </component>
+   <component id="cch_client_api" name="CCH Client API" introduced="^2" class="api" filter="s60">
+    <unit bldFile="iptel_plat/cch_client_api/group"/>
+   </component>
+   <component id="cch_server_api" name="CCH Server API" introduced="^2" class="api" filter="s60">
+    <unit bldFile="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="iptel_plat/csc_settingsui_api/group"/>
+   </component>
+   <component id="vccpropertyhandler_api" name="VCC Property Handler API" introduced="^2" class="api" filter="s60">
+    <unit bldFile="iptel_plat/vccpropertyhandler_api/group"/>
+   </component>
+   <component id="vcc_api" name="VCC API" introduced="^2" class="api" filter="s60">
+    <unit bldFile="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="commsconfig/cscgsplugin/group"/>
+   </component>
+   <component id="cscsipvoipcleanupplugin" filter="s60" name="CSC SIP VoIP Cleanup Plugin" class="plugin" introduced="^2">
+    <unit bldFile="commsconfig/cscsipvoipcleanupplugin/group"/>
+   </component>
+   <component id="cscengine" filter="s60" name="Connection Service Configurator Engine" introduced="^2">
+    <unit bldFile="commsconfig/cscengine/group"/>
+   </component>
+   <component id="cscsettingsui" filter="s60" name="CSC Settings UI" introduced="^2">
+    <unit bldFile="commsconfig/cscsettingsui/group"/>
+   </component>
+   <component id="cscapplicationui" filter="s60" name="CSC Application UI" introduced="^2">
+    <unit bldFile="commsconfig/cscapplicationui/group"/>
+   </component>
+   <component id="commsconfig_build" filter="s60" name="Comms Config Build" introduced="^2">
+    <!--  consider distributing this into the above components -->
+    <unit bldFile="commsconfig/group"/>
+   </component>
+  </collection>
+  <collection id="convergedconnectionhandler" name="Converged Connection Handler" level="eng">
+   <component id="cchserver" filter="s60" name="CCH Server" introduced="^2">
+    <unit bldFile="convergedconnectionhandler/cchserver/group"/>
+   </component>
+   <component id="cchclient" filter="s60" name="CCH Client" introduced="^2">
+    <unit bldFile="convergedconnectionhandler/cchclient/group"/>
+   </component>
+   <component id="cchclientapi" filter="s60" name="CCH Client API" introduced="^2">
+    <unit bldFile="convergedconnectionhandler/cchclientapi/group"/>
+   </component>
+   <component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
+    <!--  consider distributing this into the above components, or collapse the collection into a single component. 
       		The latter is a better option since clients and sevrers are rarely separate components -->
-        <unit bldFile="convergedconnectionhandler/group"/>
-      </component>
-    </collection>
-    <collection id="richcallsettingsengine" name="Rich Call Settings Engine" level="eng">
-      <component id="rcse2" filter="s60" name="Rich Call Settings Engine Build" introduced="^2">
-        <unit bldFile="richcallsettingsengine/rcse2/group"/>
-      </component>
-    </collection>
-    <collection id="sipvoipprovider" name="SIP VoIP Provider" level="plugin">
-    	<!-- collection is really a component. Should move down a directory -->
-      <component id="svp" filter="s60" name="SIP VoIP Provider Build" class="plugin" introduced="^2">
-        <unit bldFile="sipvoipprovider/group"/>
-      </component>
-    </collection>
-    <collection id="voipplugins" name="VoIP Plugins" level="plugin">
-      <component id="sipmxresolver" filter="s60" name="SIP MX Resolver" class="plugin" introduced="^2">
-        <unit bldFile="voipplugins/sipmxresolver/group"/>
-      </component>
-      <component id="sipconnectionprovider" filter="s60" name="SIP Connection Provider" class="plugin" introduced="^2">
-        <unit bldFile="voipplugins/sipconnectionprovider/group"/>
-        	<!-- can only have one unit, can the next be #'included from the above? -->
-        <unit bldFile="voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-      </component>
-      <component id="ipapputils" filter="s60" name="IP App Utils" introduced="^2">
-        <unit bldFile="voipplugins/ipapputils/group"/>
-      </component>
-      <component id="voipadapters" filter="s60" name="VoIP Adapters" class="plugin" introduced="^2">
-        <unit bldFile="voipplugins/voipadapters/group"/>
-      </component>
-      <component id="accountcreationplugin" filter="s60" name="Account Creation Plugin" class="plugin" introduced="^2">
-        <unit bldFile="voipplugins/accountcreationplugin/group"/>
-      </component>
-      <component id="dhcppositionprovider" filter="s60" name="DHCP Position Provider" class="plugin" introduced="^2">
-        <unit bldFile="voipplugins/dhcppositionprovider/group"/>
-      </component>
-      <component id="svtmatching" filter="s60" name="SIP VoIP Telephony Matching" class="plugin" introduced="^2">
-        <unit bldFile="voipplugins/svtmatching/group"/>
-      </component>
-      <component id="svtlogging" filter="s60" name="SVT Logging" class="plugin" introduced="^2">
-        <unit bldFile="voipplugins/svtlogging/group"/>
-      </component>
-      <component id="svtcallmenu" filter="s60" name="SVT Call Menu" class="plugin" introduced="^2">
-        <unit bldFile="voipplugins/svtcallmenu/group"/>
-      </component>
-      <component id="sipimresolver" filter="s60" name="SIP IM Resolver" class="plugin" introduced="^3">
-        <unit bldFile="voipplugins/sipimresolver/group"/>
-      </component>
-    </collection>
-    <collection id="callcontinuity" name="Call Continuity" level="util">
-      <component id="vccutils" filter="s60" name="VCC Utils" introduced="^2">
-        <unit bldFile="callcontinuity/vccutils/group"/>
-      </component>
-      <component id="nsmldmvccadapter" filter="s60" name="SyncML DM VCC Adapter" class="plugin" introduced="^2">
-        <unit bldFile="callcontinuity/nsmldmvccadapter/group"/>
-      </component>
-      <component id="vccclientprovisioningadapter" filter="s60" name="VCC Client Provisioning Adapter" class="plugin" introduced="^2">
-        <unit bldFile="callcontinuity/vccclientprovisioningadapter/group"/>
-      </component>
-      <component id="vccpropertyhandler" filter="s60" name="VCC Property Handler" introduced="^2">
-        <unit bldFile="callcontinuity/vccpropertyhandler/group"/>
-      </component>
-      <component id="vcchotrigger" filter="s60" name="VCC HO Trigger" introduced="^2">
-        <unit bldFile="callcontinuity/vcchotrigger/group"/>
-      </component>
-      <component id="vcc" filter="s60" name="VoIP Call Continuity" class="plugin" introduced="^2">
-        <unit bldFile="callcontinuity/vcc/group"/>
-      </component>
-      <component id="callcontinuity_build" filter="s60" name="Call Continuity Build" introduced="^2">
-      	<!--  consider distributing this into the above components -->
-        <unit bldFile="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="iptel_plat/group"/>
-      </component>
-    </collection>
-  </package>
+    <unit bldFile="convergedconnectionhandler/group"/>
+   </component>
+  </collection>
+  <collection id="richcallsettingsengine" name="Rich Call Settings Engine" level="eng">
+   <component id="rcse2" filter="s60" name="Rich Call Settings Engine Build" introduced="^2">
+    <unit bldFile="richcallsettingsengine/rcse2/group"/>
+   </component>
+  </collection>
+  <collection id="sipvoipprovider" name="SIP VoIP Provider" level="plugin">
+   <!-- collection is really a component. Should move down a directory -->
+   <component id="svp" filter="s60" name="SIP VoIP Provider Build" class="plugin" introduced="^2">
+    <unit bldFile="sipvoipprovider/group"/>
+   </component>
+  </collection>
+  <collection id="voipplugins" name="VoIP Plugins" level="plugin">
+   <component id="sipmxresolver" filter="s60" name="SIP MX Resolver" class="plugin" introduced="^2">
+    <unit bldFile="voipplugins/sipmxresolver/group"/>
+   </component>
+   <component id="sipconnectionprovider" filter="s60" name="SIP Connection Provider" class="plugin" introduced="^2">
+    <unit bldFile="voipplugins/sipconnectionprovider/group"/>
+    <!-- can only have one unit, can the next be #'included from the above? -->
+    <unit bldFile="voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
+   </component>
+   <component id="ipapputils" filter="s60" name="IP App Utils" introduced="^2">
+    <unit bldFile="voipplugins/ipapputils/group"/>
+   </component>
+   <component id="voipadapters" filter="s60" name="VoIP Adapters" class="plugin" introduced="^2">
+    <unit bldFile="voipplugins/voipadapters/group"/>
+   </component>
+   <component id="accountcreationplugin" filter="s60" name="Account Creation Plugin" class="plugin" introduced="^2">
+    <unit bldFile="voipplugins/accountcreationplugin/group"/>
+   </component>
+   <component id="dhcppositionprovider" filter="s60" name="DHCP Position Provider" class="plugin" introduced="^2">
+    <unit bldFile="voipplugins/dhcppositionprovider/group"/>
+   </component>
+   <component id="svtmatching" filter="s60" name="SIP VoIP Telephony Matching" class="plugin" introduced="^2">
+    <unit bldFile="voipplugins/svtmatching/group"/>
+   </component>
+   <component id="svtlogging" filter="s60" name="SVT Logging" class="plugin" introduced="^2">
+    <unit bldFile="voipplugins/svtlogging/group"/>
+   </component>
+   <component id="svtcallmenu" filter="s60" name="SVT Call Menu" class="plugin" introduced="^2">
+    <unit bldFile="voipplugins/svtcallmenu/group"/>
+   </component>
+   <component id="sipimresolver" filter="s60" name="SIP IM Resolver" class="plugin" introduced="^3">
+    <unit bldFile="voipplugins/sipimresolver/group"/>
+   </component>
+  </collection>
+  <collection id="callcontinuity" name="Call Continuity" level="util">
+   <component id="vccutils" filter="s60" name="VCC Utils" introduced="^2">
+    <unit bldFile="callcontinuity/vccutils/group"/>
+   </component>
+   <component id="nsmldmvccadapter" filter="s60" name="SyncML DM VCC Adapter" class="plugin" introduced="^2">
+    <unit bldFile="callcontinuity/nsmldmvccadapter/group"/>
+   </component>
+   <component id="vccclientprovisioningadapter" filter="s60" name="VCC Client Provisioning Adapter" class="plugin" introduced="^2">
+    <unit bldFile="callcontinuity/vccclientprovisioningadapter/group"/>
+   </component>
+   <component id="vccpropertyhandler" filter="s60" name="VCC Property Handler" introduced="^2">
+    <unit bldFile="callcontinuity/vccpropertyhandler/group"/>
+   </component>
+   <component id="vcchotrigger" filter="s60" name="VCC HO Trigger" introduced="^2">
+    <unit bldFile="callcontinuity/vcchotrigger/group"/>
+   </component>
+   <component id="vcc" filter="s60" name="VoIP Call Continuity" class="plugin" introduced="^2">
+    <unit bldFile="callcontinuity/vcc/group"/>
+   </component>
+   <component id="callcontinuity_build" filter="s60" name="Call Continuity Build" introduced="^2">
+    <!--  consider distributing this into the above components -->
+    <unit bldFile="callcontinuity/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/jrt/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/jrt/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,82 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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">
@@ -90,16 +101,13 @@
           </component>
           <component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
             <!-- Remove the #includes and rename JRT ROM-->
-            <!--<unit bldFile="java_stubs/group"/>-->
+            <unit bldFile="/sf/app/jrt/java_stubs/group"/>
           </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="/sf/app/jrt/jrt_plat/group"/>
-          </component>
           <component name="jrt_build" filter="s60" long-name="JRT Build">
-            <!--  needed for __JAVA_STUBS condition -->
-            <unit bldFile="/sf/app/jrt/java_stubs/group"/>
+            <!--  needed for __JAVA_STUBS condition
+            <unit bldFile="/sf/app/jrt/group"/> -->
           </component>
         </collection>
       </block>

--- a/symbian3/app/jrt/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/jrt/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,33 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="jrt" name="Java Runtime" levels="util generic rt ui">
-    <collection id="java_stubs" name="Java Stubs" level="util">
-   	<meta rel="config">
-   		<defined condition="__JAVA_STUBS"/>
-   	</meta>  
-	<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-      <component id="javadrmutils" name="Java DRM Utils" filter="s60,sf_build">
-       <!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-     </component>
-      <component id="javaenvinfo" name="Java Environment Info" filter="s60,sf_build">
-       <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-     </component>
-      <component id="javaregistry" filter="s60,sf_build" name="Java Registry">
-        <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-      </component>
-      <component id="java_stubs_build" filter="s60,sf_build" name="Java Stubs ROM">
-		<!-- Remove the #includes and rename JRT ROM-->
-        <!--<unit bldFile="java_stubs/group"/>-->
-      </component>
-    </collection>
-    <collection id="jrt_info" name="JRT Info" level="rt">
-      <component id="jrt_plat" filter="s60" name="JRT Platform Interfaces" class="api">
-        <unit bldFile="jrt_plat/group"/>
-      </component>
-		<component id="jrt_build" filter="s60" name="JRT Build">
-			<!--  needed for __JAVA_STUBS condition -->
-			<unit bldFile="java_stubs/group"/>
-		</component>
-    </collection>
-  </package>
+ <package id="jrt" 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="jrt_plat/java_registry_api/build"/>
+   </component>
+   <component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+    <unit bldFile="jrt_plat/java_env_info_api/build"/>
+   </component>
+   <component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+    <unit bldFile="jrt_plat/java_debug_api/build"/>
+   </component>
+  </collection>
+  <collection id="java_stubs" name="Java Stubs" level="util">
+   <meta rel="config">
+    <defined condition="__JAVA_STUBS"/>
+   </meta>
+   <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
+   <component id="javadrmutils" name="Java DRM Utils" filter="s60,sf_build">
+    <!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
+   </component>
+   <component id="javaenvinfo" name="Java Environment Info" filter="s60,sf_build">
+    <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
+   </component>
+   <component id="javaregistry" filter="s60,sf_build" name="Java Registry">
+    <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
+   </component>
+   <component id="java_stubs_build" filter="s60,sf_build" name="Java Stubs ROM">
+    <!-- Remove the #includes and rename JRT ROM-->
+    <!--<unit bldFile="java_stubs/group"/>-->
+   </component>
+  </collection>
+  <collection id="jrt_info" name="JRT Info" level="rt">
+   <component id="jrt_build" filter="s60" name="JRT Build">
+    <!--  needed for __JAVA_STUBS condition -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/location/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/location/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,19 @@
   <systemModel>
     <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="/sf/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="/sf/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="/sf/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="/sf/app/location/basiclocationinfodisplay/blid/group"/>
@@ -178,14 +191,6 @@
             <unit bldFile="/sf/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="/sf/app/location/loc_pub/group"/>
-          </component>
-          <component name="loc_plat" filter="s60" long-name="Location Apps Platform Interfaces" introduced="^3" class="api">
-            <unit bldFile="/sf/app/location/loc_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/location/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/location/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,114 +1,121 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="location" name="Location Apps" levels="ui events loc apps">
-    <collection id="basiclocationinfodisplay" name="Basic Location Info Display" level="ui">
-      <component id="blid" filter="s60" name="Basic Location Info Display Build">
-        <unit bldFile="basiclocationinfodisplay/blid/group"/>
-      </component>
-    </collection>
-    <collection id="landmarksui" name="Landmarks UI" level="loc">
-      <component id="landmarksui_help" filter="s60" name="Landmarks UI Help">
-        <unit bldFile="landmarksui/help/group"/>
-      </component>
-      <component id="landmarksui_engine" filter="s60" name="Landmarks UI Engine">
-        <unit bldFile="landmarksui/engine/group"/>
-      </component>
-      <component id="uicontrols" filter="s60" name="Landmarks UI Controls">
-        <unit bldFile="landmarksui/uicontrols/group"/>
-      </component>
-      <component id="landmarksui_commonui" filter="s60" name="Landmarks Common UI">
-        <unit bldFile="landmarksui/commonui/group"/>
-      </component>
-      <component id="landmarksui_app" filter="s60" name="Landmarks Application">
-        <unit bldFile="landmarksui/app/group"/>
-      </component>
-      <component id="msgviewer" filter="s60" name="Landmarks Message Viewer">
-        <unit bldFile="landmarksui/msgviewer/group"/>
-      </component>
-      <component id="landmarksui_build" filter="s60" name="Landmarks UI Build">
-      	<!-- consider distributing this into the other components or collapsing into a single component -->
-        <unit bldFile="landmarksui/group"/>
-      </component>
-    </collection>
-    <collection id="eventsui" name="Location Events UI" level="events">
-      <component id="eventsui_help" filter="s60" name="Events Help">
-        <unit bldFile="eventsui/help/group"/>
-      </component>
-      <component id="eventsutils" filter="s60" name="Events Utils">
-        <unit bldFile="eventsui/eventsutils/group"/>
-      </component>
-      <component id="eventsengine" filter="s60" name="Events Engine">
-        <unit bldFile="eventsui/eventsengine/group"/>
-      </component>
-      <component id="eventshandlerui" filter="s60" name="Events Handler UI">
-        <unit bldFile="eventsui/eventshandlerui/group"/>
-      </component>
-      <component id="eventseditor" filter="s60" name="Events Editor">
-        <unit bldFile="eventsui/eventseditor/group"/>
-      </component>
-      <component id="eventsmgmtui" filter="s60" name="Events Management UI">
-        <unit bldFile="eventsui/eventsmgmtui/group"/>
-      </component>
-      <component id="eventsui_build" filter="s60" name="Events UI Build">
-      	<!-- consider distributing this into the other components or collapsing into a single component -->
-        <unit bldFile="eventsui/group"/>
-      </component>
-    </collection>
-    <collection id="locationlandmarksrefappfors60" name="Location Landmarks Reference App for S60" level="apps">
-   		<!-- this is a component, needs to be moved down a directory -->
-      <component id="lmrefapp" filter="s60" name="Landmarks Reference Application">
-        <unit bldFile="locationlandmarksrefappfors60/group"/>
-      </component>
-    </collection>
-    <collection id="locationlandmarksuirefapp" name="Location Landmarks UI Reference App" level="apps">
-   		<!-- this is a component, needs to be moved down a directory -->
-      <component id="lmuirefapp" filter="s60" name="Landmarks UI Reference Application">
-        <unit bldFile="locationlandmarksuirefapp/group"/>
-      </component>
-    </collection>
-    <collection id="locationsatviewrefapp" name="Location Satellite View Reference App" level="apps">
-   		<!-- this is a component, needs to be moved down a directory -->
-      <component id="satellitereference" filter="s60" name="Satellite Info UI Reference Application">
-        <unit bldFile="locationsatviewrefapp/group"/>
-      </component>
-    </collection>
-    <collection id="simpsyconfigurator" name="Simulation PSY Configurator" level="ui">
-   		<!-- this is a component, needs to be moved down a directory -->    
-      <component id="simpsyui" filter="s60" name="Simulation PSY UI">
-        <unit bldFile="simpsyconfigurator/group"/>
-      </component>
-    </collection>
-    <collection id="mapnavproviderrefapp" name="Map and Navigation Provider Reference App" level="apps">
-   		<!-- this is a component, needs to be moved down a directory -->    
-      <component id="mapnavproviderrefapp_build" filter="s60" name="Map and Navigation Provider Reference Application">
-        <unit bldFile="mapnavproviderrefapp/group"/>
-      </component>
-    </collection>
-    <collection id="locationcentre" name="Location Centre" level="loc">
-	<component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
-		<unit bldFile="locationcentre/lcutils/group"/>
-	</component>
-	<component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
-		<unit bldFile="locationcentre/lcservice/group"/>
-	</component>
-	<component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
-		<unit bldFile="locationcentre/lcserver/group"/>
-	</component>
-	<component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
-		<unit bldFile="locationcentre/lcapp/group"/>
-	</component>
-	<component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
-		<!-- consider distributing this into the other components or collapsing into a single component -->
-		<unit bldFile="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="loc_pub/group"/>
-      </component>
-      <component id="loc_plat" filter="s60" class="api" name="Location Apps Platform Interfaces" introduced="^3">
-        <unit bldFile="loc_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="location" 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" href="loc_plat/location_centre_api/location_centre_api.metaxml"/>
+    <unit bldFile="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" href="loc_pub/landmarks_ui_selector_api/landmarks_ui_selector_api.metaxml"/>
+    <unit bldFile="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" href="loc_pub/landmarks_ui_addedit_api/landmarks_ui_addedit_api.metaxml"/>
+    <unit bldFile="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="basiclocationinfodisplay/blid/group"/>
+   </component>
+  </collection>
+  <collection id="landmarksui" name="Landmarks UI" level="loc">
+   <component id="landmarksui_help" filter="s60" name="Landmarks UI Help">
+    <unit bldFile="landmarksui/help/group"/>
+   </component>
+   <component id="landmarksui_engine" filter="s60" name="Landmarks UI Engine">
+    <unit bldFile="landmarksui/engine/group"/>
+   </component>
+   <component id="uicontrols" filter="s60" name="Landmarks UI Controls">
+    <unit bldFile="landmarksui/uicontrols/group"/>
+   </component>
+   <component id="landmarksui_commonui" filter="s60" name="Landmarks Common UI">
+    <unit bldFile="landmarksui/commonui/group"/>
+   </component>
+   <component id="landmarksui_app" filter="s60" name="Landmarks Application">
+    <unit bldFile="landmarksui/app/group"/>
+   </component>
+   <component id="msgviewer" filter="s60" name="Landmarks Message Viewer">
+    <unit bldFile="landmarksui/msgviewer/group"/>
+   </component>
+   <component id="landmarksui_build" filter="s60" name="Landmarks UI Build">
+    <!-- consider distributing this into the other components or collapsing into a single component -->
+    <unit bldFile="landmarksui/group"/>
+   </component>
+  </collection>
+  <collection id="eventsui" name="Location Events UI" level="events">
+   <component id="eventsui_help" filter="s60" name="Events Help">
+    <unit bldFile="eventsui/help/group"/>
+   </component>
+   <component id="eventsutils" filter="s60" name="Events Utils">
+    <unit bldFile="eventsui/eventsutils/group"/>
+   </component>
+   <component id="eventsengine" filter="s60" name="Events Engine">
+    <unit bldFile="eventsui/eventsengine/group"/>
+   </component>
+   <component id="eventshandlerui" filter="s60" name="Events Handler UI">
+    <unit bldFile="eventsui/eventshandlerui/group"/>
+   </component>
+   <component id="eventseditor" filter="s60" name="Events Editor">
+    <unit bldFile="eventsui/eventseditor/group"/>
+   </component>
+   <component id="eventsmgmtui" filter="s60" name="Events Management UI">
+    <unit bldFile="eventsui/eventsmgmtui/group"/>
+   </component>
+   <component id="eventsui_build" filter="s60" name="Events UI Build">
+    <!-- consider distributing this into the other components or collapsing into a single component -->
+    <unit bldFile="eventsui/group"/>
+   </component>
+  </collection>
+  <collection id="locationlandmarksrefappfors60" name="Location Landmarks Reference App for S60" level="apps">
+   <!-- this is a component, needs to be moved down a directory -->
+   <component id="lmrefapp" filter="s60" name="Landmarks Reference Application">
+    <unit bldFile="locationlandmarksrefappfors60/group"/>
+   </component>
+  </collection>
+  <collection id="locationlandmarksuirefapp" name="Location Landmarks UI Reference App" level="apps">
+   <!-- this is a component, needs to be moved down a directory -->
+   <component id="lmuirefapp" filter="s60" name="Landmarks UI Reference Application">
+    <unit bldFile="locationlandmarksuirefapp/group"/>
+   </component>
+  </collection>
+  <collection id="locationsatviewrefapp" name="Location Satellite View Reference App" level="apps">
+   <!-- this is a component, needs to be moved down a directory -->
+   <component id="satellitereference" filter="s60" name="Satellite Info UI Reference Application">
+    <unit bldFile="locationsatviewrefapp/group"/>
+   </component>
+  </collection>
+  <collection id="simpsyconfigurator" name="Simulation PSY Configurator" level="ui">
+   <!-- this is a component, needs to be moved down a directory -->
+   <component id="simpsyui" filter="s60" name="Simulation PSY UI">
+    <unit bldFile="simpsyconfigurator/group"/>
+   </component>
+  </collection>
+  <collection id="mapnavproviderrefapp" name="Map and Navigation Provider Reference App" level="apps">
+   <!-- this is a component, needs to be moved down a directory -->
+   <component id="mapnavproviderrefapp_build" filter="s60" name="Map and Navigation Provider Reference Application">
+    <unit bldFile="mapnavproviderrefapp/group"/>
+   </component>
+  </collection>
+  <collection id="locationcentre" name="Location Centre" level="loc">
+   <component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
+    <unit bldFile="locationcentre/lcutils/group"/>
+   </component>
+   <component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
+    <unit bldFile="locationcentre/lcservice/group"/>
+   </component>
+   <component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
+    <unit bldFile="locationcentre/lcserver/group"/>
+   </component>
+   <component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
+    <unit bldFile="locationcentre/lcapp/group"/>
+   </component>
+   <component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
+    <!-- consider distributing this into the other components or collapsing into a single component -->
+    <unit bldFile="locationcentre/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/messaging/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/messaging/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,91 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/messaging/mobilemessaging/audiomsg/group"/>
@@ -220,12 +305,6 @@
           </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="/sf/app/messaging/msg_plat/group"/>
-          </component>
-          <component name="msg_pub" long-name="Messaging Apps Public APIs" filter="s60" class="api">
-            <unit bldFile="/sf/app/messaging/msg_pub/group"/>
-          </component>
           <component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
           </component>

--- a/symbian3/app/messaging/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/messaging/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,158 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="messaging" name="Messaging Apps" levels="mail eng base ui">
-    <collection id="mobilemessaging" name="Mobile Messaging" level="ui">
-      <component id="audiomsg" filter="s60" name="Audio Message">
-        <unit bldFile="mobilemessaging/audiomsg/group"/>
-      </component>
-      <component id="msgmedia" filter="s60" name="Message Media">
-        <unit bldFile="mobilemessaging/msgmedia/group"/>
-      </component>
-      <component id="unieditor" filter="s60" name="Unified Editor">
-        <unit bldFile="mobilemessaging/unieditor/group"/>
-      </component>
-      <component id="mmsui" filter="s60" name="MMS UI">
-        <unit bldFile="mobilemessaging/mmsui/group"/>
-      </component>
-      <component id="postcard" filter="s60" name="Postcard">
-        <unit bldFile="mobilemessaging/postcard/group"/>
-      </component>
-      <component id="smilui" filter="s60" name="SMIL UI">
-        <unit bldFile="mobilemessaging/smilui/group"/>
-      </component>
-      <component id="smum" filter="s60" name="SMS UI MTM and UI Data MTM" class="plugin">
-        <unit bldFile="mobilemessaging/smum/group"/>
-      </component>
-      <component id="smsui" filter="s60" name="SMS UI">
-        <unit bldFile="mobilemessaging/smsui/group"/>
-      </component>
-      <component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
-        <unit bldFile="mobilemessaging/smsmtm/group" mrp="mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
-      </component>
-    </collection>
-    <collection id="mmsengine" name="MMS Engine" level="eng">
-      <component id="mmsconninit" filter="s60" name="MMS Connection Initiator">
-        <!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
-      </component>
-      <component id="genutils" filter="s60" name="General Utils">
-        <!-- <unit bldFile="mmsengine/genutils/bld"/> -->
-      </component>
-      <component id="mmsserversettings" filter="s60" name="MMS Server Settings">
-        <!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
-      </component>
-      <component id="mmsmessage" filter="s60" name="MMS Message">
-        <!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
-      </component>
-      <component id="mmshttptransport" filter="s60" name="MMS HTTP Transport">
-        <!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
-      </component>
-      <component id="mmscodec" filter="s60" name="MMS Codec">
-        <!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
-      </component>
-      <component id="mmsserver" filter="s60" name="MMS Server">
-        <!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
-      </component>
-      <component id="clientmtm" filter="s60" name="MMS Client MTM" class="plugin">
-        <!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
-      </component>
-      <component id="mmswatcher" filter="s60" name="MMS Watcher" class="plugin">
-        <!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
-      </component>
-      <component id="mmspushhandler" filter="s60" name="MMS Push Handler" class="plugin">
-        <!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
-      </component>
-      <component id="applicationadapter" filter="s60" name="MMS Application Adapter">
-        <!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
-      </component>
-      <component id="mmscodecclient" filter="s60" name="MMS Codec Client">
-        <!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
-      </component>
-      <component id="mmssettings" name="MMS Settings" introduced="9.2" purpose="optional">
-        <unit bldFile="mmsengine/mmssettings/group" mrp="mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-      </component>
-      <component id="mmsconf" name="MMS Configuration" purpose="optional">
-		<unit bldFile="mmsengine/mmsconf" mrp="mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-      </component>
-      <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
-	   <!-- this bld.inf should be broken up into the individual other components -->
-        <unit bldFile="mmsengine/group"/>
-      </component>
-    </collection>
-    <collection id="messagingappbase" name="Messaging App Base" level="base">
-      <component id="msgavkon" filter="s60" name="Messaging Avkon UI">
-        <unit bldFile="messagingappbase/msgavkon/group"/>
-      </component>
-      <component id="mce" filter="s60" name="Message Center Application">
-        <unit bldFile="messagingappbase/mce/group"/>
-      </component>
-      <component id="mceextraitems" filter="s60" name="Message Center Extra Items">
-        <unit bldFile="messagingappbase/mceextraitems/group"/>
-      </component>
-      <component id="mcesettings" filter="s60" name="Message Center Settings">
-        <unit bldFile="messagingappbase/mcesettings/group"/>
-      </component>
-      <component id="msgerrorwatcher" filter="s60" name="Messaging Error Watcher" class="plugin">
-        <unit bldFile="messagingappbase/msgerrorwatcher/group"/>
-      </component>
-      <component id="ncnlist" filter="s60" name="New Contacts Note List">
-        <unit bldFile="messagingappbase/ncnlist/group"/>
-      </component>
-      <component id="schemeplugin" filter="s60" name="Scheme Handler Plugin" class="plugin">
-        <unit bldFile="messagingappbase/schemeplugin/group"/>
-      </component>
-      <component id="sendui" filter="s60" name="Send UI" class="plugin">
-        <unit bldFile="messagingappbase/sendui/group"/>
-      </component>
-      <component id="smilengine" filter="s60" name="SMIL Engine">
-        <unit bldFile="messagingappbase/smilengine/group"/>
-      </component>
-      <component id="bium" filter="s60" name="BIO UI MTM" class="plugin">
-        <unit bldFile="messagingappbase/bium/group"/>
-      </component>
-      <component id="smartmessaging" filter="s60" name="Smart Messaging">
-        <unit bldFile="messagingappbase/smartmessaging/group"/>
-      </component>
-      <component id="msgeditor" filter="s60" name="Messaging Editor">
-        <unit bldFile="messagingappbase/msgeditor/group"/>
-      </component>
-      <component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
-        <unit bldFile="messagingappbase/smilparser/GROUP" mrp="messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-      </component>
-      <component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="messagingappbase/obexmtms/Group" mrp="messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-      </component>
-    </collection>
-    <collection id="email" name="Email" level="mail">
-		<!-- use commonemail instead -->
-      <component id="alwaysonlineemailplugin" filter="s60" name="Always Online Mail Plugin" class="plugin" deprecated="^3">
-        <unit bldFile="email/alwaysonlineemailplugin/group"/>
-      </component>
-      <component id="emailnotificationhandler" filter="s60" name="Email Notification Handler" class="plugin" deprecated="^3">
-        <unit bldFile="email/emailnotificationhandler/group"/>
-      </component>
-      <component id="imum" filter="s60" name="Internet Mail UI MTM" class="plugin" deprecated="^3">
-        <unit bldFile="email/imum/group"/>
-      </component>
-      <component id="mail" filter="s60" name="Mail Application" deprecated="^3">
-        <unit bldFile="email/mail/group"/>
-      </component>
-      <component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
-        <unit bldFile="email/pop3andsmtpmtm/group" mrp="email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-      </component>
-      <component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
-        <unit bldFile="email/imap4mtm/group" mrp="email/imap4mtm/group/messaging_email_imap.mrp"/>
-      </component>
-    </collection>
-    <collection id="messaging_info" name="Messaging Apps Info" level="ui">
-      <component id="msg_plat" name="Messaging Apps Platform APIs"  filter="s60" class="api">
-        <unit bldFile="msg_plat/group"/>
-      </component>
-      <component id="msg_pub" name="Messaging Apps Public APIs" filter="s60" class="api">
-        <unit bldFile="msg_pub/group"/>
-      </component>
-      <component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="messaging" 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" href="msg_pub/messaging_integration_api/messaging_integration_api.metaxml"/>
+    <unit bldFile="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" href="msg_pub/plugin_bio_control_api/plugin_bio_control_api.metaxml"/>
+    <unit bldFile="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" href="msg_pub/mms_client_mtm_api/mms_client_mtm_api.metaxml"/>
+    <unit bldFile="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" href="msg_pub/open_new_message_notification_api/open_new_message_notification_api.metaxml"/>
+    <unit bldFile="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" href="msg_pub/messaging_editor_constants_api/messaging_editor_constants_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/smil_player_launch_api/smil_player_launch_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/messaging_media_resolver_api/messaging_media_resolver_api.metaxml"/>
+    <unit bldFile="msg_plat/messaging_media_resolver_api/group"/>
+   </component>
+   <component id="smil_engine_api" name="SMIL Engine API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/smil_engine_api/smil_engine_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/mms_server_settings_api/mms_server_settings_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/new_contacts_note_secondary_display_api/new_contacts_note_secondary_display_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/messaging_center_ui_utilities_api/messaging_center_ui_utilities_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/internet_mail_mtm_ui_api/internet_mail_mtm_ui_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/messaging_editor_api/messaging_editor_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/email_domain_utilities_api/email_domain_utilities_api.metaxml"/>
+    <unit bldFile="msg_plat/email_domain_utilities_api/group"/>
+   </component>
+   <component id="smil_transition_api" name="SMIL Transition API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/smil_transition_api/smil_transition_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/new_contacts_note_status_api/new_contacts_note_status_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/unified_editor_video_conversion_api/unified_editor_video_conversion_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/mms_conformance_api/mms_conformance_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/new_contacts_note_variables_api/new_contacts_note_variables_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/new_message_notification_api/new_message_notification_api.metaxml"/>
+    <unit bldFile="msg_plat/new_message_notification_api/group"/>
+   </component>
+   <component id="mms_application_api" name="MMS Application API" class="api" filter="s60">
+    <meta rel="Api" href="msg_plat/mms_application_api/mms_application_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/mms_engine_settings_api/mms_engine_settings_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/mms_codec_client_api/mms_codec_client_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/send_ui_meeting_request_api/send_ui_meeting_request_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/new_contact_notes_extended_api/new_contact_notes_extended_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/mail_ui_constants_api/mail_ui_constants_api.metaxml"/>
+    <unit bldFile="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" href="msg_plat/sim_dialog_launch_api/sim_dialog_launch_api.metaxml"/>
+    <unit bldFile="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="mobilemessaging/audiomsg/group"/>
+   </component>
+   <component id="msgmedia" filter="s60" name="Message Media">
+    <unit bldFile="mobilemessaging/msgmedia/group"/>
+   </component>
+   <component id="unieditor" filter="s60" name="Unified Editor">
+    <unit bldFile="mobilemessaging/unieditor/group"/>
+   </component>
+   <component id="mmsui" filter="s60" name="MMS UI">
+    <unit bldFile="mobilemessaging/mmsui/group"/>
+   </component>
+   <component id="postcard" filter="s60" name="Postcard">
+    <unit bldFile="mobilemessaging/postcard/group"/>
+   </component>
+   <component id="smilui" filter="s60" name="SMIL UI">
+    <unit bldFile="mobilemessaging/smilui/group"/>
+   </component>
+   <component id="smum" filter="s60" name="SMS UI MTM and UI Data MTM" class="plugin">
+    <unit bldFile="mobilemessaging/smum/group"/>
+   </component>
+   <component id="smsui" filter="s60" name="SMS UI">
+    <unit bldFile="mobilemessaging/smsui/group"/>
+   </component>
+   <component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
+    <unit bldFile="mobilemessaging/smsmtm/group" mrp="mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmsengine" name="MMS Engine" level="eng">
+   <component id="mmsconninit" filter="s60" name="MMS Connection Initiator">
+    <!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+   </component>
+   <component id="genutils" filter="s60" name="General Utils">
+    <!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+   </component>
+   <component id="mmsserversettings" filter="s60" name="MMS Server Settings">
+    <!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+   </component>
+   <component id="mmsmessage" filter="s60" name="MMS Message">
+    <!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+   </component>
+   <component id="mmshttptransport" filter="s60" name="MMS HTTP Transport">
+    <!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+   </component>
+   <component id="mmscodec" filter="s60" name="MMS Codec">
+    <!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+   </component>
+   <component id="mmsserver" filter="s60" name="MMS Server">
+    <!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+   </component>
+   <component id="clientmtm" filter="s60" name="MMS Client MTM" class="plugin">
+    <!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+   </component>
+   <component id="mmswatcher" filter="s60" name="MMS Watcher" class="plugin">
+    <!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+   </component>
+   <component id="mmspushhandler" filter="s60" name="MMS Push Handler" class="plugin">
+    <!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+   </component>
+   <component id="applicationadapter" filter="s60" name="MMS Application Adapter">
+    <!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+   </component>
+   <component id="mmscodecclient" filter="s60" name="MMS Codec Client">
+    <!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+   </component>
+   <component id="mmssettings" name="MMS Settings" introduced="9.2" purpose="optional">
+    <unit bldFile="mmsengine/mmssettings/group" mrp="mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+   </component>
+   <component id="mmsconf" name="MMS Configuration" purpose="optional">
+    <unit bldFile="mmsengine/mmsconf" mrp="mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+   </component>
+   <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
+    <!-- this bld.inf should be broken up into the individual other components -->
+    <unit bldFile="mmsengine/group"/>
+   </component>
+  </collection>
+  <collection id="messagingappbase" name="Messaging App Base" level="base">
+   <component id="msgavkon" filter="s60" name="Messaging Avkon UI">
+    <unit bldFile="messagingappbase/msgavkon/group"/>
+   </component>
+   <component id="mce" filter="s60" name="Message Center Application">
+    <unit bldFile="messagingappbase/mce/group"/>
+   </component>
+   <component id="mceextraitems" filter="s60" name="Message Center Extra Items">
+    <unit bldFile="messagingappbase/mceextraitems/group"/>
+   </component>
+   <component id="mcesettings" filter="s60" name="Message Center Settings">
+    <unit bldFile="messagingappbase/mcesettings/group"/>
+   </component>
+   <component id="msgerrorwatcher" filter="s60" name="Messaging Error Watcher" class="plugin">
+    <unit bldFile="messagingappbase/msgerrorwatcher/group"/>
+   </component>
+   <component id="ncnlist" filter="s60" name="New Contacts Note List">
+    <unit bldFile="messagingappbase/ncnlist/group"/>
+   </component>
+   <component id="schemeplugin" filter="s60" name="Scheme Handler Plugin" class="plugin">
+    <unit bldFile="messagingappbase/schemeplugin/group"/>
+   </component>
+   <component id="sendui" filter="s60" name="Send UI" class="plugin">
+    <unit bldFile="messagingappbase/sendui/group"/>
+   </component>
+   <component id="smilengine" filter="s60" name="SMIL Engine">
+    <unit bldFile="messagingappbase/smilengine/group"/>
+   </component>
+   <component id="bium" filter="s60" name="BIO UI MTM" class="plugin">
+    <unit bldFile="messagingappbase/bium/group"/>
+   </component>
+   <component id="smartmessaging" filter="s60" name="Smart Messaging">
+    <unit bldFile="messagingappbase/smartmessaging/group"/>
+   </component>
+   <component id="msgeditor" filter="s60" name="Messaging Editor">
+    <unit bldFile="messagingappbase/msgeditor/group"/>
+   </component>
+   <component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
+    <unit bldFile="messagingappbase/smilparser/GROUP" mrp="messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+   </component>
+   <component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="messagingappbase/obexmtms/Group" mrp="messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+   </component>
+  </collection>
+  <collection id="email" name="Email" level="mail">
+   <!-- use commonemail instead -->
+   <component id="alwaysonlineemailplugin" filter="s60" name="Always Online Mail Plugin" class="plugin" deprecated="^3">
+    <unit bldFile="email/alwaysonlineemailplugin/group"/>
+   </component>
+   <component id="emailnotificationhandler" filter="s60" name="Email Notification Handler" class="plugin" deprecated="^3">
+    <unit bldFile="email/emailnotificationhandler/group"/>
+   </component>
+   <component id="imum" filter="s60" name="Internet Mail UI MTM" class="plugin" deprecated="^3">
+    <unit bldFile="email/imum/group"/>
+   </component>
+   <component id="mail" filter="s60" name="Mail Application" deprecated="^3">
+    <unit bldFile="email/mail/group"/>
+   </component>
+   <component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
+    <unit bldFile="email/pop3andsmtpmtm/group" mrp="email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+   </component>
+   <component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
+    <unit bldFile="email/imap4mtm/group" mrp="email/imap4mtm/group/messaging_email_imap.mrp"/>
+   </component>
+  </collection>
+  <collection id="messaging_info" name="Messaging Apps Info" level="ui">
+   <component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/mmsharinguis/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/mmsharinguis/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,17 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/app/mmsharinguis/mmsharing/mmshavailability/group"/>
@@ -86,7 +97,8 @@
           </component>
           <!-- consider putting client and server in the same component -->
           <component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
+            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
+            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group" filter="test,api_test"/>
           </component>
           <component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
             <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
@@ -95,7 +107,7 @@
             <unit bldFile="/sf/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="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
             <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
           </component>
@@ -125,12 +137,6 @@
             <!--  consider distributing to other components -->
             <unit bldFile="/sf/app/mmsharinguis/group"/>
           </component>
-          <component name="mmsharinguis_plat" filter="s60" long-name="Multimedia Sharing UIs Platform Interfaces" class="api">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/group"/>
-          </component>
-          <component name="mmsharinguis_plat" filter="s60,test,api_test" long-name="Multimedia Sharing UIs API Tests" class="api">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/>
-          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/app/mmsharinguis/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/mmsharinguis/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,60 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="mmsharinguis" name="Multimedia Sharing UIs" levels="base plugin if">
-    <collection id="mmsharing" name="Multimedia Sharing" level="base">
-      <component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
-        <unit bldFile="mmsharing/mmshavailability/group"/>
-      </component>
-      <component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
-        <unit bldFile="mmsharing/mmshindicator/group"/>
-      </component>
-      <!-- consider putting client and server in the same component -->
-      <component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
-        <unit bldFile="mmsharing/mmshmanagercli/group"/>
-      </component>
-      <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
-        <unit bldFile="mmsharing/mmshmanagersrv/group"/>
-      </component>
-      <component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
-        <unit bldFile="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 -->
-        <unit bldFile="mmsharing/mmshui/group"/>
-        <unit bldFile="mmsharing/mmshui/help/group"/>
-      </component>
-      <component id="mmsharing_build" filter="s60" name="MM Sharing Build">
-        <unit bldFile="mmsharing/group"/>
-      </component>
-    </collection>
-    <collection id="mmshplugins" name="Multimedia Sharing Plugins" level="plugin">
-      <component id="mmshaoplugin" filter="s60" name="Multimedia Sharing Always Online Plugin" class="plugin">
-        <unit bldFile="mmshplugins/mmshaoplugin/group"/>
-      </component>
-      <component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
-        <unit bldFile="mmshplugins/mmshaiwplugin/group"/>
-      </component>
-      <component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
-        <unit bldFile="mmshplugins/mmshsipcrplugin/group"/>
-      </component>
-      <component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
-        <unit bldFile="mmshplugins/mmshsettingsuiplugin/group"/>
-      </component>
-      <component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
-        <unit bldFile="mmshplugins/mmshwpadapterplugin/group"/>
-      </component>
-    </collection>
-    <collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
-      <component id="mmsharinguis_build" filter="s60" name="Multimedia Sharing UIs Build">
-      	<!--  consider distributing to other components -->
-        <unit bldFile="group"/>
-      </component>
-      <component id="mmsharinguis_plat" filter="s60" name="Multimedia Sharing UIs Platform Interfaces" class="api">
-        <unit bldFile="mmsharinguis_plat/group"/>
-      </component>
-      <component id="mmsharinguis_plat" filter="s60,test,api_test" name="Multimedia Sharing UIs API Tests" class="api">
-        <unit bldFile="mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="mmsharinguis" 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" href="mmsharinguis_plat/multimedia_sharing_settings_api/multimedia_sharing_settings_api.metaxml"/>
+    <unit bldFile="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" href="mmsharinguis_plat/multimedia_sharing_resource_api/multimedia_sharing_resource_api.metaxml"/>
+    <unit bldFile="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" href="mmsharinguis_plat/multimedia_sharing_manager_api/multimedia_sharing_manager_api.metaxml"/>
+    <unit bldFile="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="mmsharing/mmshavailability/group"/>
+   </component>
+   <component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
+    <unit bldFile="mmsharing/mmshindicator/group"/>
+   </component>
+   <!-- consider putting client and server in the same component -->
+   <component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
+    <unit bldFile="mmsharing/mmshmanagercli/group" filter="!test"/>
+    <unit bldFile="mmsharing/mmshmanagercli/tsrc/ut_managercli/group" filter="test,api_test"/>
+   </component>
+   <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
+    <unit bldFile="mmsharing/mmshmanagersrv/group"/>
+   </component>
+   <component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
+    <unit bldFile="mmsharing/mmshengine/group"/>
+   </component>
+   <component id="mmshui" filter="s60" name="Multimedia Sharing UI">
+    <!-- can only have one unit: need to #include one from the other if it's needed -->
+    <unit bldFile="mmsharing/mmshui/group"/>
+    <unit bldFile="mmsharing/mmshui/help/group"/>
+   </component>
+   <component id="mmsharing_build" filter="s60" name="MM Sharing Build">
+    <unit bldFile="mmsharing/group"/>
+   </component>
+  </collection>
+  <collection id="mmshplugins" name="Multimedia Sharing Plugins" level="plugin">
+   <component id="mmshaoplugin" filter="s60" name="Multimedia Sharing Always Online Plugin" class="plugin">
+    <unit bldFile="mmshplugins/mmshaoplugin/group"/>
+   </component>
+   <component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
+    <unit bldFile="mmshplugins/mmshaiwplugin/group"/>
+   </component>
+   <component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
+    <unit bldFile="mmshplugins/mmshsipcrplugin/group"/>
+   </component>
+   <component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
+    <unit bldFile="mmshplugins/mmshsettingsuiplugin/group"/>
+   </component>
+   <component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
+    <unit bldFile="mmshplugins/mmshwpadapterplugin/group"/>
+   </component>
+  </collection>
+  <collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
+   <component id="mmsharinguis_build" filter="s60" name="Multimedia Sharing UIs Build">
+    <!--  consider distributing to other components -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/musicplayer/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,35 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/musicplayer/mpxmusicplayer/help/group"/>
@@ -137,9 +166,6 @@
             <!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
             <unit bldFile="/sf/app/musicplayer/group"/>
           </component>
-          <component name="musicplayer_plat" filter="s60" long-name="Music Player Apps Platform Interfaces" class="api">
-            <unit bldFile="/sf/app/musicplayer/musicplayer_plat/group"/>
-          </component>
           <component name="musicplayer_test" filter="s60,test,pref_test,api_test" purpose="development" long-name="Music Player Apps Test">
             <unit bldFile="/sf/app/musicplayer/tsrc/group"/>
           </component>

--- a/symbian3/app/musicplayer/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,75 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="musicplayer" name="Music Player Apps" levels="plugins support hs app">
-    <collection id="mpxmusicplayer" name="MPX Music Player" level="app">
-      <component id="mpxmusicplayer_help" filter="s60" name="Help">
-        <unit bldFile="mpxmusicplayer/help/group"/>
-      </component>
-      <component id="mpxmusicplayer_commonui" filter="s60" name="MPX Common UI">
-        <unit bldFile="mpxmusicplayer/commonui/group"/>
-      </component>
-      <component id="mpx_metadatahandler" filter="s60" name="MPX Metadata Handler">
-        <unit bldFile="mpxmusicplayer/metadatahandler/group"/>
-      </component>
-      <component id="mediakeyhandler" filter="s60" name="MPX Media Key Handler">
-        <unit bldFile="mpxmusicplayer/mediakeyhandler/group"/>
-      </component>
-      <component id="mpxmusicplayer_app" filter="s60" name="MPX Application">
-        <unit bldFile="mpxmusicplayer/app/group"/>
-      </component>
-      <component id="mpxmusicplayer_build" filter="s60" name="MPX Music Player Build">
-      	<!--  can the exports be distributed to the above components?  -->
-        <unit bldFile="mpxmusicplayer/group"/>
-      </component>
-    </collection>
-    <collection id="musichomescreen_multiview" name="Music Home Screen Multiview" level="hs">
-     <meta rel="config">
-   		<defined condition="IAD_INCLUDE_ENHANCED_HOMESCREEN"/>
-   	  </meta>    
-	  <!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
-      <component id="mpxcollectionpublisher" filter="s60" name="MPX Collection Publisher" introduced="^2">
-        <!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
-      </component>
-      <component id="musiccontentpublisher" filter="s60" name="Music Content Publisher" introduced="^2">
-        <!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
-      </component>
-      <component id="mcpmusicplayer" filter="s60" name="Music Player MCP Plugin" class="plugin" introduced="^2">
-        <!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
-      </component>
-      <component id="musicplayeractionhandlerplugin" filter="s60" name="Music Player Action Handler Plugin" class="plugin" introduced="^2">
-        <!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
-      </component>
-      <component id="mpx_data" filter="s60" name="MPX Data" introduced="^2">
-      	<!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
-        <!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
-      </component>
-      <component id="musichomescreen_build" filter="s60" name="Music Homescreen Multiview Build" introduced="^2">
-        <unit bldFile="musichomescreen_multiview/group"/>
-      </component>
-    </collection>
-    <collection id="mpxplugins" name="MPX Plugins" level="plugins">
-      <component id="serviceplugins" filter="s60" name="MPX Service Plugins" class="plugin">
-        <unit bldFile="mpxplugins/serviceplugins/group"/>
-      </component>
-      <component id="viewplugins" filter="s60" name="MPX View Plugins" class="plugin">
-        <unit bldFile="mpxplugins/viewplugins/group"/>
-      </component>
-      <component id="mpxplugins_build" filter="s60" name="MPX Plugins Build">
-      	<!--  can the exports be distributed to the above components?  -->
-        <unit bldFile="mpxplugins/group"/>
-      </component>
-    </collection>
-    <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
-      <component id="musicplayer_build" filter="s60" name="Music Player Build">
-      	<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
-        <unit bldFile="group"/>
-      </component>
-      <component id="musicplayer_plat" filter="s60" name="Music Player Apps Platform Interfaces" class="api">
-        <unit bldFile="musicplayer_plat/group"/>
-      </component>
-      <component id="musicplayer_test" filter="s60,test,pref_test,api_test" purpose="development" name="Music Player Apps Test">
-		<unit bldFile="tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="musicplayer" 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" href="musicplayer_plat/mpx_music_player_app_api/mpx_music_player_app_api.metaxml"/>
+    <unit bldFile="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" href="musicplayer_plat/mpx_music_player_commonui_api/mpx_music_player_commonui_api.metaxml"/>
+    <unit bldFile="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" href="musicplayer_plat/mpx_music_player_media_key_handler_api/mpx_music_player_media_key_handler_api.metaxml"/>
+    <unit bldFile="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" href="musicplayer_plat/mpx_music_player_remote_control_api/mpx_music_player_remote_control_api.metaxml"/>
+    <unit bldFile="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" href="musicplayer_plat/mpx_music_shop_ui_api/mpx_music_shop_ui_api.metaxml"/>
+    <unit bldFile="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" href="musicplayer_plat/mpx_music_wap_adapter_cenrep_api/mpx_music_wap_adapter_cenrep_api.metaxml"/>
+    <unit bldFile="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" href="musicplayer_plat/mpx_music_store_api/mpx_music_store_api.metaxml"/>
+    <unit bldFile="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" href="musicplayer_plat/audio_application_features_api/audio_application_features_api.metaxml"/>
+    <unit bldFile="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" href="musicplayer_plat/music_content_publisher_plugin_api/music_content_publisher_plugin_api.metaxml"/>
+    <unit bldFile="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="mpxmusicplayer/help/group"/>
+   </component>
+   <component id="mpxmusicplayer_commonui" filter="s60" name="MPX Common UI">
+    <unit bldFile="mpxmusicplayer/commonui/group"/>
+   </component>
+   <component id="mpx_metadatahandler" filter="s60" name="MPX Metadata Handler">
+    <unit bldFile="mpxmusicplayer/metadatahandler/group"/>
+   </component>
+   <component id="mediakeyhandler" filter="s60" name="MPX Media Key Handler">
+    <unit bldFile="mpxmusicplayer/mediakeyhandler/group"/>
+   </component>
+   <component id="mpxmusicplayer_app" filter="s60" name="MPX Application">
+    <unit bldFile="mpxmusicplayer/app/group"/>
+   </component>
+   <component id="mpxmusicplayer_build" filter="s60" name="MPX Music Player Build">
+    <!--  can the exports be distributed to the above components?  -->
+    <unit bldFile="mpxmusicplayer/group"/>
+   </component>
+  </collection>
+  <collection id="musichomescreen_multiview" name="Music Home Screen Multiview" level="hs">
+   <meta rel="config">
+    <defined condition="IAD_INCLUDE_ENHANCED_HOMESCREEN"/>
+   </meta>
+   <!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
+   <component id="mpxcollectionpublisher" filter="s60" name="MPX Collection Publisher" introduced="^2">
+    <!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
+   </component>
+   <component id="musiccontentpublisher" filter="s60" name="Music Content Publisher" introduced="^2">
+    <!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
+   </component>
+   <component id="mcpmusicplayer" filter="s60" name="Music Player MCP Plugin" class="plugin" introduced="^2">
+    <!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
+   </component>
+   <component id="musicplayeractionhandlerplugin" filter="s60" name="Music Player Action Handler Plugin" class="plugin" introduced="^2">
+    <!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
+   </component>
+   <component id="mpx_data" filter="s60" name="MPX Data" introduced="^2">
+    <!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
+    <!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
+   </component>
+   <component id="musichomescreen_build" filter="s60" name="Music Homescreen Multiview Build" introduced="^2">
+    <unit bldFile="musichomescreen_multiview/group"/>
+   </component>
+  </collection>
+  <collection id="mpxplugins" name="MPX Plugins" level="plugins">
+   <component id="serviceplugins" filter="s60" name="MPX Service Plugins" class="plugin">
+    <unit bldFile="mpxplugins/serviceplugins/group"/>
+   </component>
+   <component id="viewplugins" filter="s60" name="MPX View Plugins" class="plugin">
+    <unit bldFile="mpxplugins/viewplugins/group"/>
+   </component>
+   <component id="mpxplugins_build" filter="s60" name="MPX Plugins Build">
+    <!--  can the exports be distributed to the above components?  -->
+    <unit bldFile="mpxplugins/group"/>
+   </component>
+  </collection>
+  <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
+   <component id="musicplayer_build" filter="s60" name="Music Player Build">
+    <!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
+    <unit bldFile="group"/>
+   </component>
+   <component id="musicplayer_test" filter="s60,test,pref_test,api_test" purpose="development" name="Music Player Apps Test">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/organizer/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/organizer/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,82 +1,152 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/organizer/alarmengines/missedalarmstore/group"/>
@@ -98,7 +168,7 @@
           <component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
             <unit bldFile="/sf/app/organizer/calendarengines/calenlauncher/group"/>
           </component>
-          <component name="caldav" filter="s60" long-name="CalDav Server" introduced="^3">
+          <component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
             <unit bldFile="/sf/app/organizer/calendarengines/caldav/group"/>
           </component>
         </collection>
@@ -267,12 +337,6 @@
           </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="/sf/app/organizer/organizer_pub/group"/>
-          </component>
-          <component name="organizer_plat" filter="s60" long-name="Organizer Application Suite Platform Interfaces" class="api">
-            <unit bldFile="/sf/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="/sf/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
           </component>

--- a/symbian3/app/organizer/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/organizer/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,210 +1,296 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="organizer" name="Organizer Application Suite" levels="support services engine ui app">
-    <collection id="alarmengines" name="Alarm Engines" level="engine">
-      <component id="missedalarmstore" filter="s60" name="Missed Alarm Store">
-        <unit bldFile="alarmengines/missedalarmstore/group"/>
-      </component>
-    </collection>
-    <collection id="calendarengines" name="Calendar Engines" level="engine">
-      <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
-        <unit bldFile="calendarengines/versit2/group"/>
-      </component>
-      <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
-        <unit bldFile="calendarengines/agnversit2/group"/>
-      </component>
-      <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
-        <unit bldFile="calendarengines/caleninterimutils/group"/>
-      </component>
-      <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
-        <unit bldFile="calendarengines/calenimp/group"/>
-      </component>
-      <component id="calenlauncher" filter="s60" name="Calendar Launcher">
-        <unit bldFile="calendarengines/calenlauncher/group"/>
-      </component>
-      <component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
-        <unit bldFile="calendarengines/caldav/group"/>
-      </component>
-    </collection>
-    <collection id="meetingrequestengines" name="Meeting Request Engines" level="engine">
-      <component id="mrmailbox" filter="s60" name="Meeting Request Mailbox">
-        <unit bldFile="meetingrequestengines/mrmailbox/group"/>
-      </component>
-      <component id="mrmailboxutils" filter="s60" name="Meeting Request Mailbox Utils" class="plugin">
-        <unit bldFile="meetingrequestengines/mrmailboxutils/group"/>
-      </component>
-    </collection>
-    <collection id="searchfw" name="Search Framework" level="services">
-      	<meta rel="config">
-      		<defined condition="RD_GENERAL_SEARCH"/>
-      	</meta>
-		<!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
-      <component id="coresearchfw" filter="s60" name="Core Search Framework" introduced="^1">
-        <!--<unit bldFile="searchfw/coresearchfw/group"/>-->
-      </component>
-      <component id="searchfw_plugins" filter="s60" name="Search Plugins" class="plugin" introduced="^1">
-        <!--<unit bldFile="searchfw/plugins/group"/>-->
-      </component>
-      <component id="searchfw_build" filter="s60" name="Search Framework Build" introduced="^1">
-        <unit bldFile="searchfw/group"/>
-      </component>
-    </collection>
-    <collection id="alarmui" name="Alarm UI" level="app">
-    	<!-- collection is really a component, should move down a directory -->
-      <component id="alarmui_build" filter="s60" name="Alarm UI Build">
-        <unit bldFile="alarmui/group"/>
-      </component>
-    </collection>
-    <collection id="calendarui" name="Calendar UI" level="ui">
-      <component id="calendarui_help" filter="s60" name="Calendar UI Help">
-        <unit bldFile="calendarui/help/group"/>
-      </component>
-      <component id="commonutils" filter="s60" name="Calendar Common Utils">
-        <unit bldFile="calendarui/commonutils/group"/>
-      </component>
-      <component id="globaldata" filter="s60" name="Calendar Global Data">
-        <unit bldFile="calendarui/globaldata/group"/>
-      </component>
-      <component id="settings" filter="s60" name="Calendar Settings">
-		<!-- these should be merged into a single bld.inf or split into two components -->
-        <unit bldFile="calendarui/settings/gsplugin/group"/>
-        <unit bldFile="calendarui/settings/settingsui/group"/>
-      </component>
-      <component id="customisation" filter="s60" name="Calendar Customisation">
-        <unit bldFile="calendarui/customisation/group"/>
-      </component>
-      <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
-        <unit bldFile="calendarui/customisationmanager/group"/>
-      </component>
-      <component id="multicaluidialog" filter="s60" name="Multi-Calendar UI Dialog" introduced="^3">
-        <unit bldFile="calendarui/multicaluidialog/group"/>
-      </component>
-      <component id="views" filter="s60" name="Calendar Views">
-        <unit bldFile="calendarui/views/group"/>
-      </component>
-      <component id="calendarui_controller" filter="s60" name="Calendar Controller">
-        <unit bldFile="calendarui/controller/group"/>
-      </component>
-      <component id="calendarui_editors" filter="s60" name="Calendar Editors">
-        <unit bldFile="calendarui/editors/group"/>
-      </component>
-      <component id="calendarui_application" filter="s60" name="Calendar Application">
-        <unit bldFile="calendarui/application/group"/>
-      </component>
-      <component id="missedalarmindicatorplugin" filter="s60" name="Missed Alarm Indicator Plugin" class="plugin">
-        <unit bldFile="calendarui/missedalarmindicatorplugin/group"/>
-      </component>
-      <component id="calendarui_server" filter="s60" name="Calendar Server">
-	    <!-- these should be merged into a single bld.inf or split into two components -->
-        <unit bldFile="calendarui/server/calensvr/group"/>
-        <unit bldFile="calendarui/server/calensvrclient/group"/>
-      </component>
-      <component id="regionalplugins" filter="s60" name="Calendar Regional Plugins" class="plugin">
-	    <!-- these should be merged into a single bld.inf or split into four components -->
-        <unit bldFile="calendarui/regionalplugins/calenregionalutil/group"/>
-        <unit bldFile="calendarui/regionalplugins/lunarchinese/group"/>
-        <unit bldFile="calendarui/regionalplugins/lunarvietnamese/group"/>
-        <unit bldFile="calendarui/regionalplugins/thai/group"/>
-      </component>
-      <component id="calenaiwprovider" filter="s60" name="Calendar AIW Proivder" class="plugin" introduced="^3">
-        <unit bldFile="calendarui/calenaiwprovider/group"/>
-      </component>
-      <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
-        <unit bldFile="calendarui/caldav/group"/>
-      </component>
-      <component id="calendarui_build" filter="s60" name="Calendar UI Build">
-      	<!-- split contents into separate components -->
-        <unit bldFile="calendarui/group"/>
-      </component>
-    </collection>
-    <collection id="meetingui" name="Meeting UI" level="ui">
-      <component id="attendeeview" filter="s60" name="Attendee View">
-        <unit bldFile="meetingui/attendeeview/group"/>
-      </component>
-      <component id="agnentryui" filter="s60" name="Agenda Entry UI" class="plugin">
-        <unit bldFile="meetingui/agnentryui/group"/>
-      </component>
-      <component id="meetingrequestutils" filter="s60" name="Meeting Request Utils">
-        <unit bldFile="meetingui/meetingrequestutils/group"/>
-      </component>
-      <component id="meetingrequestviewers" filter="s60" name="Meeting Request Viewers" class="plugin">
-        <unit bldFile="meetingui/meetingrequestviewers/group"/>
-      </component>
-      <component id="meetingui_build" filter="s60" name="Meeting UI Build">
-      	<!-- split contents into separate components -->
-        <unit bldFile="meetingui/group"/>
-      </component>
-    </collection>    
-    <collection id="clock2" name="Clock" level="app">
-      <component id="clockengines" filter="s60" name="Clock Engines">
-        <unit bldFile="clock2/clockengines/group"/>
-      </component>
-      <component id="clockui" filter="s60" name="Clock UI">
-        <unit bldFile="clock2/clockui/group"/>
-      </component>
-      <component id="clock2_help" filter="s60" name="Clock Help">
-        <unit bldFile="clock2/help/group"/>
-      </component>
-      <component id="clock2_build" filter="s60" name="Clock Build">
-      	<!-- split contents into separate components, or just make this one component -->
-        <unit bldFile="clock2/group"/>
-      </component>
-    </collection>
-    <collection id="notepad" name="Notepad" level="ui">
-      <component id="notepad_help" filter="s60" name="Notepad Help">
-        <unit bldFile="notepad/help/group"/>
-      </component>
-      <component id="notepad1" filter="s60" name="Notepad Application 1">
-        <unit bldFile="notepad/notepad1/group"/>
-      </component>
-      <component id="txtrecog" filter="s60" name="Text Recognizer" class="plugin">
-        <unit bldFile="notepad/txtrecog/group"/>
-      </component>
-    </collection>
+ <package id="organizer" 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" href="organizer_plat/meeting_request_mailbox_utilities_api/meeting_request_mailbox_utilities_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/meeting_request_uids_api/meeting_request_uids_api.metaxml"/>
+    <unit bldFile="organizer_plat/meeting_request_uids_api/group"/>
+   </component>
+   <component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_plat/calendar_exporter_api/calendar_exporter_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/agenda_versit_2_api/agenda_versit_2_api.metaxml"/>
+    <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>
+   </component>
+   <component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_plat/calendar_importer_api/calendar_importer_api.metaxml"/>
+    <unit bldFile="organizer_plat/calendar_importer_api/group"/>
+   </component>
+   <component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_plat/calendar_launcher_api/calendar_launcher_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/calendar_common_utils_api/calendar_common_utils_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/searchfw_launcher_api/searchfw_launcher_api.metaxml"/>
+    <unit bldFile="organizer_plat/searchfw_launcher_api/group"/>
+   </component>
+   <component id="alarm_const_api" name="Alarm Const API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_plat/alarm_const_api/alarm_const_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/alarm_ui_external_control_api/alarm_ui_external_control_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/calendar_settings_keys_api/calendar_settings_keys_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/calendar_tones_settings_keys_api/calendar_tones_settings_keys_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/clock_settings_api/clock_settings_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/common_alarm_editor_api/common_alarm_editor_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/alarm_ui_secondary_display_api/alarm_ui_secondary_display_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/searchui_launcher_api/searchui_launcher_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/agenda_entry_ui_api/agenda_entry_ui_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/meeting_request_utillities_api/meeting_request_utillities_api.metaxml"/>
+    <unit bldFile="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" href="organizer_plat/meeting_request_viewer_api/meeting_request_viewer_api.metaxml"/>
+    <unit bldFile="organizer_plat/meeting_request_viewer_api/group"/>
+   </component>
+   <component id="calendar_custamization_api" name="Calendar Customization API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_plat/calendar_custamization_api/calendar_custamization_api.metaxml"/>
+    <unit bldFile="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" href="organizer_pub/calendar_interim_utils2_api/calendar_interim_utils2_api.metaxml"/>
+    <unit bldFile="organizer_pub/calendar_interim_utils2_api/group"/>
+   </component>
+   <component id="notepad_library_api" name="Notepad Library API" class="api" filter="s60">
+    <meta rel="Api" href="organizer_pub/notepad_library_api/notepad_library_api.metaxml"/>
+    <unit bldFile="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="alarmengines/missedalarmstore/group"/>
+   </component>
+  </collection>
+  <collection id="calendarengines" name="Calendar Engines" level="engine">
+   <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
+    <unit bldFile="calendarengines/versit2/group"/>
+   </component>
+   <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+    <unit bldFile="calendarengines/agnversit2/group"/>
+   </component>
+   <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+    <unit bldFile="calendarengines/caleninterimutils/group"/>
+   </component>
+   <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+    <unit bldFile="calendarengines/calenimp/group"/>
+   </component>
+   <component id="calenlauncher" filter="s60" name="Calendar Launcher">
+    <unit bldFile="calendarengines/calenlauncher/group"/>
+   </component>
+   <component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
+    <unit bldFile="calendarengines/caldav/group"/>
+   </component>
+  </collection>
+  <collection id="meetingrequestengines" name="Meeting Request Engines" level="engine">
+   <component id="mrmailbox" filter="s60" name="Meeting Request Mailbox">
+    <unit bldFile="meetingrequestengines/mrmailbox/group"/>
+   </component>
+   <component id="mrmailboxutils" filter="s60" name="Meeting Request Mailbox Utils" class="plugin">
+    <unit bldFile="meetingrequestengines/mrmailboxutils/group"/>
+   </component>
+  </collection>
+  <collection id="searchfw" name="Search Framework" level="services">
+   <meta rel="config">
+    <defined condition="RD_GENERAL_SEARCH"/>
+   </meta>
+   <!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
+   <component id="coresearchfw" filter="s60" name="Core Search Framework" introduced="^1">
+    <!--<unit bldFile="searchfw/coresearchfw/group"/>-->
+   </component>
+   <component id="searchfw_plugins" filter="s60" name="Search Plugins" class="plugin" introduced="^1">
+    <!--<unit bldFile="searchfw/plugins/group"/>-->
+   </component>
+   <component id="searchfw_build" filter="s60" name="Search Framework Build" introduced="^1">
+    <unit bldFile="searchfw/group"/>
+   </component>
+  </collection>
+  <collection id="alarmui" name="Alarm UI" level="app">
+   <!-- collection is really a component, should move down a directory -->
+   <component id="alarmui_build" filter="s60" name="Alarm UI Build">
+    <unit bldFile="alarmui/group"/>
+   </component>
+  </collection>
+  <collection id="calendarui" name="Calendar UI" level="ui">
+   <component id="calendarui_help" filter="s60" name="Calendar UI Help">
+    <unit bldFile="calendarui/help/group"/>
+   </component>
+   <component id="commonutils" filter="s60" name="Calendar Common Utils">
+    <unit bldFile="calendarui/commonutils/group"/>
+   </component>
+   <component id="globaldata" filter="s60" name="Calendar Global Data">
+    <unit bldFile="calendarui/globaldata/group"/>
+   </component>
+   <component id="settings" filter="s60" name="Calendar Settings">
+    <!-- these should be merged into a single bld.inf or split into two components -->
+    <unit bldFile="calendarui/settings/gsplugin/group"/>
+    <unit bldFile="calendarui/settings/settingsui/group"/>
+   </component>
+   <component id="customisation" filter="s60" name="Calendar Customisation">
+    <unit bldFile="calendarui/customisation/group"/>
+   </component>
+   <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
+    <unit bldFile="calendarui/customisationmanager/group"/>
+   </component>
+   <component id="multicaluidialog" filter="s60" name="Multi-Calendar UI Dialog" introduced="^3">
+    <unit bldFile="calendarui/multicaluidialog/group"/>
+   </component>
+   <component id="views" filter="s60" name="Calendar Views">
+    <unit bldFile="calendarui/views/group"/>
+   </component>
+   <component id="calendarui_controller" filter="s60" name="Calendar Controller">
+    <unit bldFile="calendarui/controller/group"/>
+   </component>
+   <component id="calendarui_editors" filter="s60" name="Calendar Editors">
+    <unit bldFile="calendarui/editors/group"/>
+   </component>
+   <component id="calendarui_application" filter="s60" name="Calendar Application">
+    <unit bldFile="calendarui/application/group"/>
+   </component>
+   <component id="missedalarmindicatorplugin" filter="s60" name="Missed Alarm Indicator Plugin" class="plugin">
+    <unit bldFile="calendarui/missedalarmindicatorplugin/group"/>
+   </component>
+   <component id="calendarui_server" filter="s60" name="Calendar Server">
+    <!-- these should be merged into a single bld.inf or split into two components -->
+    <unit bldFile="calendarui/server/calensvr/group"/>
+    <unit bldFile="calendarui/server/calensvrclient/group"/>
+   </component>
+   <component id="regionalplugins" filter="s60" name="Calendar Regional Plugins" class="plugin">
+    <!-- these should be merged into a single bld.inf or split into four components -->
+    <unit bldFile="calendarui/regionalplugins/calenregionalutil/group"/>
+    <unit bldFile="calendarui/regionalplugins/lunarchinese/group"/>
+    <unit bldFile="calendarui/regionalplugins/lunarvietnamese/group"/>
+    <unit bldFile="calendarui/regionalplugins/thai/group"/>
+   </component>
+   <component id="calenaiwprovider" filter="s60" name="Calendar AIW Proivder" class="plugin" introduced="^3">
+    <unit bldFile="calendarui/calenaiwprovider/group"/>
+   </component>
+   <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+    <unit bldFile="calendarui/caldav/group"/>
+   </component>
+   <component id="calendarui_build" filter="s60" name="Calendar UI Build">
+    <!-- split contents into separate components -->
+    <unit bldFile="calendarui/group"/>
+   </component>
+  </collection>
+  <collection id="meetingui" name="Meeting UI" level="ui">
+   <component id="attendeeview" filter="s60" name="Attendee View">
+    <unit bldFile="meetingui/attendeeview/group"/>
+   </component>
+   <component id="agnentryui" filter="s60" name="Agenda Entry UI" class="plugin">
+    <unit bldFile="meetingui/agnentryui/group"/>
+   </component>
+   <component id="meetingrequestutils" filter="s60" name="Meeting Request Utils">
+    <unit bldFile="meetingui/meetingrequestutils/group"/>
+   </component>
+   <component id="meetingrequestviewers" filter="s60" name="Meeting Request Viewers" class="plugin">
+    <unit bldFile="meetingui/meetingrequestviewers/group"/>
+   </component>
+   <component id="meetingui_build" filter="s60" name="Meeting UI Build">
+    <!-- split contents into separate components -->
+    <unit bldFile="meetingui/group"/>
+   </component>
+  </collection>
+  <collection id="clock2" name="Clock" level="app">
+   <component id="clockengines" filter="s60" name="Clock Engines">
+    <unit bldFile="clock2/clockengines/group"/>
+   </component>
+   <component id="clockui" filter="s60" name="Clock UI">
+    <unit bldFile="clock2/clockui/group"/>
+   </component>
+   <component id="clock2_help" filter="s60" name="Clock Help">
+    <unit bldFile="clock2/help/group"/>
+   </component>
+   <component id="clock2_build" filter="s60" name="Clock Build">
+    <!-- split contents into separate components, or just make this one component -->
+    <unit bldFile="clock2/group"/>
+   </component>
+  </collection>
+  <collection id="notepad" name="Notepad" level="ui">
+   <component id="notepad_help" filter="s60" name="Notepad Help">
+    <unit bldFile="notepad/help/group"/>
+   </component>
+   <component id="notepad1" filter="s60" name="Notepad Application 1">
+    <unit bldFile="notepad/notepad1/group"/>
+   </component>
+   <component id="txtrecog" filter="s60" name="Text Recognizer" class="plugin">
+    <unit bldFile="notepad/txtrecog/group"/>
+   </component>
+  </collection>
     <collection id="searchui" name="Search UI" level="app"> <!-- consider making this a single component -->
-      	<meta rel="config">
-      		<defined condition="RD_GENERAL_SEARCH"/>
-      	</meta>
-		<!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
-      <component id="searchui_help" filter="s60" name="Search UI Help">
-        <!--<unit bldFile="searchui/help/group"/>-->
-      </component>
-      <component id="searchapp" filter="s60" name="Search Application">
-        <!--<unit bldFile="searchui/searchapp/group"/>-->
-      </component>
-      <component id="searchui_build" filter="s60" name="Search UI Build">
-        <unit bldFile="searchui/group"/>
-      </component>
-    </collection>
-    <collection id="pimappservices" name="PIM Application Services" level="services">
-      <component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
-        <unit version="2" bldFile="pimappservices/calendar/group" mrp="pimappservices/calendar/group/app-engines_calendar.mrp"/>
-      </component>
-      <component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
-        <unit version="2" bldFile="pimappservices/calendarvcalplugin/group" mrp="pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
-      </component>
-      <component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
-        <unit mrp="pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-      </component>
-    </collection>
-    <collection id="pimappsupport" name="PIM Application Support" level="support">
-      <component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
-        <unit bldFile="pimappsupport/vcardandvcal/group" mrp="pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-      </component>
-      <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
-        <unit bldFile="pimappsupport/chinesecalendarconverter/group" mrp="pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-      </component>
-    </collection>
-    <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
-      <component id="organizer_pub" filter="s60" name="Organizer Application Suite Public Interfaces" class="api">
-        <unit bldFile="organizer_pub/group"/>
-      </component>
-      <component id="organizer_plat" filter="s60" name="Organizer Application Suite Platform Interfaces" class="api">
-        <unit bldFile="organizer_plat/group"/>
-      </component>
-      <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+   <meta rel="config">
+    <defined condition="RD_GENERAL_SEARCH"/>
+   </meta>
+   <!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
+   <component id="searchui_help" filter="s60" name="Search UI Help">
+    <!--<unit bldFile="searchui/help/group"/>-->
+   </component>
+   <component id="searchapp" filter="s60" name="Search Application">
+    <!--<unit bldFile="searchui/searchapp/group"/>-->
+   </component>
+   <component id="searchui_build" filter="s60" name="Search UI Build">
+    <unit bldFile="searchui/group"/>
+   </component>
+  </collection>
+  <collection id="pimappservices" name="PIM Application Services" level="services">
+   <component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
+    <unit version="2" bldFile="pimappservices/calendar/group" mrp="pimappservices/calendar/group/app-engines_calendar.mrp"/>
+   </component>
+   <component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
+    <unit version="2" bldFile="pimappservices/calendarvcalplugin/group" mrp="pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
+   </component>
+   <component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
+    <unit mrp="pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+   </component>
+  </collection>
+  <collection id="pimappsupport" name="PIM Application Support" level="support">
+   <component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
+    <unit bldFile="pimappsupport/vcardandvcal/group" mrp="pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+   </component>
+   <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+    <unit bldFile="pimappsupport/chinesecalendarconverter/group" mrp="pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+   </component>
+  </collection>
+  <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
+   <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/phone/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/phone/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,88 +1,142 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/phone/phoneapp/blacklist/group"/>
           </component>
           <component name="phoneui" filter="s60" long-name="Phone UI">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneui/group"/>
+            <unit bldFile="/sf/app/phone/phoneapp/phoneui/group" filter="!test"/>
+            <unit bldFile="/sf/app/phone/phoneapp/phoneui/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
           <component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
             <unit bldFile="/sf/app/phone/phoneapp/phoneuicontrol/group"/>
@@ -105,9 +159,6 @@
           <component name="phonemediatorcenter" filter="s60" long-name="Phone Mediator Center">
             <unit bldFile="/sf/app/phone/phoneapp/phonemediatorcenter/group"/>
           </component>
-          <component name="phoneapp_api_test" filter="s60,test,api_test" long-name="Phone App API Tests">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneui/tsrc/public/basic/group"/>
-          </component>
         </collection>
         <collection name="phoneengine" long-name="Phone Engine" level="engine">
           <component name="phonecntfinder" filter="s60" long-name="Phone Contact Finder">
@@ -145,9 +196,10 @@
         </collection>
         <collection name="phoneuis" long-name="Phone UIs" level="ui">
           <component name="dialer" filter="s60" long-name="Dialer">
-            <unit bldFile="/sf/app/phone/phoneuis/dialer/group"/>
+            <unit bldFile="/sf/app/phone/phoneuis/dialer/group" filter="!test"/>
+            <unit bldFile="/sf/app/phone/phoneuis/dialer/tsrc/public/basic/group" filter="test,api_test"/>
           </component>
-          <component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" plugin="Y" introduced="^3">
+          <component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/phone/phoneuis/easydialing/group"/>
           </component>
           <component name="bubblemanager" filter="s60" long-name="Phone Bubble Manager">
@@ -165,14 +217,6 @@
           <component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
             <unit bldFile="/sf/app/phone/phoneuis/telephonydevicemode/group"/>
           </component>
-          <component name="phoneuis_api_test" filter="s60,test,api_test" long-name="Phone UIs API Tests">
-            <unit bldFile="/sf/app/phone/phoneuis/dialer/tsrc/public/basic/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="/sf/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">

--- a/symbian3/app/phone/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/phone/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,108 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="phone" name="Phone Apps" levels="engine plugin ui app">
-    <collection id="phoneapp" name="Phone Application" level="app">
-      <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
-        <unit bldFile="phoneapp/blacklist/group"/>
-      </component>
-      <component id="phoneui" filter="s60" name="Phone UI">
-        <unit bldFile="phoneapp/phoneui/group"/>
-      </component>
-      <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
-        <unit bldFile="phoneapp/phoneuicontrol/group"/>
-      </component>
-      <component id="phoneuistates" filter="s60" name="Phone UI States">
-        <unit bldFile="phoneapp/phoneuistates/group"/>
-      </component>
-      <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
-        <unit bldFile="phoneapp/phoneuiutils/group"/>
-      </component>
-      <component id="phoneuiview" filter="s60" name="Phone UI View">
-        <unit bldFile="phoneapp/phoneuiview/group"/>
-      </component>
-      <component id="phoneuivoipextension" filter="s60" name="Phone UI VOIP Extension">
-        <unit bldFile="phoneapp/phoneuivoipextension/group"/>
-      </component>
-      <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
-        <unit bldFile="phoneapp/silenceactionplugin/group"/>
-      </component>
-      <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
-        <unit bldFile="phoneapp/phonemediatorcenter/group"/>
-      </component>
-      <component id="phoneapp_api_test" filter="s60,test,api_test" name="Phone App API Tests">
-		<unit bldFile="phoneapp/phoneui/tsrc/public/basic/group"/>
-      </component>      
-    </collection>
-    <collection id="phoneengine" name="Phone Engine" level="engine">
-      <component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
-        <unit bldFile="phoneengine/phonecntfinder/group"/>
-      </component>
-      <component id="audiohandling" filter="s60" name="Phone Audio Handling">
-        <unit bldFile="phoneengine/audiohandling/group"/>
-      </component>
-      <component id="callhandling" filter="s60" name="Call Handling">
-        <unit bldFile="phoneengine/callhandling/group"/>
-      </component>
-      <component id="contacthandling" filter="s60" name="Phone Contact Handling">
-        <unit bldFile="phoneengine/contacthandling/group"/>
-      </component>
-      <component id="loghandling" filter="s60" name="Phone Log Handling">
-        <unit bldFile="phoneengine/loghandling/group"/>
-      </component>
-      <component id="engineinfo" filter="s60" name="Phone Engine Info">
-        <unit bldFile="phoneengine/engineinfo/group"/>
-      </component>
-      <component id="phonemodel" filter="s60" name="Phone Model">
-        <unit bldFile="phoneengine/phonemodel/group"/>
-      </component>
-      <component id="servicehandling" filter="s60" name="Phone Service Handling">
-        <unit bldFile="phoneengine/servicehandling/group"/>
-      </component>
-    </collection>
-    <collection id="phonesettings" name="Phone Settings" level="plugin">
-      <component id="aiwcallimageplugin" filter="s60" name="Call Image AIW Plugin" class="plugin">
-        <unit bldFile="phonesettings/aiwcallimageplugin/group"/>
-      </component>
-      <component id="pslncallimageplugin" filter="s60" name="Call Image Personalization Plugin"  class="plugin">
-        <unit bldFile="phonesettings/pslncallimageplugin/group"/>
-      </component>
-    </collection>
-    <collection id="phoneuis" name="Phone UIs" level="ui">
-      <component id="dialer" filter="s60" name="Dialer">
-        <unit bldFile="phoneuis/dialer/group"/>
-      </component>
-      <component id="easydialing" filter="s60" name="Easy Dialing Plugin" class="plugin" introduced="^3">
-        <unit bldFile="phoneuis/easydialing/group"/>
-      </component>
-      <component id="bubblemanager" filter="s60" name="Phone Bubble Manager">
-        <unit bldFile="phoneuis/bubblemanager/group"/>
-      </component>
-      <component id="connectutil" filter="s60" name="Connection Utility" class="plugin">
-        <unit bldFile="phoneuis/connectutil/group"/>
-      </component>
-      <component id="ussd" filter="s60" name="Unstructured Supplementary Services Data">
-        <unit bldFile="phoneuis/ussd/group"/>
-      </component>
-      <component id="vmbx" filter="s60" name="Voice Mailbox">
-        <unit bldFile="phoneuis/vmbx/group"/>
-      </component>
-      <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
-        <unit bldFile="phoneuis/telephonydevicemode/group"/>
-      </component>
-      <component id="phoneuis_api_test" filter="s60,test,api_test" name="Phone UIs API Tests">
-        <unit bldFile="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="phone_plat/group"/>
-      </component>
-    </collection>
-    <collection id="phoneplugins" name="Phone Plugins" level="plugin">
-      <component id="telbranding" filter="s60" name="Tel Branding" class="plugin" introduced="^2">
-        <unit bldFile="phoneplugins/telbranding/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="phone" 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" href="phone_plat/3d_ringing_tone_enabler_api/3d_ringing_tone_enabler_api.metaxml"/>
+    <unit bldFile="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" href="phone_plat/telephony_comms_information_api/telephony_comms_information_api.metaxml"/>
+    <unit bldFile="phone_plat/telephony_comms_information_api/group"/>
+   </component>
+   <component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
+    <meta rel="Api" href="phone_plat/telephony_information_api/telephony_information_api.metaxml"/>
+    <unit bldFile="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" href="phone_plat/telephony_device_mode_api/telephony_device_mode_api.metaxml"/>
+    <unit bldFile="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" href="phone_plat/telephony_remote_party_information_api/telephony_remote_party_information_api.metaxml"/>
+    <unit bldFile="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" href="phone_plat/telephony_video_mailbox_settings_api/telephony_video_mailbox_settings_api.metaxml"/>
+    <unit bldFile="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" href="phone_plat/telephony_configuration_api/telephony_configuration_api.metaxml"/>
+    <unit bldFile="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" href="phone_plat/telephony_microphone_mute_status_api/telephony_microphone_mute_status_api.metaxml"/>
+    <unit bldFile="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" href="phone_plat/dialer_keypad_api/dialer_keypad_api.metaxml"/>
+    <unit bldFile="phone_plat/dialer_keypad_api/group"/>
+   </component>
+   <component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
+    <unit bldFile="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="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="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="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="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="phone_plat/phone_application_voip_commands_api/group"/>
+   </component>
+   <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+    <unit bldFile="phone_plat/telephony_mediator_api/group"/>
+   </component>
+   <component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
+    <unit bldFile="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="phoneapp/blacklist/group"/>
+   </component>
+   <component id="phoneui" filter="s60" name="Phone UI">
+    <unit bldFile="phoneapp/phoneui/group" filter="!test"/>
+    <unit bldFile="phoneapp/phoneui/tsrc/public/basic/group" filter="test,api_test"/>
+   </component>
+   <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
+    <unit bldFile="phoneapp/phoneuicontrol/group"/>
+   </component>
+   <component id="phoneuistates" filter="s60" name="Phone UI States">
+    <unit bldFile="phoneapp/phoneuistates/group"/>
+   </component>
+   <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
+    <unit bldFile="phoneapp/phoneuiutils/group"/>
+   </component>
+   <component id="phoneuiview" filter="s60" name="Phone UI View">
+    <unit bldFile="phoneapp/phoneuiview/group"/>
+   </component>
+   <component id="phoneuivoipextension" filter="s60" name="Phone UI VOIP Extension">
+    <unit bldFile="phoneapp/phoneuivoipextension/group"/>
+   </component>
+   <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
+    <unit bldFile="phoneapp/silenceactionplugin/group"/>
+   </component>
+   <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
+    <unit bldFile="phoneapp/phonemediatorcenter/group"/>
+   </component>
+  </collection>
+  <collection id="phoneengine" name="Phone Engine" level="engine">
+   <component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
+    <unit bldFile="phoneengine/phonecntfinder/group"/>
+   </component>
+   <component id="audiohandling" filter="s60" name="Phone Audio Handling">
+    <unit bldFile="phoneengine/audiohandling/group"/>
+   </component>
+   <component id="callhandling" filter="s60" name="Call Handling">
+    <unit bldFile="phoneengine/callhandling/group"/>
+   </component>
+   <component id="contacthandling" filter="s60" name="Phone Contact Handling">
+    <unit bldFile="phoneengine/contacthandling/group"/>
+   </component>
+   <component id="loghandling" filter="s60" name="Phone Log Handling">
+    <unit bldFile="phoneengine/loghandling/group"/>
+   </component>
+   <component id="engineinfo" filter="s60" name="Phone Engine Info">
+    <unit bldFile="phoneengine/engineinfo/group"/>
+   </component>
+   <component id="phonemodel" filter="s60" name="Phone Model">
+    <unit bldFile="phoneengine/phonemodel/group"/>
+   </component>
+   <component id="servicehandling" filter="s60" name="Phone Service Handling">
+    <unit bldFile="phoneengine/servicehandling/group"/>
+   </component>
+  </collection>
+  <collection id="phonesettings" name="Phone Settings" level="plugin">
+   <component id="aiwcallimageplugin" filter="s60" name="Call Image AIW Plugin" class="plugin">
+    <unit bldFile="phonesettings/aiwcallimageplugin/group"/>
+   </component>
+   <component id="pslncallimageplugin" filter="s60" name="Call Image Personalization Plugin" class="plugin">
+    <unit bldFile="phonesettings/pslncallimageplugin/group"/>
+   </component>
+  </collection>
+  <collection id="phoneuis" name="Phone UIs" level="ui">
+   <component id="dialer" filter="s60" name="Dialer">
+    <unit bldFile="phoneuis/dialer/group" filter="!test"/>
+    <unit bldFile="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="phoneuis/easydialing/group"/>
+   </component>
+   <component id="bubblemanager" filter="s60" name="Phone Bubble Manager">
+    <unit bldFile="phoneuis/bubblemanager/group"/>
+   </component>
+   <component id="connectutil" filter="s60" name="Connection Utility" class="plugin">
+    <unit bldFile="phoneuis/connectutil/group"/>
+   </component>
+   <component id="ussd" filter="s60" name="Unstructured Supplementary Services Data">
+    <unit bldFile="phoneuis/ussd/group"/>
+   </component>
+   <component id="vmbx" filter="s60" name="Voice Mailbox">
+    <unit bldFile="phoneuis/vmbx/group"/>
+   </component>
+   <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
+    <unit bldFile="phoneuis/telephonydevicemode/group"/>
+   </component>
+  </collection>
+  <collection id="phoneplugins" name="Phone Plugins" level="plugin">
+   <component id="telbranding" filter="s60" name="Tel Branding" class="plugin" introduced="^2">
+    <unit bldFile="phoneplugins/telbranding/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
-

--- a/symbian3/app/photos/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/photos/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,23 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -130,11 +147,6 @@
             <unit bldFile="/sf/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="/sf/app/photos/photos_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/photos/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/photos/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,63 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="photos" name="Photos" levels="support fw ui app">
-    <collection id="photosgallery" name="Photos Gallery" level="app">
-    	<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
-      <component id="photosgallery_help" filter="s60" name="Photos Help" introduced="^2">
-        <unit bldFile="photosgallery/help/group"/>
-      </component>
-      <component id="logging" filter="s60" name="Photos Logging" introduced="^2">
-        <unit bldFile="photosgallery/logging/group"/>
-      </component>
-      <component id="photosgallery_common" filter="s60" name="Photos Common" introduced="^2">
-        <unit bldFile="photosgallery/common/group"/>
-      </component>
-      <component id="photosgallery_commonui" filter="s60" name="Photos Common UI" introduced="^2">
-        <unit bldFile="photosgallery/commonui/group"/>
-      </component>
-      <component id="photosgalleryollectionfw" filter="s60" name="Photos Collection Framework" introduced="^2">
-        <unit bldFile="photosgallery/collectionframework/group"/>
-      </component>
-      <component id="galleryicons" filter="s60" name="Photos Icons" class="config" introduced="^2">
-        <unit bldFile="photosgallery/icons"/>
-      </component>      
-      <component id="imageviewer" filter="s60" name="Image Viewer" introduced="^3">
-      	<!-- this is really a part of controllers component, #include from there instead -->
-        <unit bldFile="photosgallery/controllers/imageviewer/group"/>        
-      </component>
-      <component id="photosgalleryviewfw" filter="s60" name="View Framework" introduced="^2">
-        <unit bldFile="photosgallery/viewframework/group"/>
-      </component>
-      <component id="controllers" filter="s60" name="Photos Controllers" introduced="^2">
-        <unit bldFile="photosgallery/controllers/group"/>
-      </component>
-      <component id="photogallery" filter="s60" name="Media Gallery" introduced="^2">
-        <unit bldFile="photosgallery/gallery/group"/>
-      </component>
-      <component id="slideshow" filter="s60" name="Slideshow" introduced="^2">
-        <unit bldFile="photosgallery/slideshow/group"/>
-      </component>
-      <component id="contentharvesterplugin" filter="s60" name="Gallery Content Harvester Plugin" class="plugin" introduced="^2">
-        <unit bldFile="photosgallery/contentharvesterplugin/group"/>
-      </component>
-      <component id="photossuite" filter="s60" name="Photos Suite" class="config" introduced="^2">
-        <unit bldFile="photosgallery/photossuite/group"/>
-      </component>
-      <component id="memoryplugin" name="Memory Plugin" class="plugin" filter="s60" introduced="^2">
-       <unit bldFile="photosgallery/memoryplugin/group"/>
-     </component> 
-      <component id="imgvwr" filter="s60" name="Photos Image Viewer" introduced="^3">
-        <unit bldFile="photosgallery/imgvwr/group"/>
-      </component>
-      <component id="photosgallery_build" filter="s60" name="Photos Gallery Build" introduced="^2">
-      	<!--  need to remove the #included above bld.infs from this  -->
-        <unit bldFile="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="photos_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="photos" 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="photos_plat/collection_plugins_api/group"/>
+   </component>
+   <component id="controllers_collection_api" name="Controllers Collection API" introduced="^2" class="api" filter="s60">
+    <unit bldFile="photos_plat/controllers_collection_api/group"/>
+   </component>
+   <component id="gallery_utilities_api" name="Gallery Utilities API" introduced="^2" class="api" filter="s60">
+    <unit bldFile="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="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="photos_plat/views_metadatadialog_api/group"/>
+   </component>
+  </collection>
+  <collection id="photosgallery" name="Photos Gallery" level="app">
+   <!-- consider splitting this collection into the application itself, and the frameworks behind it -->
+   <component id="photosgallery_help" filter="s60" name="Photos Help" introduced="^2">
+    <unit bldFile="photosgallery/help/group"/>
+   </component>
+   <component id="logging" filter="s60" name="Photos Logging" introduced="^2">
+    <unit bldFile="photosgallery/logging/group"/>
+   </component>
+   <component id="photosgallery_common" filter="s60" name="Photos Common" introduced="^2">
+    <unit bldFile="photosgallery/common/group"/>
+   </component>
+   <component id="photosgallery_commonui" filter="s60" name="Photos Common UI" introduced="^2">
+    <unit bldFile="photosgallery/commonui/group"/>
+   </component>
+   <component id="photosgalleryollectionfw" filter="s60" name="Photos Collection Framework" introduced="^2">
+    <unit bldFile="photosgallery/collectionframework/group"/>
+   </component>
+   <component id="galleryicons" filter="s60" name="Photos Icons" class="config" introduced="^2">
+    <unit bldFile="photosgallery/icons"/>
+   </component>
+   <component id="imageviewer" filter="s60" name="Image Viewer" introduced="^3">
+    <!-- this is really a part of controllers component, #include from there instead -->
+    <unit bldFile="photosgallery/controllers/imageviewer/group"/>
+   </component>
+   <component id="photosgalleryviewfw" filter="s60" name="View Framework" introduced="^2">
+    <unit bldFile="photosgallery/viewframework/group"/>
+   </component>
+   <component id="controllers" filter="s60" name="Photos Controllers" introduced="^2">
+    <unit bldFile="photosgallery/controllers/group"/>
+   </component>
+   <component id="photogallery" filter="s60" name="Media Gallery" introduced="^2">
+    <unit bldFile="photosgallery/gallery/group"/>
+   </component>
+   <component id="slideshow" filter="s60" name="Slideshow" introduced="^2">
+    <unit bldFile="photosgallery/slideshow/group"/>
+   </component>
+   <component id="contentharvesterplugin" filter="s60" name="Gallery Content Harvester Plugin" class="plugin" introduced="^2">
+    <unit bldFile="photosgallery/contentharvesterplugin/group"/>
+   </component>
+   <component id="photossuite" filter="s60" name="Photos Suite" class="config" introduced="^2">
+    <unit bldFile="photosgallery/photossuite/group"/>
+   </component>
+   <component id="memoryplugin" name="Memory Plugin" class="plugin" filter="s60" introduced="^2">
+    <unit bldFile="photosgallery/memoryplugin/group"/>
+   </component>
+   <component id="imgvwr" filter="s60" name="Photos Image Viewer" introduced="^3">
+    <unit bldFile="photosgallery/imgvwr/group"/>
+   </component>
+   <component id="photosgallery_build" filter="s60" name="Photos Gallery Build" introduced="^2">
+    <!--  need to remove the #included above bld.infs from this  -->
+    <unit bldFile="photosgallery/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/profile/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/profile/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,11 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/app/profile/profilesapplication/profiles/group"/>
@@ -86,9 +91,6 @@
           </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="/sf/app/profile/profile_plat/group"/>
-          </component>
           <component name="profile_help" filter="s60" long-name="Profiles Help">
             <unit bldFile="/sf/app/profile/help/group"/>
           </component>

--- a/symbian3/app/profile/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/profile/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="profile" name="Profiles" levels="app">
-    <collection id="profilesapplication" name="Profiles Application" level="app">
-      <component id="profiles" filter="s60" name="Profiles">
-        <unit bldFile="profilesapplication/profiles/group"/>
-      </component>
-      <component id="profilesapplication_test" filter="s60,test,api_test" purpose="development" name="Profiles Application Test">
-        <unit bldFile="profilesapplication/tsrc/public/basic/group"/>
-      </component>
-    </collection>
-    <collection id="profile_info" name="Profiles Info" level="app">
-      <component id="profile_plat" filter="s60" name="Profiles Platform Interfaces" class="api">
-        <unit bldFile="profile_plat/group"/>
-      </component>
-      <component id="profile_help" filter="s60" name="Profiles Help">
-        <unit bldFile="help/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="profile" 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" href="profile_plat/profiles_settings_view_api/profiles_settings_view_api.metaxml"/>
+    <unit bldFile="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="profilesapplication/profiles/group"/>
+   </component>
+   <component id="profilesapplication_test" filter="s60,test,api_test" purpose="development" name="Profiles Application Test">
+    <unit bldFile="profilesapplication/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="profile_info" name="Profiles Info" level="app">
+   <component id="profile_help" filter="s60" name="Profiles Help">
+    <unit bldFile="help/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/settingsuis/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/settingsuis/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,15 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
+            <unit bldFile="/sf/app/settingsuis/devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group" filter="test,unit_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="/sf/app/settingsuis/defaultapplicationsettings/services_db/group"/>
@@ -100,17 +109,6 @@
             <unit bldFile="/sf/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="/sf/app/settingsuis/devmngt_plat/group"/>
-          </component>
-          <component name="devmngt_pub" filter="s60" long-name="Settings UIs Public Interfaces" introduced="^1" class="api">
-            <unit bldFile="/sf/app/settingsuis/devmngt_pub/group"/>
-          </component>
-          <component name="settingsuis_test" filter="s60,test,unit_test" purpose="development" long-name="Settings UIs Test" introduced="^1">
-            <unit bldFile="/sf/app/settingsuis/devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/settingsuis/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/settingsuis/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="settingsuis" name="Settings UIs" levels="rsc ui">
-    <collection id="defaultapplicationsettings" name="Default Application Settings" level="rsc">
-      <component id="services_db" filter="s60" name="Services Database" introduced="^1">
-        <unit bldFile="defaultapplicationsettings/services_db/group"/>
-      </component>
-      <component id="defaultapplicationsettings_server" filter="s60" name="Default Application Server" introduced="^1">
-        <unit bldFile="defaultapplicationsettings/server/group"/>
-      </component>
-      <component id="service" filter="s60" name="Default Application Service" introduced="^1">
-        <unit bldFile="defaultapplicationsettings/service/group"/>
-      </component>
-      <component id="dasgsplugin" filter="s60" name="Default Application Settings GS Plugin" class="plugin" introduced="^1">
-        <unit bldFile="defaultapplicationsettings/gsplugin/group"/>
-      </component>
-      <component id="defaultapplicationsettings_build" filter="s60" name="Default Application Settings Build" introduced="^1">
-      	<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-        <unit bldFile="defaultapplicationsettings/group"/>
-      </component>
-    </collection>
-    <collection id="systemswuis" name="System SW UIs" level="ui">
-      <component id="touchscreencalib" filter="s60" name="Touchscreen Calibration" introduced="^1">
-        <unit bldFile="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="devmngt_plat/group"/>
-      </component>
-      <component id="devmngt_pub" filter="s60" class="api" name="Settings UIs Public Interfaces" introduced="^1">
-        <unit bldFile="devmngt_pub/group"/>
-      </component>
-      <component id="settingsuis_test" filter="s60,test,unit_test" purpose="development" name="Settings UIs Test" introduced="^1">
-          <unit bldFile="devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group" introduced="^1"/>
-      </component>
-    </collection>
-  </package>
+ <package id="settingsuis" 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" href="devmngt_plat/default_app_client_api/default_app_client_api.metaxml"/>
+    <unit bldFile="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" href="devmngt_plat/services_db_api/services_db_api.metaxml"/>
+    <unit bldFile="devmngt_plat/services_db_api/group" filter="!test"/>
+    <unit bldFile="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="defaultapplicationsettings/services_db/group"/>
+   </component>
+   <component id="defaultapplicationsettings_server" filter="s60" name="Default Application Server" introduced="^1">
+    <unit bldFile="defaultapplicationsettings/server/group"/>
+   </component>
+   <component id="service" filter="s60" name="Default Application Service" introduced="^1">
+    <unit bldFile="defaultapplicationsettings/service/group"/>
+   </component>
+   <component id="dasgsplugin" filter="s60" name="Default Application Settings GS Plugin" class="plugin" introduced="^1">
+    <unit bldFile="defaultapplicationsettings/gsplugin/group"/>
+   </component>
+   <component id="defaultapplicationsettings_build" filter="s60" name="Default Application Settings Build" introduced="^1">
+    <!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
+    <unit bldFile="defaultapplicationsettings/group"/>
+   </component>
+  </collection>
+  <collection id="systemswuis" name="System SW UIs" level="ui">
+   <component id="touchscreencalib" filter="s60" name="Touchscreen Calibration" introduced="^1">
+    <unit bldFile="systemswuis/touchscreencalib/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/speechsrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/speechsrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,89 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/app/speechsrv/speechsrv_plat/vas_api/group"/>
+          </component>
+          <component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/app/speechsrv/voiceui/vcommand/group"/>
@@ -171,9 +254,6 @@
           <component name="speechsrv_test" filter="s60,test,unit_test" purpose="development" long-name="Speech Recognition UIs Test">
             <unit bldFile="/sf/app/speechsrv/tsrc/group"/>
           </component>
-          <component name="speechsrv_plat" filter="s60" long-name="Speech Recognition UIs Platform Interfaces" class="api">
-            <unit bldFile="/sf/app/speechsrv/speechsrv_plat/group"/>
-          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/app/speechsrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/speechsrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,107 +1,213 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="speechsrv" name="Speech Recognition UIs" levels="engine framework ui">
-    <collection id="voiceui" name="Voice UI" level="ui">
-      <component id="vcommand" filter="s60" name="Voice Commands UI" introduced="^1">
-        <unit bldFile="voiceui/vcommand/group"/>
-      </component>
-      <component id="voiceuivoicerecognition" filter="s60" name="Voice UI Recognition" introduced="^1">
-        <unit bldFile="voiceui/voiceuivoicerecognition/group"/>
-      </component>
-      <component id="pbkinfoviewimpl" filter="s60" name="Phonebook Info View Implementation" introduced="^1">
-        <unit bldFile="voiceui/pbkinfoviewimpl/group"/>
-      </component>
-      <component id="aiwpbkinfoviewprovider" filter="s60" name="AIW Phonebook Info View Provider" class="plugin" introduced="^1">
-        <unit bldFile="voiceui/aiwpbkinfoviewprovider/group"/>
-      </component>
-      <component id="vccontrolpanelplugin" filter="s60" name="Voice Commands Control Panel Plugin" class="plugin" introduced="^1">
-      	<meta rel="config">
-      		<defined condition="__VCOMMAND_CONTROL_PANEL"/>
-      	</meta>
-		<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-        <!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
-      </component>
-      <component id="voiceui_build" filter="s60" name="Voice UI Build" introduced="^1">
-      	<!--  can this be put into the other components? -->
-        <unit bldFile="voiceui/group"/>
-      </component>
-    </collection>
-    <collection id="srsf" name="Speech Recognition and Synthesis Framework" level="framework">
-      <component id="sispeechrecognitiondata" filter="s60" name="SI Speech Recognition Data">
-        <unit bldFile="srsf/sispeechrecognitiondata/group"/>
-      </component>
-      <component id="ttscommon" filter="s60" name="TTS Common">
-        <unit bldFile="srsf/ttscommon/group"/>
-      </component>
-      <component id="devtts" filter="s60" name="Text to Speech">
-        <unit bldFile="srsf/devtts/group"/>
-      </component>
-      <component id="ttscustomcommands" filter="s60" name="TTS Custom Commands">
-        <unit bldFile="srsf/ttscustomcommands/group"/>
-      </component>
-      <component id="ttscontrollerplugin" filter="s60" name="TTS Controller Plugin" class="plugin">
-        <unit bldFile="srsf/ttscontrollerplugin/group"/>
-      </component>
-      <component id="ttsutility" filter="s60" name="TTS Utility">
-        <unit bldFile="srsf/ttsutility/group"/>
-      </component>
-      <component id="speechsynthesis" filter="s60" name="Speech Synthesis">
-     	<!-- can only have one unit. #include these from a common bld.inf -->
-        <unit bldFile="srsf/speechsynthesis/client/group"/>
-        <unit bldFile="srsf/speechsynthesis/server/group"/>
-      </component>
-      <component id="devasr" filter="s60" name="Audio Recording and Speech Recognition">
-        <unit bldFile="srsf/devasr/group"/>
-      </component>
-      <component id="sicc" filter="s60" name="Speaker Independent Custom Commands">
-        <unit bldFile="srsf/sicc/group"/>
-      </component>
-      <component id="sisrscontrollerplugin" filter="s60" name="SI SRS Controller Plugin" class="plugin">
-        <unit bldFile="srsf/sisrscontrollerplugin/group"/>
-      </component>
-      <component id="siutility" filter="s60" name="Speaker Independent Utility">
-        <unit bldFile="srsf/siutility/group"/>
-      </component>
-      <component id="nssvasapi" filter="s60" name="NSS VAS API">
-        <unit bldFile="srsf/nssvasapi/group"/>
-      </component>
-      <component id="nssvascontacthdlr" filter="s60" name="NSS VAS Contact Handler">
-        <unit bldFile="srsf/nssvascontacthdlr/group"/>
-      </component>
-      <component id="vcommandhandler" filter="s60" name="Voice Command Handler">
-        <unit bldFile="srsf/vcommandhandler/group"/>
-      </component>
-      <component id="vuiphandler" filter="s60" name="Voice UI Plugin Handler">
-        <unit bldFile="srsf/vuiphandler/group"/>
-      </component>
-      <component id="vcommandexecutor" filter="s60" name="Voice Command Executor">
-        <unit bldFile="srsf/vcommandexecutor/group"/>
-      </component>
-      <component id="vcommandexecutorbearer" filter="s60" name="Voice Command Executor Bearer">
-        <unit bldFile="srsf/vcommandexecutorbearer/group"/>
-      </component>
-      <component id="vcommandmanager" filter="s60" name="Voice Command Manager">
-        <unit bldFile="srsf/vcommandmanager/group"/>
-      </component>
-      <component id="vcexecutorapp" filter="s60" name="Voice Command Executor Application">
-        <unit bldFile="srsf/vcexecutorapp/group"/>
-      </component>
-      <component id="profileobserverplugin" filter="s60" name="Profile Observer Plugin" class="plugin">
-        <unit bldFile="srsf/profileobserverplugin/group"/>
-      </component>
-      <component id="srsf_build" filter="s60" name="Speech Recognition and Synthesis Framework Build">
-      	<!-- should distribute this into the above components -->
-        <unit bldFile="srsf/group"/>
-      </component>
-    </collection>
-    <collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
-      <component id="speechsrv_test" filter="s60,test,unit_test" purpose="development" name="Speech Recognition UIs Test">
-        <unit bldFile="tsrc/group"/>
-      </component>
-      <component id="speechsrv_plat" filter="s60" name="Speech Recognition UIs Platform Interfaces" class="api">
-        <unit bldFile="speechsrv_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="speechsrv" 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" href="speechsrv_plat/vas_api/vas_api.metaxml"/>
+    <unit bldFile="speechsrv_plat/vas_api/group"/>
+   </component>
+   <component id="nss_devasr_api" name="NSS DevASR API" class="api" filter="s60">
+    <meta rel="Api" href="speechsrv_plat/nss_devasr_api/nss_devasr_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/tts_hw_device_api/tts_hw_device_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/voice_commands_resource_header_api/voice_commands_resource_header_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/nss_mmf_tts_custom_commands_api/nss_mmf_tts_custom_commands_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/srsf_cenrep_settings_api/srsf_cenrep_settings_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/voice_ui_plugin_api/voice_ui_plugin_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/nss_tts_utility_api/nss_tts_utility_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/nss_srs_custom_commands_api/nss_srs_custom_commands_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/srsf_secondarydisplay_api/srsf_secondarydisplay_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/asrs_hw_device_api/asrs_hw_device_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/vas_vcommand_api/vas_vcommand_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/adaptation_hw_device_api/adaptation_hw_device_api.metaxml"/>
+    <unit bldFile="speechsrv_plat/adaptation_hw_device_api/group"/>
+   </component>
+   <component id="nss_devtts_api" name="NSS DevTTS API" class="api" filter="s60">
+    <meta rel="Api" href="speechsrv_plat/nss_devtts_api/nss_devtts_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/nss_srs_utility_api/nss_srs_utility_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/recognition_hw_device_api/recognition_hw_device_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/vas_contact_handler_api/vas_contact_handler_api.metaxml"/>
+    <unit bldFile="speechsrv_plat/vas_contact_handler_api/group"/>
+   </component>
+   <component id="nlp_hw_device" name="NLP Hardware Device" class="api" filter="s60">
+    <meta rel="Api" href="speechsrv_plat/nlp_hw_device/nlp_hw_device.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/nss_si_speech_recognition_data_api/nss_si_speech_recognition_data_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/nss_tts_common_api/nss_tts_common_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/grcompiler_hw_device_api/grcompiler_hw_device_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/ttp_hw_device_api/ttp_hw_device_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/vocman_hw_device_api/vocman_hw_device_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/speech_synthesis_clientserver_api/speech_synthesis_clientserver_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/voice_ui_accessory_button_handling_api/voice_ui_accessory_button_handling_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/ui_voice_recognition_api/ui_voice_recognition_api.metaxml"/>
+    <unit bldFile="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" href="speechsrv_plat/vcommand_settings_cenrep_api/vcommand_settings_cenrep_api.metaxml"/>
+    <unit bldFile="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="voiceui/vcommand/group"/>
+   </component>
+   <component id="voiceuivoicerecognition" filter="s60" name="Voice UI Recognition" introduced="^1">
+    <unit bldFile="voiceui/voiceuivoicerecognition/group"/>
+   </component>
+   <component id="pbkinfoviewimpl" filter="s60" name="Phonebook Info View Implementation" introduced="^1">
+    <unit bldFile="voiceui/pbkinfoviewimpl/group"/>
+   </component>
+   <component id="aiwpbkinfoviewprovider" filter="s60" name="AIW Phonebook Info View Provider" class="plugin" introduced="^1">
+    <unit bldFile="voiceui/aiwpbkinfoviewprovider/group"/>
+   </component>
+   <component id="vccontrolpanelplugin" filter="s60" name="Voice Commands Control Panel Plugin" class="plugin" introduced="^1">
+    <meta rel="config">
+     <defined condition="__VCOMMAND_CONTROL_PANEL"/>
+    </meta>
+    <!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
+    <!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
+   </component>
+   <component id="voiceui_build" filter="s60" name="Voice UI Build" introduced="^1">
+    <!--  can this be put into the other components? -->
+    <unit bldFile="voiceui/group"/>
+   </component>
+  </collection>
+  <collection id="srsf" name="Speech Recognition and Synthesis Framework" level="framework">
+   <component id="sispeechrecognitiondata" filter="s60" name="SI Speech Recognition Data">
+    <unit bldFile="srsf/sispeechrecognitiondata/group"/>
+   </component>
+   <component id="ttscommon" filter="s60" name="TTS Common">
+    <unit bldFile="srsf/ttscommon/group"/>
+   </component>
+   <component id="devtts" filter="s60" name="Text to Speech">
+    <unit bldFile="srsf/devtts/group"/>
+   </component>
+   <component id="ttscustomcommands" filter="s60" name="TTS Custom Commands">
+    <unit bldFile="srsf/ttscustomcommands/group"/>
+   </component>
+   <component id="ttscontrollerplugin" filter="s60" name="TTS Controller Plugin" class="plugin">
+    <unit bldFile="srsf/ttscontrollerplugin/group"/>
+   </component>
+   <component id="ttsutility" filter="s60" name="TTS Utility">
+    <unit bldFile="srsf/ttsutility/group"/>
+   </component>
+   <component id="speechsynthesis" filter="s60" name="Speech Synthesis">
+    <!-- can only have one unit. #include these from a common bld.inf -->
+    <unit bldFile="srsf/speechsynthesis/client/group"/>
+    <unit bldFile="srsf/speechsynthesis/server/group"/>
+   </component>
+   <component id="devasr" filter="s60" name="Audio Recording and Speech Recognition">
+    <unit bldFile="srsf/devasr/group"/>
+   </component>
+   <component id="sicc" filter="s60" name="Speaker Independent Custom Commands">
+    <unit bldFile="srsf/sicc/group"/>
+   </component>
+   <component id="sisrscontrollerplugin" filter="s60" name="SI SRS Controller Plugin" class="plugin">
+    <unit bldFile="srsf/sisrscontrollerplugin/group"/>
+   </component>
+   <component id="siutility" filter="s60" name="Speaker Independent Utility">
+    <unit bldFile="srsf/siutility/group"/>
+   </component>
+   <component id="nssvasapi" filter="s60" name="NSS VAS API">
+    <unit bldFile="srsf/nssvasapi/group"/>
+   </component>
+   <component id="nssvascontacthdlr" filter="s60" name="NSS VAS Contact Handler">
+    <unit bldFile="srsf/nssvascontacthdlr/group"/>
+   </component>
+   <component id="vcommandhandler" filter="s60" name="Voice Command Handler">
+    <unit bldFile="srsf/vcommandhandler/group"/>
+   </component>
+   <component id="vuiphandler" filter="s60" name="Voice UI Plugin Handler">
+    <unit bldFile="srsf/vuiphandler/group"/>
+   </component>
+   <component id="vcommandexecutor" filter="s60" name="Voice Command Executor">
+    <unit bldFile="srsf/vcommandexecutor/group"/>
+   </component>
+   <component id="vcommandexecutorbearer" filter="s60" name="Voice Command Executor Bearer">
+    <unit bldFile="srsf/vcommandexecutorbearer/group"/>
+   </component>
+   <component id="vcommandmanager" filter="s60" name="Voice Command Manager">
+    <unit bldFile="srsf/vcommandmanager/group"/>
+   </component>
+   <component id="vcexecutorapp" filter="s60" name="Voice Command Executor Application">
+    <unit bldFile="srsf/vcexecutorapp/group"/>
+   </component>
+   <component id="profileobserverplugin" filter="s60" name="Profile Observer Plugin" class="plugin">
+    <unit bldFile="srsf/profileobserverplugin/group"/>
+   </component>
+   <component id="srsf_build" filter="s60" name="Speech Recognition and Synthesis Framework Build">
+    <!-- should distribute this into the above components -->
+    <unit bldFile="srsf/group"/>
+   </component>
+  </collection>
+  <collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
+   <component id="speechsrv_test" filter="s60,test,unit_test" purpose="development" name="Speech Recognition UIs Test">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
-

--- a/symbian3/app/videoeditor/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/videoeditor/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,11 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/app/videoeditor/videditor/videoeditorcommon/group"/>
@@ -129,11 +134,6 @@
             <unit bldFile="/sf/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="/sf/app/videoeditor/videoeditor_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/videoeditor/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/videoeditor/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="videoeditor" 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" href="videoeditor_plat/video_editor_engine_api/video_editor_engine_api.metaxml"/>
+        <unit bldFile="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="videditor/videoeditorcommon/group"/>
@@ -53,10 +59,5 @@
         <unit bldFile="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="videoeditor_plat/group"/>
-      </component>
-    </collection>
   </package>
 </SystemDefinition>

--- a/symbian3/app/videoplayer/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/videoplayer/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,19 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
+            <unit bldFile="/sf/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/app/videoplayer/videofeeds/utils/group"/>
@@ -207,7 +220,8 @@
             <unit bldFile="/sf/app/videoplayer/videoplayerapp/lwplayer/group"/>
           </component>
           <component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/group"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group" filter="test,unit_test"/>
           </component>
           <component name="videoplayerlauncher" filter="s60" long-name="Video Player Launcher">
             <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
@@ -215,36 +229,22 @@
         </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="/sf/app/videoplayer/videoplayback/videohelix/group"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/tsrc/ut_videohelixtest/group" filter="test,unit_test"/>
           </component>
           <component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/videoplayback/videopdlplaybackviewplugin/group"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
           </component>
           <component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/group"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group" filter="test,unit_test"/>
           </component>
           <component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
           </component>
           <component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/group"/>
-          </component>
-          <component name="videoplayer_tsrc" long-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="/sf/app/videoplayer/videoplayback/videohelix/tsrc/ut_videohelixtest/group"/>
-            <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group"/>
-            <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group"/>
-            <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/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="/sf/app/videoplayer/videoplayer_plat/group"/>
-          </component>
-          <component name="videoplayer_api_test" filter="s60,test,api_test" purpose="development" long-name="Video Player API Test">
-            <!--  can only have one unit, #include from a common bld.inf? -->
-            <unit bldFile="/sf/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/tsrc/group"/>
-            <unit bldFile="/sf/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group" filter="test,unit_test"/>
           </component>
         </collection>
       </block>

--- a/symbian3/app/videoplayer/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/videoplayer/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,175 +1,176 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="videoplayer" name="Video Player Apps" levels="support plugin util apps">
-    <collection id="videofeeds" name="Video Feeds" level="util">
-      <component id="iptv_utils" filter="s60" name="IPTV Util" introduced="^3">
-        <unit bldFile="videofeeds/utils/group"/>
-      </component>
-      <component id="viewmessageutility" filter="s60" name="View Message Utility" introduced="^3">
-        <unit bldFile="videofeeds/viewmessageutility/group"/>
-      </component>
-      <component id="vcxnotifier" filter="s60" name="Video Connection Notifier" introduced="^3" class="plugin">
-        <unit bldFile="videofeeds/vcxnotifier/group"/>
-      </component>
-      <component id="vccommon" filter="s60" name="Video Connection Common" introduced="^3">
-        <unit bldFile="videofeeds/vccommon/group"/>
-      </component>
-		<component id="clientapi" name="Server Client" filter="s60" introduced="^3">
-			<unit bldFile="videofeeds/clientapi/group"/>
-		</component>
-		<component id="provisioningprocessor" name="Provisioning Processor" filter="s60" introduced="^3">
-			<unit bldFile="videofeeds/provisioningprocessor/group"/>
-		</component>
-		<component id="mrssplugin" name="RSS plugin" filter="s60" introduced="^3" class="plugin">
-			<unit bldFile="videofeeds/mrssplugin/group"/>
-		</component>
-		<component id="videofeeds_server" name="Server" filter="s60" introduced="^3">
-			<unit bldFile="videofeeds/server/group"/>
-		</component>
-		<component id="videofeeds_server_tsrc" name="Video Feeds Server Tests" introduced="^3" filter="s60,test,unit_test">
-      	<!--  can only have one unit. Can these be #included from videofeeds_server or a common bld.inf?-->
-         <unit bldFile="videofeeds/server/tsrc/IptvTestUtility/group"/>
-         <unit bldFile="videofeeds/server/tsrc/VCXProvisioningTest/group"/>
-         <unit bldFile="videofeeds/server/tsrc/VCXServiceManagementApiTest/group"/>
-         <unit bldFile="videofeeds/server/tsrc/VCXVodContentApiTest/group"/>
-       </component>
-		<component id="livetvutils" name="LiveTV Utils" filter="s60" introduced="^3">
-			<unit bldFile="videofeeds/livetvutils/group"/>
-		</component>
-		<component id="iptvprovisioningrecognizer" name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" class="plugin">
-			<unit bldFile="videofeeds/provisioningrecognizer/group"/>
-		</component>
-		<component id="iptvprovisioningappui" name="IP TV Provisioning App UI" filter="s60" introduced="^3">
-			<unit bldFile="videofeeds/provisioningappui/group"/>
-		</component>
-		<component id="iptvomaprovisioning" name="IP TV OMA Provisioning" filter="s60" introduced="^3">
-			<unit bldFile="videofeeds/omaprovisioning/group"/>
-		</component>
-	<component id="vcnsuiengine" name="VoD UI Engine" filter="s60" introduced="^3">
-		<unit bldFile="videofeeds/vcnsuiengine/group"/>
-	</component>
-	<component id="hgvodui" name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
-		<unit bldFile="videofeeds/hgvodui/group"/>
-	</component>
-	<component id="hgvodplugin" name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" class="plugin">
-		<unit bldFile="videofeeds/hgvodplugin/group"/>
-	</component>
-	<component id="vcnsscheduleview" name="Scheduled Download Settings View" filter="s60" introduced="^3">
-		<unit bldFile="videofeeds/vcnsscheduleview/group"/>
-	</component>
-	<component id="vcnsscheduleplugin" name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" class="plugin">
-		<unit bldFile="videofeeds/vcnsscheduleplugin/group"/>
-	</component>
-	<component id="scheduleddlplugin" name="Scheduled download plugin" filter="s60" introduced="^3">
-		<unit bldFile="videofeeds/scheduleddlplugin/group"/>
-	</component>
-    <component id="videofeeds_tsrc" name="Video Feeds Tests" introduced="^3" filter="s60,test,unit_test">
-      	<!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
-         <unit bldFile="tsrc/VCXTestCommon/group"/>
-         <unit bldFile="tsrc/VCXTestUtilModule/group"/>
-         <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
-       </component>
-    </collection>
-    <collection id="videocollection" name="Video Collection" level="util">
-      <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
-        <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
-      </component>
-      <component id="mpxmyvideoscollection_test" filter="s60,test,unit_test" name="MPX My Videos Collection Tests" introduced="^3" purpose="development">
-            <unit bldFile="videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group"/>
-      </component>
-      <component id="myvideosindicatorplugin" filter="s60" name="My Videos Indicator Plugin" introduced="^3" class="plugin">
-        <unit bldFile="videocollection/myvideosindicatorplugin/group"/>
-      </component>
-      <component id="hgmyvideos" filter="s60" name="Huriganes My Videos" introduced="^3">
-        <unit bldFile="videocollection/hgmyvideos/group"/>
-      </component>
-      <component id="hgmyvideosplugin" filter="s60" name="Huriganes My VideosPlugin" introduced="^3" class="plugin">
-        <unit bldFile="videocollection/hgmyvideosplugin/group"/>
-      </component>
-      <component id="mpxmyvideoscollection_tsrc" name="MPX My Videos Collection Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
-      	<!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
-            <unit bldFile="tsrc/VCXTestCommon/group"/>
-            <unit bldFile="tsrc/VCXTestUtilModule/group"/>
-            <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
-    </component>
-    </collection>
-    <collection id="videoplayer_homescreenplugins" name="Videoplayer Homescreen Plugins" level="plugin">
-      <component id="videosuiteconf" filter="s60" name="Video Suite Configuration" class="plugin" introduced="^3" >
-        <unit bldFile="homescreenplugins/videosuiteconf/group"/>
-      </component>
-      <component id="videoahlplugin" filter="s60" name="Video Player Action Handler" class="plugin" introduced="^3">
-        <unit bldFile="homescreenplugins/videoahlplugin/group"/>
-      </component>
-      <component id="videochplugin" filter="s60" name="Video Player Content Harvester " class="plugin" introduced="^3">
-        <unit bldFile="homescreenplugins/videochplugin/group"/>
-      </component>
-    </collection>
-    <collection id="mediasettings" name="Media Settings" level="support">
-    	<!--  this is really a component. Should be moved down a directory -->
-      <component id="mediasettings_build" filter="s60" name="Media Settings Build">
-        <unit bldFile="mediasettings/group"/>
-      </component>
-      <component id="videoplayer_test" filter="s60" purpose="development" name="Video Player Apps Test">  
-      	<!--  can only have one unit. Can thes be #included from the above or another  bld.inf?-->
-     	  <unit bldFile="tsrc/VCXTestCommon/group"/>
-		  <unit bldFile="tsrc/VCXTestUtilModule/group"/>
-		  <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
-		  <unit bldFile="mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
-		  <unit bldFile="mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
-      </component>      
-    </collection>
-    <collection id="filedetails" name="File Details" level="support">
-      <component id="filedetailsplugin" filter="s60" name="File Details Plugin" class="plugin" introduced="^3">
-        <unit bldFile="filedetails/filedetailsplugin/group"/>
-      </component>
-      <component id="filedetailsdialog" filter="s60" name="File Details Dialog" introduced="^3">
-        <unit bldFile="filedetails/filedetailsdialog/group"/>
-      </component>
-    </collection>
-    <collection id="videoplayerapp" name="Video Player App" level="apps">
-      <component id="lwplayer" name="Lightweight Player"  filter="s60">
-        <unit bldFile="videoplayerapp/lwplayer/group"/>
-      </component>
-      <component id="mpxvideoplayer" filter="s60" name="MPX Video Player" class="plugin">
-        <unit bldFile="videoplayerapp/mpxvideoplayer/group"/>
-      </component>
-      <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
-        <unit bldFile="videoplayerapp/videoplayerlauncher/group"/>
-      </component>
-    </collection>
-    <collection id="videoplayback" name="Video Playback Plugins" level="plugin">    
-      <component id="videohelix" name="Video Helix"  filter="s60" introduced="^3" class="plugin">
-        <unit bldFile="videoplayback/videohelix/group"/>
-      </component>
-      <component id="videopdlplaybackviewplugin" filter="s60" name="Video PDL Playback View Plugin" class="plugin" introduced="^3">
-        <unit bldFile="videoplayback/videopdlplaybackviewplugin/group"/>
-      </component>
-      <component id="videoplaybackcontrols" filter="s60" name="Video Playback Controls" introduced="^3" class="plugin">
-        <unit bldFile="videoplayback/videoplaybackcontrols/group"/>
-      </component>
-      <component id="videoplaybackviewplugin" filter="s60" name="Video Playback View Plugin" class="plugin" introduced="^3">
-        <unit bldFile="videoplayback/videoplaybackviewplugin/group"/>
-      </component>
-      <component id="videoplaybackviews" filter="s60" name="Video Playback Views" class="plugin" introduced="^3">
-        <unit bldFile="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="videoplayback/videohelix/tsrc/ut_videohelixtest/group"/>
-          <unit bldFile="videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group"/>
-          <unit bldFile="videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group"/>
-          <unit bldFile="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="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="videoplayer_plat/video_player_file_details_dialog_api/tsrc/group"/>
-	      <unit bldFile="videoplayer_plat/videoplayer_startup_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="videoplayer" 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="videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+    <unit bldFile="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" href="videoplayer_plat/video_player_file_details_dialog_api/media_player_file_details_dialog_api.metaxml"/>
+    <unit bldFile="videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+    <unit bldFile="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="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="videofeeds/utils/group"/>
+   </component>
+   <component id="viewmessageutility" filter="s60" name="View Message Utility" introduced="^3">
+    <unit bldFile="videofeeds/viewmessageutility/group"/>
+   </component>
+   <component id="vcxnotifier" filter="s60" name="Video Connection Notifier" introduced="^3" class="plugin">
+    <unit bldFile="videofeeds/vcxnotifier/group"/>
+   </component>
+   <component id="vccommon" filter="s60" name="Video Connection Common" introduced="^3">
+    <unit bldFile="videofeeds/vccommon/group"/>
+   </component>
+   <component id="clientapi" name="Server Client" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/clientapi/group"/>
+   </component>
+   <component id="provisioningprocessor" name="Provisioning Processor" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/provisioningprocessor/group"/>
+   </component>
+   <component id="mrssplugin" name="RSS plugin" filter="s60" introduced="^3" class="plugin">
+    <unit bldFile="videofeeds/mrssplugin/group"/>
+   </component>
+   <component id="videofeeds_server" name="Server" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/server/group"/>
+   </component>
+   <component id="videofeeds_server_tsrc" name="Video Feeds Server Tests" introduced="^3" filter="s60,test,unit_test">
+    <!--  can only have one unit. Can these be #included from videofeeds_server or a common bld.inf?-->
+    <unit bldFile="videofeeds/server/tsrc/IptvTestUtility/group"/>
+    <unit bldFile="videofeeds/server/tsrc/VCXProvisioningTest/group"/>
+    <unit bldFile="videofeeds/server/tsrc/VCXServiceManagementApiTest/group"/>
+    <unit bldFile="videofeeds/server/tsrc/VCXVodContentApiTest/group"/>
+   </component>
+   <component id="livetvutils" name="LiveTV Utils" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/livetvutils/group"/>
+   </component>
+   <component id="iptvprovisioningrecognizer" name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" class="plugin">
+    <unit bldFile="videofeeds/provisioningrecognizer/group"/>
+   </component>
+   <component id="iptvprovisioningappui" name="IP TV Provisioning App UI" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/provisioningappui/group"/>
+   </component>
+   <component id="iptvomaprovisioning" name="IP TV OMA Provisioning" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/omaprovisioning/group"/>
+   </component>
+   <component id="vcnsuiengine" name="VoD UI Engine" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/vcnsuiengine/group"/>
+   </component>
+   <component id="hgvodui" name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/hgvodui/group"/>
+   </component>
+   <component id="hgvodplugin" name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" class="plugin">
+    <unit bldFile="videofeeds/hgvodplugin/group"/>
+   </component>
+   <component id="vcnsscheduleview" name="Scheduled Download Settings View" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/vcnsscheduleview/group"/>
+   </component>
+   <component id="vcnsscheduleplugin" name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" class="plugin">
+    <unit bldFile="videofeeds/vcnsscheduleplugin/group"/>
+   </component>
+   <component id="scheduleddlplugin" name="Scheduled download plugin" filter="s60" introduced="^3">
+    <unit bldFile="videofeeds/scheduleddlplugin/group"/>
+   </component>
+   <component id="videofeeds_tsrc" name="Video Feeds Tests" introduced="^3" filter="s60,test,unit_test">
+    <!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
+    <unit bldFile="tsrc/VCXTestCommon/group"/>
+    <unit bldFile="tsrc/VCXTestUtilModule/group"/>
+    <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
+   </component>
+  </collection>
+  <collection id="videocollection" name="Video Collection" level="util">
+   <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
+    <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
+   </component>
+   <component id="mpxmyvideoscollection_test" filter="s60,test,unit_test" name="MPX My Videos Collection Tests" introduced="^3" purpose="development">
+    <unit bldFile="videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group"/>
+   </component>
+   <component id="myvideosindicatorplugin" filter="s60" name="My Videos Indicator Plugin" introduced="^3" class="plugin">
+    <unit bldFile="videocollection/myvideosindicatorplugin/group"/>
+   </component>
+   <component id="hgmyvideos" filter="s60" name="Huriganes My Videos" introduced="^3">
+    <unit bldFile="videocollection/hgmyvideos/group"/>
+   </component>
+   <component id="hgmyvideosplugin" filter="s60" name="Huriganes My VideosPlugin" introduced="^3" class="plugin">
+    <unit bldFile="videocollection/hgmyvideosplugin/group"/>
+   </component>
+   <component id="mpxmyvideoscollection_tsrc" name="MPX My Videos Collection Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
+    <!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
+    <unit bldFile="tsrc/VCXTestCommon/group"/>
+    <unit bldFile="tsrc/VCXTestUtilModule/group"/>
+    <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
+   </component>
+  </collection>
+  <collection id="videoplayer_homescreenplugins" name="Videoplayer Homescreen Plugins" level="plugin">
+   <component id="videosuiteconf" filter="s60" name="Video Suite Configuration" class="plugin" introduced="^3">
+    <unit bldFile="homescreenplugins/videosuiteconf/group"/>
+   </component>
+   <component id="videoahlplugin" filter="s60" name="Video Player Action Handler" class="plugin" introduced="^3">
+    <unit bldFile="homescreenplugins/videoahlplugin/group"/>
+   </component>
+   <component id="videochplugin" filter="s60" name="Video Player Content Harvester " class="plugin" introduced="^3">
+    <unit bldFile="homescreenplugins/videochplugin/group"/>
+   </component>
+  </collection>
+  <collection id="mediasettings" name="Media Settings" level="support">
+   <!--  this is really a component. Should be moved down a directory -->
+   <component id="mediasettings_build" filter="s60" name="Media Settings Build">
+    <unit bldFile="mediasettings/group"/>
+   </component>
+   <component id="videoplayer_test" filter="s60" purpose="development" name="Video Player Apps Test">
+    <!--  can only have one unit. Can thes be #included from the above or another  bld.inf?-->
+    <unit bldFile="tsrc/VCXTestCommon/group"/>
+    <unit bldFile="tsrc/VCXTestUtilModule/group"/>
+    <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
+    <unit bldFile="mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
+    <unit bldFile="mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
+   </component>
+  </collection>
+  <collection id="filedetails" name="File Details" level="support">
+   <component id="filedetailsplugin" filter="s60" name="File Details Plugin" class="plugin" introduced="^3">
+    <unit bldFile="filedetails/filedetailsplugin/group"/>
+   </component>
+   <component id="filedetailsdialog" filter="s60" name="File Details Dialog" introduced="^3">
+    <unit bldFile="filedetails/filedetailsdialog/group"/>
+   </component>
+  </collection>
+  <collection id="videoplayerapp" name="Video Player App" level="apps">
+   <component id="lwplayer" name="Lightweight Player" filter="s60">
+    <unit bldFile="videoplayerapp/lwplayer/group"/>
+   </component>
+   <component id="mpxvideoplayer" filter="s60" name="MPX Video Player" class="plugin">
+    <unit bldFile="videoplayerapp/mpxvideoplayer/group" filter="!test"/>
+    <unit bldFile="videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group"  filter="test,unit_test"/>
+   </component>
+   <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
+    <unit bldFile="videoplayerapp/videoplayerlauncher/group"/>
+   </component>
+  </collection>
+  <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
+   <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
+    <unit bldFile="videoplayback/videohelix/group" filter="!test"/>
+    <unit bldFile="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="videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
+   </component>
+   <component id="videoplaybackcontrols" filter="s60" name="Video Playback Controls" introduced="^3" class="plugin">
+    <unit bldFile="videoplayback/videoplaybackcontrols/group" filter="!test"/>
+    <unit bldFile="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="videoplayback/videoplaybackviewplugin/group"/>
+   </component>
+   <component id="videoplaybackviews" filter="s60" name="Video Playback Views" class="plugin" introduced="^3">
+    <unit bldFile="videoplayback/videoplaybackviews/group" filter="!test"/>
+    <unit bldFile="videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group" filter="test,unit_test"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/app/videotelephony/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/videotelephony/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,14 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <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="/sf/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="/sf/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="/sf/app/videotelephony/vtengines/videoteleng/Group"/>
@@ -104,11 +112,6 @@
             <unit bldFile="/sf/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="/sf/app/videotelephony/videotelephony_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/app/videotelephony/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/videotelephony/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,37 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
-    <collection id="vtengines" name="Video Telephony Engines" level="engine">
-      <component id="videoteleng" filter="s60" name="Video Telephony Engine">
-        <unit bldFile="vtengines/videoteleng/Group"/>
-      </component>
-      <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
-        <unit bldFile="vtengines/vtmediatorplugin/group"/>
-      </component>
-    </collection>
-    <collection id="vtuis" name="Video Telephony UIs" level="ui">
-      <component id="videotelui" filter="s60" name="Video Telephony UI">
-        <unit bldFile="vtuis/videotelui/group"/>
-      </component>
-    </collection>
-    <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
-      <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
-        <unit bldFile="vtprotocolplugins/DisplaySink/group"/>
-      </component>
-      <component id="videosource" filter="s60" name="Video Source" introduced="^2">
-        <unit bldFile="vtprotocolplugins/VideoSource/group"/>
-      </component>
-    </collection>
-    <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
-    	<!--  this collection is really a component, move down a directory -->
-      <component id="videotelproto" filter="s60" name="Video Telephony Protocol">
-        <unit bldFile="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="videotelephony_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="videotelephony" 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" href="videotelephony_plat/video_telephony_control_mediator_api/video_telephony_control_mediator_api.metaxml"/>
+    <unit bldFile="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" href="videotelephony_plat/video_telephony_media_configuration_api/video_telephony_media_configuration_api.metaxml"/>
+    <unit bldFile="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="vtengines/videoteleng/Group"/>
+   </component>
+   <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
+    <unit bldFile="vtengines/vtmediatorplugin/group"/>
+   </component>
+  </collection>
+  <collection id="vtuis" name="Video Telephony UIs" level="ui">
+   <component id="videotelui" filter="s60" name="Video Telephony UI">
+    <unit bldFile="vtuis/videotelui/group"/>
+   </component>
+  </collection>
+  <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
+   <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
+    <unit bldFile="vtprotocolplugins/DisplaySink/group"/>
+   </component>
+   <component id="videosource" filter="s60" name="Video Source" introduced="^2">
+    <unit bldFile="vtprotocolplugins/VideoSource/group"/>
+   </component>
+  </collection>
+  <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
+   <!--  this collection is really a component, move down a directory -->
+   <component id="videotelproto" filter="s60" name="Video Telephony Protocol">
+    <unit bldFile="vtprotocolsstub/group" filter="sf_build"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian3/app/voicerec/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/voicerec/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -78,6 +78,14 @@
     <layer name="app" long-name="Applications" levels="services 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="/sf/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="/sf/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">
@@ -88,9 +96,6 @@
           <component name="voicerec_api_test" filter="s60,test,api_test,pref_test" purpose="development" long-name="Voice Recorder Apps Test">
             <unit bldFile="/sf/app/voicerec/tsrc/group"/>
           </component>
-          <component name="voicerec_plat" filter="s60" long-name="Voice Recorder Apps Platform Interfaces" class="api">
-            <unit bldFile="/sf/app/voicerec/voicerec_plat/group"/>
-          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/app/voicerec/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/voicerec/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="voicerec" name="Voice Recorder Apps">
+ <package id="voicerec" name="Voice Recorder Apps">
   <!-- custom filter pref_test-->
-    <collection id="voicerecorder" name="Voice Recorder">
-    	<!--this is really a component, move down a directory -->
-      <component id="voicerecorder_build" filter="s60" name="Voice Recorder Build">
-        <unit bldFile="voicerecorder/group"/>
-      </component>
-    </collection>
-    <collection id="voicerec_info" name="Voice Recorder Apps Info">
-      <component id="voicerec_api_test" filter="s60,test,api_test,pref_test" purpose="development" name="Voice Recorder Apps Test">
-        <unit bldFile="tsrc/group"/>
-      </component>
-      <component id="voicerec_plat" filter="s60" name="Voice Recorder Apps Platform Interfaces" class="api">
-        <unit bldFile="voicerec_plat/group"/>
-      </component>
-    </collection>
-  </package>
+  <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" href="voicerec_plat/new_file_service_api/new_file_service_api.metaxml"/>
+    <unit bldFile="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" href="voicerec_plat/voicerecorder_public_constants_api/voicerecorder_public_constants_api.metaxml"/>
+    <unit bldFile="voicerec_plat/voicerecorder_public_constants_api/group"/>
+   </component>
+  </collection>
+  <collection id="voicerecorder" name="Voice Recorder">
+   <!--this is really a component, move down a directory -->
+   <component id="voicerecorder_build" filter="s60" name="Voice Recorder Build">
+    <unit bldFile="voicerecorder/group"/>
+   </component>
+  </collection>
+  <collection id="voicerec_info" name="Voice Recorder Apps Info">
+   <component id="voicerec_api_test" filter="s60,test,api_test,pref_test" purpose="development" name="Voice Recorder Apps Test">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>
-
-

--- a/symbian3/mw/accesssec/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/accesssec/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,50 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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 -->
@@ -100,11 +144,6 @@
             <unit bldFile="/sf/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="/sf/mw/accesssec/accesssec_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/accesssec/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/accesssec/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,33 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="accesssec" name="Access Security" levels="plugin framework server generic specific">
-    <collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
-      <component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
-		<!-- the directory for this needs to be moved up to the right level -->
-        <unit bldFile="wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-      </component>
-      <component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
-        <unit bldFile="wlansecuritysettings/wepsecuritysettingsui/group"/>
-      </component>
-      <component id="wifiprotectedsetup" filter="s60" name="WIFI Protected Setup" introduced="^1">
-        <unit bldFile="wlansecuritysettings/wifiprotectedsetup/group"/>
-      </component>
-      <component id="wlaneapsettingsui" filter="s60" name="WLAN EAP Settings UI" introduced="9.3">
-        <unit bldFile="wlansecuritysettings/wlaneapsettingsui/group"/>
-      </component>
-      <component id="wpasecuritysettingsui" filter="s60" name="WPA Security Settings UI" introduced="9.1">
-        <unit bldFile="wlansecuritysettings/wpasecuritysettingsui/group"/>
-      </component>
-    </collection>
-    <collection id="eapol" name="EAPOL" level="framework">
-      <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
-        <unit bldFile="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="accesssec_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="accesssec" 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" href="accesssec_plat/wapi_security_settings_ui_api/wapi_security_settings_ui_api.metaxml"/>
+    <unit bldFile="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" href="accesssec_plat/wep_security_settings_ui_api/wep_security_settings_ui_api.metaxml"/>
+    <unit bldFile="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" href="accesssec_plat/wi-fi_protected_setup_ui_api/wi-fi_protected_setup_ui_api.metaxml"/>
+    <unit bldFile="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" href="accesssec_plat/wlan_eap_settings_ui_api/wlan_eap_settings_ui_api.metaxml"/>
+    <unit bldFile="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" href="accesssec_plat/wpa_security_settings_ui_api/wpa_security_settings_ui_api.metaxml"/>
+    <unit bldFile="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" href="accesssec_plat/eap_vpn_api/eap_vpn_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eap_vpn_api/group"/>
+   </component>
+   <component id="eapsim_db_api" name="EAP-SIM DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapsim_db_api/eapsim_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapsim_db_api/group"/>
+   </component>
+   <component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eap_type_api/eap_type_api.metaxml"/>
+    <unit bldFile="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" href="accesssec_plat/eaptlspeap_db_api/eaptlspeap_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eaptlspeap_db_api/group"/>
+   </component>
+   <component id="eapleap_db_api" name="LEAP DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapleap_db_api/eapleap_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapleap_db_api/group"/>
+   </component>
+   <component id="eapgtc_db_api" name="EAP-GTC DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapgtc_db_api/eapgtc_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapgtc_db_api/group"/>
+   </component>
+   <component id="eapmschapv2_db_api" name="EAP-MSCHAPV2 DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapmschapv2_db_api/eapmschapv2_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapmschapv2_db_api/group"/>
+   </component>
+   <component id="eapaka_db_api" name="EAP-AKA DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/eapaka_db_api/eapaka_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/eapaka_db_api/group"/>
+   </component>
+   <component id="wapi_db_api" name="WAPI DB API" class="api" filter="s60">
+    <meta rel="Api" href="accesssec_plat/wapi_db_api/wapi_db_api.metaxml"/>
+    <unit bldFile="accesssec_plat/wapi_db_api/group"/>
+   </component>
+  </collection>
+  <collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
+   <component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
+    <!-- the directory for this needs to be moved up to the right level -->
+    <unit bldFile="wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+   </component>
+   <component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
+    <unit bldFile="wlansecuritysettings/wepsecuritysettingsui/group"/>
+   </component>
+   <component id="wifiprotectedsetup" filter="s60" name="WIFI Protected Setup" introduced="^1">
+    <unit bldFile="wlansecuritysettings/wifiprotectedsetup/group"/>
+   </component>
+   <component id="wlaneapsettingsui" filter="s60" name="WLAN EAP Settings UI" introduced="9.3">
+    <unit bldFile="wlansecuritysettings/wlaneapsettingsui/group"/>
+   </component>
+   <component id="wpasecuritysettingsui" filter="s60" name="WPA Security Settings UI" introduced="9.1">
+    <unit bldFile="wlansecuritysettings/wpasecuritysettingsui/group"/>
+   </component>
+  </collection>
+  <collection id="eapol" name="EAPOL" level="framework">
+   <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
+    <unit bldFile="eapol/eapol_framework/eapol_symbian/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/appinstall/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/appinstall/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,40 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+          </component>
+          <component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -144,12 +178,6 @@
           </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="/sf/mw/appinstall/appinstall_pub/group"/>
-          </component>
-          <component name="appinstall_plat" filter="s60" long-name="Application Installation Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/appinstall/appinstall_plat/group"/>
-          </component>
           <component name="appinstall_test" filter="s60,test,api_test" long-name="Application Installation Test" purpose="development">
             <unit bldFile="/sf/mw/appinstall/tsrc/group"/>
           </component>

--- a/symbian3/mw/appinstall/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/appinstall/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,85 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="appinstall" name="Application Installation" levels="tool framework generic api">
-    <collection id="ncdengine" name="Nokia Content Discover" level="framework">
-    	<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-      <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
-        <unit bldFile="ncdengine/engine/group"/>
-      </component>
-      <component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
-        <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-      </component>
-      <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
-        <unit bldFile="ncdengine/group"/>
-      </component>
-    </collection>
-    <collection id="appinstaller" name="Application Installer" level="generic">
-      <component id="appmngr2" filter="s60" name="Application Manager 2" introduced="^2">
-        <unit bldFile="appinstaller/appmngr2/group"/>
-      </component>
-      <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
-        <unit bldFile="appinstaller/appinstui/group"/>
-      </component>
-    </collection>
-    <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
-    	<!-- the collection is really a component. Move down a directory.-->
-      <component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
-        <unit bldFile="iaupdateapi_stub/group"/>
-      </component>
-    </collection>
-    <collection id="iaupdate" name="Independent Apps Update" level="api">
-    	<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-      <component id="iad" name="Software Update" filter="s60" introduced="^2">
-        <unit bldFile="iaupdate/iad/group"/>
-      </component>
-      <component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
-        <unit bldFile="iaupdate/help/group"/>
-      </component>
-      <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
-        <unit bldFile="iaupdate/group"/>
-      </component>
-    </collection>
-    <collection id="installationservices" name="Installation Services" level="generic">
-      <component id="swi" name="Secure Software Install" purpose="optional">
-        <unit bldFile="installationservices/swi/group" mrp="installationservices/swi/group/security_swi.mrp"/>
-      </component>
-      <component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-        <unit bldFile="installationservices/swidevicetools/group" mrp="installationservices/swidevicetools/group/security_switools_device.mrp"/>
-      </component>
-      <component id="switestfw" name="Software Install Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
-        <unit mrp="installationservices/switestfw/group/install_testframework.mrp" bldFile="installationservices/switestfw/group"/>
-      </component>
-      <component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-        <unit bldFile="installationservices/swiconfig/group" mrp="installationservices/swiconfig/group/install_config.mrp"/>
-      </component>
-    </collection>
-    <collection id="secureswitools" name="Secure Software Install Tools" level="tool">
-      <component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
-        <unit bldFile="secureswitools/makekeys/group" mrp="secureswitools/makekeys/group/security_makekeys.mrp"/>
-      </component>
-      <component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
-        <unit bldFile="secureswitools/swianalysistoolkit/group" mrp="secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-      </component>
-      <component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
-        <unit mrp="secureswitools/openssllib/security_openssl.mrp"/>
-      </component>
-      <component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
-        <unit bldFile="secureswitools/swisistools/group" mrp="secureswitools/swisistools/group/security_sistools.mrp"/>
-      </component>
-    </collection>
-    <collection id="appinstall_info" name="Application Installation Info" level="api">
-      <component id="appinstall_pub" filter="s60" name="Application Installation Public Interfaces" class="api">
-        <unit bldFile="appinstall_pub/group"/>
-      </component>
-      <component id="appinstall_plat" filter="s60" name="Application Installation Platform Interfaces" class="api">
-        <unit bldFile="appinstall_plat/group"/>
-      </component>
-      <component id="appinstall_test" filter="s60,test,api_test" name="Application Installation Test" purpose="development">
-        <unit bldFile="tsrc/group"/>
-      </component>
-      <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="appinstall" 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" href="appinstall_plat/iaupdate_api/iaupdate_api.metaxml"/>
+    <unit bldFile="appinstall_plat/iaupdate_api/group"/>
+   </component>
+   <component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/task_plugin_api/task_plugin_api.metaxml"/>
+    <unit bldFile="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" href="appinstall_plat/sw_installer_common_ui_api/sw_installer_common_ui_api.metaxml"/>
+    <unit bldFile="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" href="appinstall_plat/sw_installer_launcher_api/sw_installer_launcher_api.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_launcher_api/group"/>
+   </component>
+   <component id="task_management_api" name="Task Management API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/task_management_api/task_management_api.metaxml"/>
+    <unit bldFile="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" href="appinstall_plat/sw_installer_ui_plugin_api/sw_installer_ui_plugin_api.metaxml"/>
+    <unit bldFile="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" href="appinstall_plat/sw_installer_cr_keys/sw_installer_cr_keys.metaxml"/>
+    <unit bldFile="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" href="appinstall_plat/sw_installer_ps_keys/sw_installer_ps_keys.metaxml"/>
+    <unit bldFile="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" href="appinstall_plat/appmngr2runtimeapi/appmngr2runtimeapi.metaxml"/>
+    <unit bldFile="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" href="appinstall_pub/startup_list_management_api/startup_list_management_api.metaxml"/>
+    <unit bldFile="appinstall_pub/startup_list_management_api/group"/>
+   </component>
+  </collection>
+  <collection id="ncdengine" name="Nokia Content Discover" level="framework">
+   <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+   <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
+    <unit bldFile="ncdengine/engine/group"/>
+   </component>
+   <component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
+    <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+   </component>
+   <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
+    <unit bldFile="ncdengine/group"/>
+   </component>
+  </collection>
+  <collection id="appinstaller" name="Application Installer" level="generic">
+   <component id="appmngr2" filter="s60" name="Application Manager 2" introduced="^2">
+    <unit bldFile="appinstaller/appmngr2/group"/>
+   </component>
+   <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+    <unit bldFile="appinstaller/appinstui/group"/>
+   </component>
+  </collection>
+  <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+   <!-- the collection is really a component. Move down a directory.-->
+   <component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
+    <unit bldFile="iaupdateapi_stub/group"/>
+   </component>
+  </collection>
+  <collection id="iaupdate" name="Independent Apps Update" level="api">
+   <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+   <component id="iad" name="Software Update" filter="s60" introduced="^2">
+    <unit bldFile="iaupdate/iad/group"/>
+   </component>
+   <component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
+    <unit bldFile="iaupdate/help/group"/>
+   </component>
+   <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+    <unit bldFile="iaupdate/group"/>
+   </component>
+  </collection>
+  <collection id="installationservices" name="Installation Services" level="generic">
+   <component id="swi" name="Secure Software Install" purpose="optional">
+    <unit bldFile="installationservices/swi/group" mrp="installationservices/swi/group/security_swi.mrp"/>
+   </component>
+   <component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+    <unit bldFile="installationservices/swidevicetools/group" mrp="installationservices/swidevicetools/group/security_switools_device.mrp"/>
+   </component>
+   <component id="switestfw" name="Software Install Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+    <unit mrp="installationservices/switestfw/group/install_testframework.mrp" bldFile="installationservices/switestfw/group"/>
+   </component>
+   <component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+    <unit bldFile="installationservices/swiconfig/group" mrp="installationservices/swiconfig/group/install_config.mrp"/>
+   </component>
+  </collection>
+  <collection id="secureswitools" name="Secure Software Install Tools" level="tool">
+   <component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
+    <unit bldFile="secureswitools/makekeys/group" mrp="secureswitools/makekeys/group/security_makekeys.mrp"/>
+   </component>
+   <component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
+    <unit bldFile="secureswitools/swianalysistoolkit/group" mrp="secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+   </component>
+   <component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
+    <unit mrp="secureswitools/openssllib/security_openssl.mrp"/>
+   </component>
+   <component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
+    <unit bldFile="secureswitools/swisistools/group" mrp="secureswitools/swisistools/group/security_sistools.mrp"/>
+   </component>
+  </collection>
+  <collection id="appinstall_info" name="Application Installation Info" level="api">
+   <component id="appinstall_test" filter="s60,test,api_test" name="Application Installation Test" purpose="development">
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/appsupport/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,84 +1,184 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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.
+          <!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
           <component name="cfw" filter="s60" long-name="Context Framework">
             <!--<unit bldFile="contextframework/cfw/group"/> -->
@@ -212,7 +312,7 @@
           <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
             <unit bldFile="/sf/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/sf/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
           </component>
-          <component name="tzdatabase" long-name="Time Zone Database" filter="test" introduced="9.1" purpose="optional" class="config">
+          <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
             <unit bldFile="/sf/mw/appsupport/tzservices/tzdatabase/group" mrp="/sf/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
           </component>
         </collection>
@@ -259,12 +359,6 @@
           </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="/sf/mw/appsupport/appsupport_plat/group"/>
-          </component>
-          <component name="appsupport_pub" filter="s60" long-name="Generic Application Support Public Interfaces" class="api">
-            <unit bldFile="/sf/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="/sf/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
           </component>

--- a/symbian3/mw/appsupport/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/appsupport/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,205 +1,331 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="appsupport" name="Generic Application Support" levels="system plugin framework server generic specific">
-    <collection id="contextframework" name="Context Framework" level="framework">
-	  <!-- the units that are commented out need to be put back when configuration is in place.
+ <package id="appsupport" 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" href="appsupport_pub/flash_viewer_framework_api/flash_viewer_framework_api.metaxml"/>
+    <unit bldFile="appsupport_pub/flash_viewer_framework_api/group"/>
+   </component>
+   <component id="network_status_api" name="Network Status API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_pub/network_status_api/network_status_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/action_plugin_api/action_plugin_api.metaxml"/>
+    <unit bldFile="appsupport_plat/action_plugin_api/group"/>
+   </component>
+   <component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/application_orientation_api/application_orientation_api.metaxml"/>
+    <unit bldFile="appsupport_plat/application_orientation_api/group"/>
+   </component>
+   <component id="context_access_api" name="Context Access API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/context_access_api/context_access_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/context_framework_services_api/context_framework_services_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/context_framework_client_api/context_framework_client_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/context_framework_listener_api/context_framework_listener_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/context_framework_version_api/context_framework_version_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/context_source_plugin_api/context_source_plugin_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/context_source_settings_manager_api/context_source_settings_manager_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/context_subscription_api/context_subscription_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/key_event_framework_api/key_event_framework_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/key_event_framework_mapper_api/key_event_framework_mapper_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/media_keys_definition_api/media_keys_definition_api.metaxml"/>
+    <unit bldFile="appsupport_plat/media_keys_definition_api/group"/>
+   </component>
+   <component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/ood_threshold_api/ood_threshold_api.metaxml"/>
+    <unit bldFile="appsupport_plat/ood_threshold_api/group"/>
+   </component>
+   <component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/oom_monitor_api/oom_monitor_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/oom_monitor_plugin_api/oom_monitor_plugin_api.metaxml"/>
+    <unit bldFile="appsupport_plat/oom_monitor_plugin_api/group"/>
+   </component>
+   <component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/operation_provider_api/operation_provider_api.metaxml"/>
+    <unit bldFile="appsupport_plat/operation_provider_api/group"/>
+   </component>
+   <component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/phonecmdhandler_api/phonecmdhandler_api.metaxml"/>
+    <unit bldFile="appsupport_plat/phonecmdhandler_api/group"/>
+   </component>
+   <component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/restore_factory_settings_api/restore_factory_settings_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/restore_factory_settings_plugin_api/restore_factory_settings_plugin_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/secondary_display_accfw_api/secondary_display_accfw_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/secondary_display_startup_api/secondary_display_startup_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/secondary_display_sysap_api/secondary_display_sysap_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/secondary_display_system_state_api/secondary_display_system_state_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/sensor_user_setting_api/sensor_user_setting_api.metaxml"/>
+    <unit bldFile="appsupport_plat/sensor_user_setting_api/group"/>
+   </component>
+   <component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="appsupport_plat/startup_configuration_api/startup_configuration_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/system_application_key_handler_plugin_api/system_application_key_handler_plugin_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/system_application_light_control_plugin_api/system_application_light_control_plugin_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/system_application_notification_api/system_application_notification_api.metaxml"/>
+    <unit bldFile="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" href="appsupport_plat/system_application_plugin_callback_api/system_application_plugin_callback_api.metaxml"/>
+    <unit bldFile="appsupport_plat/system_application_plugin_callback_api/group"/>
+   </component>
+  </collection>
+  <collection id="contextframework" name="Context Framework" level="framework">
+   <!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
-      <component id="cfw" filter="s60" name="Context Framework">
-         <meta rel="config">
-      	  <defined condition="RD_CONTEXT_FRAMEWORK"/>
-        </meta>
-        <!--<unit bldFile="contextframework/cfw/group"/> -->
-      </component>
-      <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
-         <meta rel="config">
-      	  <defined condition="RD_CONTEXT_FRAMEWORK"/>
-        </meta>
-        <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-      </component>
-      <component id="contextframework_build" filter="s60" name="Context Framework Build">
-        <unit bldFile="contextframework/group"/>
-      </component>
-    </collection>
-    <collection id="coreapplicationuis" name="Core Application UIs" level="server">
-      <component id="dbrecovery" filter="s60" name="Database Recovery">
-        <unit bldFile="coreapplicationuis/dbrecovery/group"/>
-      </component>
-      <component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
-          <!-- No Service Power Save? Window Server? Please elaborate-->
-        <unit bldFile="coreapplicationuis/nspswsplugin/group"/>
-      </component>
-      <component id="rfs" filter="s60" name="Restore Factory Settings">
-        <unit bldFile="coreapplicationuis/rfs/group"/>
-      </component>
-      <component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
-        <unit bldFile="coreapplicationuis/rfsplugins/group"/>
-      </component>
-      <component id="sysap" filter="s60" name="System Application">
-        <unit bldFile="coreapplicationuis/sysap/group"/>
-      </component>
-      <component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
-        <unit bldFile="coreapplicationuis/variatedsettings/group"/>
-      </component>
-      <component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
-        <unit bldFile="coreapplicationuis/accfwuinotifier/group"/>
-      </component>
-      <component id="kefmapper" filter="s60" name="Key Event Framework">
-        <unit bldFile="coreapplicationuis/kefmapper/group"/>
-      </component>
-      <component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
-        <unit bldFile="coreapplicationuis/advancedtspcontroller/group"/>
-      </component>
-      <component id="powersaveutilities" filter="s60" name="Power Save Utilities">
-        <unit bldFile="coreapplicationuis/powersaveutilities/group"/>
-      </component>
-      <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub">
-        <unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
-      </component>
-      <component id="gsserverengine" filter="s60" name="GS Server Engine">
-        <unit bldFile="coreapplicationuis/gsserverengine/group"/>
-      </component>
-      <component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
-        <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/group"/>
-      </component>
-    </collection>
-    <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
-    	<!--  collection is really a component. Move down a directory -->
-      <component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
-        <unit base="flashliteapi_3_1/group"/>
-      </component>
-    </collection>
-    <collection id="mediakeys" name="Media Keys" level="plugin">
-    	<!--  collection is really a component. Move down a directory -->
-      <component id="mediakeys_build" filter="s60" name="Media Keys Build">
-        <unit bldFile="mediakeys/group"/>
-      </component>
-    </collection>
-    <collection id="startupservices" name="Startup Services" level="system">
-      <component id="splashscreen" filter="s60" name="Splash Screen">
-        <unit bldFile="startupservices/splashscreen/group"/>
-      </component>
-      <component id="startupanimation" filter="s60" name="Startup Animation">
-        <unit bldFile="startupservices/startupanimation/group"/>
-      </component>
-      <component id="startup" name="Startup Application" filter="s60">
-        <unit bldFile="startupservices/startup/group"/>
-      </component>
-    </collection>
-    <collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
-      <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
-        <unit bldFile="sysresmonitoring/oodmonitor/group"/>
-      </component>
-      <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
-        <unit bldFile="sysresmonitoring/oommonitor/group"/>
-      </component>
-    </collection>
-    <collection id="systemsettings" name="System Settings" level="system">
-      <component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
-        <unit bldFile="systemsettings/gssensorplugin/group"/>
-      </component>
-      <component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
-        <unit bldFile="systemsettings/gsaccessoryplugin/group"/>
-      </component>
-    </collection>
-    <collection id="filehandling" name="File Handling" level="server">
-      <component id="fileconverterfw" name="File Converter Framework" purpose="optional">
-        <unit bldFile="filehandling/fileconverterfw/group" mrp="filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-      </component>
-      <component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
-        <unit bldFile="filehandling/htmltorichtextconverter/group" mrp="filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-      </component>
-      <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="filehandling/richtexttohtmlconverter/Group" mrp="filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-      </component>
-    </collection>
-	<collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
-      <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="hwresourceadaptation/hwresourcemgruiplugin/group" mrp="hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-      </component>
-    </collection>
-    <collection id="commonappservices" name="Common Application Services" level="framework">
-      <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional">
-        <unit bldFile="commonappservices/alarmserver/Group" mrp="commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
-      </component>
-      <component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
-        <unit bldFile="commonappservices/alarmservertest/TestAlarmSrv" mrp="commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-      </component>
-      <component id="coreappstest" name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
-        <unit mrp="commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="commonappservices/coreappstest/Group"/>
-      </component>
-      <component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
-        <unit mrp="commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-      </component>
-      <component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
-        <unit bldFile="commonappservices/backuprestorenotification/group" mrp="commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-      </component>
-    </collection>
-    <collection id="tzservices" name="Time Zone Services" level="plugin">
-      <component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
-        <unit bldFile="tzservices/tzserver/group" mrp="tzservices/tzserver/group/app-services_tz.mrp"/>
-      </component>
-      <component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
-        <unit bldFile="tzservices/tzloc/group" mrp="tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-      </component>
-      <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
-        <unit bldFile="tzservices/tzlocrscfactory/group" mrp="tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-      </component>
-      <component id="tzdatabase" name="Time Zone Database" filter="test" introduced="9.1" purpose="optional" class="config">
-        <unit bldFile="tzservices/tzdatabase/group" mrp="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">
-        <unit bldFile="contenthandling/webrecognisers/group" mrp="contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-      </component>
-    </collection>
-    <collection id="openenvutils" name="Open Environment Utilities" level="specific">
-      <component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
-        <unit bldFile="openenvutils/commandshell/group" mrp="openenvutils/commandshell/group/oetools_zsh.mrp"/>
-      </component>
-      <component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
-        <unit bldFile="openenvutils/telnetserver/group" mrp="openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
-      </component>
-    </collection>
-    <collection id="printingsupport" name="Printing Support" level="generic">
-      <component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
-        <unit bldFile="printingsupport/printinguisupport/group" mrp="printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-      </component>
-    </collection>
-    <collection id="appfw" name="Application Framework" level="framework">
-      <component id="apparchitecture" name="Application Architecture" purpose="mandatory">
-        <unit bldFile="appfw/apparchitecture/group" mrp="appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-      </component>
-      <component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
-        <unit bldFile="appfw/viewserver/group" mrp="appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-      </component>
-      <component id="uiftestfw" name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
-        <unit mrp="appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="appfw/uiftestfw/group"/>
-      </component>
-    </collection>
-    <collection id="applaunchservices" name="Application Launch Services" level="generic">
-      <component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
-        <unit bldFile="applaunchservices/aftermarketappstarter/group" mrp="applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
-      </component>
-      <component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
-        <unit bldFile="applaunchservices/applaunchplugins/group" mrp="applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
-      </component>
-    </collection>
-    <collection id="tzpcside" name="Time Zone PC Side" level="plugin">
-      <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
-        <unit bldFile="tzpcside/tzcompiler/group" mrp="tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-      </component>
-    </collection>
-    <collection id="appsupport_info" name="Generic Application Support Info" level="specific">
-      <component id="appsupport_plat" filter="s60" name="Generic Application Support Platform Interfaces" class="api">
-        <unit bldFile="appsupport_plat/group"/>
-      </component>
-      <component id="appsupport_pub" filter="s60" name="Generic Application Support Public Interfaces" class="api">
-        <unit bldFile="appsupport_pub/group"/>
-      </component>
-      <component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+   <component id="cfw" filter="s60" name="Context Framework">
+    <meta rel="config">
+     <defined condition="RD_CONTEXT_FRAMEWORK"/>
+    </meta>
+    <!--<unit bldFile="contextframework/cfw/group"/> -->
+   </component>
+   <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+    <meta rel="config">
+     <defined condition="RD_CONTEXT_FRAMEWORK"/>
+    </meta>
+    <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+   </component>
+   <component id="contextframework_build" filter="s60" name="Context Framework Build">
+    <unit bldFile="contextframework/group"/>
+   </component>
+  </collection>
+  <collection id="coreapplicationuis" name="Core Application UIs" level="server">
+   <component id="dbrecovery" filter="s60" name="Database Recovery">
+    <unit bldFile="coreapplicationuis/dbrecovery/group"/>
+   </component>
+   <component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
+    <!-- No Service Power Save? Window Server? Please elaborate-->
+    <unit bldFile="coreapplicationuis/nspswsplugin/group"/>
+   </component>
+   <component id="rfs" filter="s60" name="Restore Factory Settings">
+    <unit bldFile="coreapplicationuis/rfs/group"/>
+   </component>
+   <component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
+    <unit bldFile="coreapplicationuis/rfsplugins/group"/>
+   </component>
+   <component id="sysap" filter="s60" name="System Application">
+    <unit bldFile="coreapplicationuis/sysap/group"/>
+   </component>
+   <component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
+    <unit bldFile="coreapplicationuis/variatedsettings/group"/>
+   </component>
+   <component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
+    <unit bldFile="coreapplicationuis/accfwuinotifier/group"/>
+   </component>
+   <component id="kefmapper" filter="s60" name="Key Event Framework">
+    <unit bldFile="coreapplicationuis/kefmapper/group"/>
+   </component>
+   <component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
+    <unit bldFile="coreapplicationuis/advancedtspcontroller/group"/>
+   </component>
+   <component id="powersaveutilities" filter="s60" name="Power Save Utilities">
+    <unit bldFile="coreapplicationuis/powersaveutilities/group"/>
+   </component>
+   <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub">
+    <unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
+   </component>
+   <component id="gsserverengine" filter="s60" name="GS Server Engine">
+    <unit bldFile="coreapplicationuis/gsserverengine/group"/>
+   </component>
+   <component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
+    <unit bldFile="coreapplicationuis/sensordatacompensatorplugin/group"/>
+   </component>
+  </collection>
+  <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
+   <!--  collection is really a component. Move down a directory -->
+   <component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
+    <unit base="flashliteapi_3_1/group"/>
+   </component>
+  </collection>
+  <collection id="mediakeys" name="Media Keys" level="plugin">
+   <!--  collection is really a component. Move down a directory -->
+   <component id="mediakeys_build" filter="s60" name="Media Keys Build">
+    <unit bldFile="mediakeys/group"/>
+   </component>
+  </collection>
+  <collection id="startupservices" name="Startup Services" level="system">
+   <component id="splashscreen" filter="s60" name="Splash Screen">
+    <unit bldFile="startupservices/splashscreen/group"/>
+   </component>
+   <component id="startupanimation" filter="s60" name="Startup Animation">
+    <unit bldFile="startupservices/startupanimation/group"/>
+   </component>
+   <component id="startup" name="Startup Application" filter="s60">
+    <unit bldFile="startupservices/startup/group"/>
+   </component>
+  </collection>
+  <collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
+   <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+    <unit bldFile="sysresmonitoring/oodmonitor/group"/>
+   </component>
+   <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+    <unit bldFile="sysresmonitoring/oommonitor/group"/>
+   </component>
+  </collection>
+  <collection id="systemsettings" name="System Settings" level="system">
+   <component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
+    <unit bldFile="systemsettings/gssensorplugin/group"/>
+   </component>
+   <component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
+    <unit bldFile="systemsettings/gsaccessoryplugin/group"/>
+   </component>
+  </collection>
+  <collection id="filehandling" name="File Handling" level="server">
+   <component id="fileconverterfw" name="File Converter Framework" purpose="optional">
+    <unit bldFile="filehandling/fileconverterfw/group" mrp="filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+   </component>
+   <component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
+    <unit bldFile="filehandling/htmltorichtextconverter/group" mrp="filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+   </component>
+   <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="filehandling/richtexttohtmlconverter/Group" mrp="filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+   </component>
+  </collection>
+  <collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
+   <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="hwresourceadaptation/hwresourcemgruiplugin/group" mrp="hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+   </component>
+  </collection>
+  <collection id="commonappservices" name="Common Application Services" level="framework">
+   <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional">
+    <unit bldFile="commonappservices/alarmserver/Group" mrp="commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+   </component>
+   <component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+    <unit bldFile="commonappservices/alarmservertest/TestAlarmSrv" mrp="commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+   </component>
+   <component id="coreappstest" name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
+    <unit mrp="commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="commonappservices/coreappstest/Group"/>
+   </component>
+   <component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
+    <unit mrp="commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+   </component>
+   <component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
+    <unit bldFile="commonappservices/backuprestorenotification/group" mrp="commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+   </component>
+  </collection>
+  <collection id="tzservices" name="Time Zone Services" level="plugin">
+   <component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
+    <unit bldFile="tzservices/tzserver/group" mrp="tzservices/tzserver/group/app-services_tz.mrp"/>
+   </component>
+   <component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
+    <unit bldFile="tzservices/tzloc/group" mrp="tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+   </component>
+   <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+    <unit bldFile="tzservices/tzlocrscfactory/group" mrp="tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+   </component>
+   <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+    <unit bldFile="tzservices/tzdatabase/group" mrp="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">
+    <unit bldFile="contenthandling/webrecognisers/group" mrp="contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+   </component>
+  </collection>
+  <collection id="openenvutils" name="Open Environment Utilities" level="specific">
+   <component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
+    <unit bldFile="openenvutils/commandshell/group" mrp="openenvutils/commandshell/group/oetools_zsh.mrp"/>
+   </component>
+   <component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
+    <unit bldFile="openenvutils/telnetserver/group" mrp="openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+   </component>
+  </collection>
+  <collection id="printingsupport" name="Printing Support" level="generic">
+   <component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+    <unit bldFile="printingsupport/printinguisupport/group" mrp="printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+   </component>
+  </collection>
+  <collection id="appfw" name="Application Framework" level="framework">
+   <component id="apparchitecture" name="Application Architecture" purpose="mandatory">
+    <unit bldFile="appfw/apparchitecture/group" mrp="appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+   </component>
+   <component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
+    <unit bldFile="appfw/viewserver/group" mrp="appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+   </component>
+   <component id="uiftestfw" name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
+    <unit mrp="appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="appfw/uiftestfw/group"/>
+   </component>
+  </collection>
+  <collection id="applaunchservices" name="Application Launch Services" level="generic">
+   <component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
+    <unit bldFile="applaunchservices/aftermarketappstarter/group" mrp="applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+   </component>
+   <component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
+    <unit bldFile="applaunchservices/applaunchplugins/group" mrp="applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+   </component>
+  </collection>
+  <collection id="tzpcside" name="Time Zone PC Side" level="plugin">
+   <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
+    <unit bldFile="tzpcside/tzcompiler/group" mrp="tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+   </component>
+  </collection>
+  <collection id="appsupport_info" name="Generic Application Support Info" level="specific">
+   <component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/btservices/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/btservices/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,55 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/btservices/bluetoothengine/bteng/group"/>
@@ -118,12 +167,6 @@
           </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="/sf/mw/btservices/btservices_plat/group"/>
-          </component>
-          <component name="btservices_pub" filter="s60" long-name="BT Services Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/btservices/btservices_pub/group"/>
-          </component>
           <component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
             <unit mrp="/sf/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
           </component>

--- a/symbian3/mw/btservices/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/btservices/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,59 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="btservices" name="Bluetooth Services" levels="framework server generic specific plugin">
-    <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
-      <component id="bteng" filter="s60" name="Bluetooth Engine">
-        <unit bldFile="bluetoothengine/bteng/group"/>
-      </component>
-      <component id="btnotif" filter="s60" name="Bluetooth Notifier">
-        <unit bldFile="bluetoothengine/btnotif/group"/>
-      </component>
-      <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
-        <unit bldFile="bluetoothengine/btaudioman/group"/>
-      </component>
-      <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
-        <unit bldFile="bluetoothengine/btmac/group"/>
-      </component>
-      <component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
-        <unit bldFile="bluetoothengine/btsac/group"/>
-      </component>
-      <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
-        <unit bldFile="bluetoothengine/btaudiostreamer/group"/>
-      </component>
-      <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
-        <unit bldFile="bluetoothengine/btsap/group"/>
-      </component>
-      <component id="btui" filter="s60" name="Bluetooth UI">
-        <unit bldFile="bluetoothengine/btui/group"/>
-      </component>
-      <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
-        <unit bldFile="bluetoothengine/btpbap/group"/>
-      </component>
-      <component id="bthid" filter="s60" name="Bluetooth HID">
-        <unit bldFile="bluetoothengine/bthid/group"/>
-      </component>
-      <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
-        <unit bldFile="bluetoothengine/btctrldcmoadapter/group"/>
-      </component>
-    </collection>
-    <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
-      <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
-        <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-      </component>
-    </collection>
-    <collection id="btservices_info" name="BT Services Info" level="plugin">
-      <component id="btservices_plat" filter="s60" name="BT Services Platform Interfaces" class="api">
-        <unit bldFile="btservices_plat/group"/>
-      </component>
-      <component id="btservices_pub" filter="s60" name="BT Services Public Interfaces" class="api">
-        <unit bldFile="btservices_pub/group"/>
-      </component>
-      <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-        <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
-      </component>
-      <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
-        <unit bldFiile="tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="btservices" 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" href="btservices_pub/bluetooth_power_state_api/bluetooth_power_state_api.metaxml"/>
+    <unit bldFile="btservices_pub/bluetooth_power_state_api/group"/>
+   </component>
+   <component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_pub/bluetooth_notifier_api/bluetooth_notifier_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_dosserver_audio_api/bluetooth_dosserver_audio_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_dut_mode_api/bluetooth_dut_mode_api.metaxml"/>
+    <unit bldFile="btservices_plat/bluetooth_dut_mode_api/group"/>
+   </component>
+   <component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/bluetooth_engine_api/bluetooth_engine_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_engine_connection_management_api/bluetooth_engine_connection_management_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_engine_device_management_api/bluetooth_engine_device_management_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_engine_discovery_api/bluetooth_engine_discovery_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_engine_features_api/bluetooth_engine_features_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_engine_settings_api/bluetooth_engine_settings_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_engine_plugin_api/bluetooth_engine_plugin_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_local_variation_api/bluetooth_local_variation_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_notifier_internal_api/bluetooth_notifier_internal_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_sap_connection_state_api/bluetooth_sap_connection_state_api.metaxml"/>
+    <unit bldFile="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" href="btservices_plat/bluetooth_secondary_display_notification_api/bluetooth_secondary_display_notification_api.metaxml"/>
+    <unit bldFile="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="bluetoothengine/bteng/group"/>
+   </component>
+   <component id="btnotif" filter="s60" name="Bluetooth Notifier">
+    <unit bldFile="bluetoothengine/btnotif/group"/>
+   </component>
+   <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
+    <unit bldFile="bluetoothengine/btaudioman/group"/>
+   </component>
+   <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
+    <unit bldFile="bluetoothengine/btmac/group"/>
+   </component>
+   <component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
+    <unit bldFile="bluetoothengine/btsac/group"/>
+   </component>
+   <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
+    <unit bldFile="bluetoothengine/btaudiostreamer/group"/>
+   </component>
+   <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
+    <unit bldFile="bluetoothengine/btsap/group"/>
+   </component>
+   <component id="btui" filter="s60" name="Bluetooth UI">
+    <unit bldFile="bluetoothengine/btui/group"/>
+   </component>
+   <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
+    <unit bldFile="bluetoothengine/btpbap/group"/>
+   </component>
+   <component id="bthid" filter="s60" name="Bluetooth HID">
+    <unit bldFile="bluetoothengine/bthid/group"/>
+   </component>
+   <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
+    <unit bldFile="bluetoothengine/btctrldcmoadapter/group"/>
+   </component>
+  </collection>
+  <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
+   <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+    <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+   </component>
+  </collection>
+  <collection id="btservices_info" name="BT Services Info" level="plugin">
+   <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+    <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+   </component>
+   <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
+    <unit bldFiile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/camerasrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,36 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group" filter="test,api_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">
@@ -106,16 +136,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="/sf/mw/camerasrv/camerasrv_plat/group"/>
-          </component>
-          <component name="camerasrv_test" filter="s60,test,api_test" long-name="Camera Services API Test" purpose="development">
-            <!-- #include from a single bld.inf or split into mutliple componens -->
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/>
-          </component>
           <component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
             <!-- should split into individual bld.infs -->
             <unit bldFile="/sf/mw/camerasrv/group"/>

--- a/symbian3/mw/camerasrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,49 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="camerasrv" name="Camera Services" levels="plugin fw api">
-    <collection id="camappengine" name="Camera App Engine" level="fw">
-    	<!-- is this collection really a component? If so, move down a directory -->
-      <component id="stillconverter" filter="s60" name="Still Image Converter">
-		<!-- should separate this from parent engine's bld.inf  -->
-        <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
-      </component>
-      <component id="camappengine_engine" filter="s60" name="Camera App Engine">
-		<!-- should separate this from parent engine's bld.inf  -->
-        <!-- <unit bldFile="camappengine/engine/group"/> -->
-      </component>
-      <component id="asynchfilesavequeue" filter="s60" name="Asynch File Save Queue">
-        <unit bldFile="camappengine/asynchfilesavequeue/group"/>
-      </component>
-      <component id="camappengine_build" filter="s60" name="Camera App Engine Build">
-        <unit bldFile="camappengine/build"/>
-      </component>
-    </collection>
-    <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
-    	<!-- collection is really a component. Should move down a directory -->
-      <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
-        <unit bldFile="camcordermmfplugin/build"/>
-      </component>
-    </collection>
-    <collection id="configmanagers" name="Config Managers" level="api">
-      <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
-        <unit bldFile="configmanagers/imagingconfigmanager/group"/>
-      </component>
-    </collection>
-    <collection id="camerasrv_info" name="Camera Services Info" level="api">
-      <component id="camerasrv_plat" filter="s60" name="Camera Services Platform Interfaces" class="api">
-        <unit bldFile="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="camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/>
-      	<unit  bldFile="camerasrv_plat/camera_application_engine_api/tsrc/group"/>
-      	<unit  bldFile="camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/>
-      	<unit  bldFile="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="group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="camerasrv" 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" href="camerasrv_plat/media_recorder_sink_api/media_recorder_sink_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/media_recorder_sink_api/group"/>
+   </component>
+   <component id="cae_extentension_api" name="CAE Extension API" class="api" filter="s60">
+    <meta rel="Api" href="camerasrv_plat/cae_extentension_api/cae_extentension_api.metaxml"/>
+    <unit bldFile="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" href="camerasrv_plat/camera_application_engine_api/camera_application_engine_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+    <unit bldFile="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" href="camerasrv_plat/custom_onboard_camera_api/custom_onboard_camera_api.metaxml"/>
+    <unit bldFile="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" href="camerasrv_plat/imaging_configuration_manager_api/imaging_configuration_manager_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+    <unit bldFile="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" href="camerasrv_plat/media_recorder_api/media_recorder_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/media_recorder_api/group" filter="!test"/>
+    <unit bldFile="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" href="camerasrv_plat/3gp_file_composer_api/3gp_file_composer_api.metaxml"/>
+    <unit bldFile="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" href="camerasrv_plat/asynchronous_file_saving_queue_api/asynchronous_file_saving_queue_api.metaxml"/>
+    <unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+    <unit bldFile="camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="camappengine" name="Camera App Engine" level="fw">
+   <!-- is this collection really a component? If so, move down a directory -->
+   <component id="stillconverter" filter="s60" name="Still Image Converter">
+    <!-- should separate this from parent engine's bld.inf  -->
+    <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
+   </component>
+   <component id="camappengine_engine" filter="s60" name="Camera App Engine">
+    <!-- should separate this from parent engine's bld.inf  -->
+    <!-- <unit bldFile="camappengine/engine/group"/> -->
+   </component>
+   <component id="asynchfilesavequeue" filter="s60" name="Asynch File Save Queue">
+    <unit bldFile="camappengine/asynchfilesavequeue/group"/>
+   </component>
+   <component id="camappengine_build" filter="s60" name="Camera App Engine Build">
+    <unit bldFile="camappengine/build"/>
+   </component>
+  </collection>
+  <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+   <!-- collection is really a component. Should move down a directory -->
+   <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
+    <unit bldFile="camcordermmfplugin/build"/>
+   </component>
+  </collection>
+  <collection id="configmanagers" name="Config Managers" level="api">
+   <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+    <unit bldFile="configmanagers/imagingconfigmanager/group"/>
+   </component>
+  </collection>
+  <collection id="camerasrv_info" name="Camera Services Info" level="api">
+   <component id="camerasrv_build" filter="s60" name="Camera Services Build">
+    <!-- should split into individual bld.infs -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/classicui/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/classicui/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,581 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/japanese_reading_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/item_finder_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_lists_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/input_block_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/number_grouping_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="task_list_api" long-name="Task List API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_editors_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/alarm_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/list_effects_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/server_application_services_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/application_switching_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_animation_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_indicators_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/special_character_table_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/media_shared_document_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/key_rotator_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_grids_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/generic_parameter_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/popup_form_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/layout_configuration_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_initialization_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_buttons_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_testability_api/group"/>
+          </component>
+          <component name="ganes_api" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/ganes_api/group"/>
+          </component>
+          <component name="ode_api" long-name="Ode API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/ode_api/group"/>
+          </component>
+          <component name="physics_api" long-name="Physics API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/physics_api/group"/>
+          </component>
+          <component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_options_menu_api/tsrc/group" filter="test,api_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="/sf/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/input_frame_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/application_framework_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/scroller_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/buttons_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="queries_api" long-name="Queries API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/queries_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="editors_api" long-name="Editors API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/editors_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/fonts_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_clearer_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/notifiers_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="notes_api" long-name="Notes API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/base_controls_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="grids_api" long-name="Grids API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/grids_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/context_pane_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="lists_api" long-name="Lists API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/lists_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="popups_api" long-name="Popups API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/popups_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/misc_controls_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/keylock_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/options_menu_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/navigation_pane_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/tabs_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/choice_list_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/info_popup_note_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/setting_pages_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_mode_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/indicators_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/error_ui_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="animation_api" long-name="Animation API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/animation_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/searchfield_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="labels_api" long-name="Labels API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/labels_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/hotkeys_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/initialization_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/volume_control_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/sounds_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/generic_button_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="form_api" long-name="Form API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/form_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/uikon_core_controls/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/calendar_api/group"/>
+          </component>
+          <component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/server_application_api/group"/>
+          </component>
+          <component name="slider_api" long-name="Slider API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/slider_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/dialogs_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/document_handler_api/group"/>
+          </component>
+          <component name="images_api" long-name="Images API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/images_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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">
@@ -189,132 +764,10 @@
           </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="/sf/mw/classicui/classicui_pub/group"/>
-          </component>
-          <component name="classicui_plat" filter="s60" long-name="Classic UI Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/group"/>
-          </component>
           <!-- the multiple units in the API test components need to be resolved -->
           <component name="classicui_plat_api_test" filter="s60,test,api_test" long-name="Classic UI Platform API Tests" purpose="development">
             <!-- can only have one unit. Need to #include from a single bld.inf -->
             <unit bldFile="/sf/mw/classicui/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/alarm_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/application_switching_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_animation_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_buttons_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_editors_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_grids_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_indicators_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_initialization_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_lists_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_options_menu_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/generic_parameter_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/input_block_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/item_finder_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/japanese_reading_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/key_rotator_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/layout_configuration_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/list_effects_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/media_shared_document_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/number_grouping_api/tsrc/group"/>
-            <!--unit bldFile="classicui_plat/personalisation_framework_api/tsrc/group" /-->
-            <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/popup_form_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/server_application_services_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/special_character_table_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/touch_gesture_framework_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/tsrc/group"/>
-          </component>
-          <component name="classicui_pub_api_test" filter="s60,test,api_test" long-name="Classic UI Public API Tests" purpose="development">
-            <!-- can only have one unit. Need to #include from a single bld.inf -->
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/animation_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/application_framework_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/base_controls_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/buttons_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/choice_list_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/context_pane_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/dialogs_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/editors_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/error_ui_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/fonts_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/form_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/generic_button_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/grids_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/hotkeys_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/images_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/indicators_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/info_popup_note_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/initialization_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/input_frame_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/keylock_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/labels_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/lists_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/misc_controls_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/navigation_pane_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/notifiers_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/options_menu_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/popups_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/queries_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_clearer_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_mode_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/scroller_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/searchfield_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/setting_pages_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/slider_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/sounds_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/tabs_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/volume_control_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group"/>
           </component>
           <component name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>

--- a/symbian3/mw/classicui/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/classicui/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,248 +1,848 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="classicui" name="Classic UI" levels="base support server generic specific">
-    <collection id="ode" name="Open Dynamics Engine" level="support">
-    	<!-- the collection is really a component. Move down a directory.-->
-      <component id="ode_build" filter="s60" name="ODE">
-        <unit bldFile="ode/group"/>
-      </component>
-    </collection>
-    <collection id="uifw" name="UI Framework" level="server">
-      <component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
-        <unit bldFile="uifw/uiklaf/group"/>
-      </component>
-      <component id="eikctl" filter="s60" name="Eikon Controls">
-        <unit bldFile="uifw/eikctl/group"/>
-      </component>
-      <component id="avkon" filter="s60" name="Avkon">
-      	<!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
-        <unit bldFile="uifw/avkon/aknphysics/group"/>
-        <unit bldFile="uifw/avkon/group"/>
-        <unit bldFile="uifw/avkon/aknconf/group"/>
-      </component>
-      <component id="eikstd" filter="s60" name="Eikon Standard">
-        <unit bldFile="uifw/eikstd/group"/>
-      </component>
-      <component id="aknglobalui" filter="s60" name="Avkon Global UI">
-        <unit bldFile="uifw/aknglobalui/group"/>
-      </component>
-      <component id="ganes" filter="s60" name="Ganes">
-        <unit bldFile="uifw/ganes/group"/>
-      </component>
-    </collection>
-    <collection id="commonuis" name="Common UIs" level="specific">
-      <component id="commonui" filter="s60" name="Common UI">
-        <unit bldFile="commonuis/commonui/group"/>
-      </component>
-      <component id="commondialogs" filter="s60" name="Common Dialogs">
-        <unit bldFile="commonuis/commondialogs/group"/>
-      </component>
-    </collection>
-    <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
-      <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
-        <unit bldFile="applicationinterworkingfw/servicehandler/group"/>
-      </component>
-    </collection>
-    <collection id="psln" name="Personalization" level="specific">
-    	<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-      <component id="psln_build" filter="s60" name="Personalization Build">
-        <unit bldFile="psln/group"/>
-      </component>
-    </collection>
-    <collection id="commonadapter" name="Common Adapter" level="support">
-    	<!-- the collection is really a component. Move down a directory.-->
-      <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
-        <unit bldFile="commonadapter/group"/>
-      </component>
-    </collection>
-    <collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
-    	<!-- the collection is really a component. Move down a directory.-->
-      <component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
-        <unit bldFile="akntouchgesturefw/group"/>
-      </component>
-    </collection>
-    <collection id="uiutils" name="UI Utils" level="specific">
-      <component id="localizer" filter="s60" name="Directory Localizer">
-        <unit bldFile="uiutils/localizer/group"/>
-      </component>
-      <component id="findutil" filter="s60" name="Find Utility">
-        <unit bldFile="uiutils/findutil/group"/>
-      </component>
-      <component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
-        <unit bldFile="uiutils/gamerecognizer/group"/>
-      </component>
-      <component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
-        <unit bldFile="uiutils/aknjapanesereading/group"/>
-      </component>
-    </collection>
-    <collection id="commonuisupport" name="Common UI Support" level="support">
-      <component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
-        <unit bldFile="commonuisupport/uikon/group" mrp="commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-      </component>
-      <component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
-        <unit bldFile="commonuisupport/errorresolverdata/group" mrp="commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-      </component>
-      <component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
-        <unit bldFile="commonuisupport/uilaf/GROUP" mrp="commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-      </component>
-      <component id="grid" name="Grid" purpose="optional">
-        <unit bldFile="commonuisupport/grid/group" mrp="commonuisupport/grid/group/app-framework_grid.mrp"/>
-      </component>
-      <component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
-        <unit mrp="commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-      </component>
-    </collection>
-    <collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
-      <component id="cone" name="Control Environment" purpose="mandatory">
-        <unit bldFile="lafagnosticuifoundation/cone/group" mrp="lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-      </component>
-      <component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
-        <unit bldFile="lafagnosticuifoundation/graphicseffects/group" mrp="lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-      </component>
-      <component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
-        <unit bldFile="lafagnosticuifoundation/uigraphicsutils/group" mrp="lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-      </component>
-      <component id="clockanim" name="Clock" purpose="optional" class="plugin">
-        <unit bldFile="lafagnosticuifoundation/clockanim/group" mrp="lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-      </component>
-      <component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
-        <unit bldFile="lafagnosticuifoundation/bmpanimation/group" mrp="lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-      </component>
-      <component id="animation" name="Animation" introduced="9.1" purpose="optional">
-        <unit bldFile="lafagnosticuifoundation/animation/group" mrp="lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-      </component>
-    </collection>
-    <collection id="classicui_info" name="Classic UI Info" level="specific">
-      <component id="classicui_pub" filter="s60" name="Classic UI Public Interfaces" class="api">
-        <unit bldFile="classicui_pub/group"/>
-      </component>
-      <component id="classicui_plat" filter="s60" name="Classic UI Platform Interfaces" class="api">
-        <unit bldFile="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="tsrc/group" name="classicui_tsrc_all"/>
-		<unit bldFile="classicui_plat/aiw_provider_utility_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/aiw_service_interface_base_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/aiw_service_interface_menu_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/alarm_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/application_switching_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/avkon_fonts_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/avkon_ui_server_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/battery_pane_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/custom_cursors_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/eikon_server_extension_client_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/emergency_call_support_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_aiw_criteria_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_animation_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_buttons_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_editors_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_grids_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_indicators_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_initialization_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_input_capabilities_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_lists_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_notes_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_notifiers_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_options_menu_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_setting_pages_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_status_pane_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/extended_utilities_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/find_item_ui_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/generic_parameter_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/global_popup_priority_controller_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/indicator_plugin_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/input_block_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/item_finder_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/japanese_reading_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/key_rotator_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/layout_configuration_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/list_effects_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/long_tap_animation_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/media_shared_document_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/memory_card_ui_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/number_grouping_api/tsrc/group"/>
-		<!--unit bldFile="classicui_plat/personalisation_framework_api/tsrc/group" /-->
-		<unit bldFile="classicui_plat/phone_number_text_utilities_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/pointer_event_modifier_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/popup_form_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/server_application_services_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/signal_pane_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/skinnable_clock_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/special_character_table_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/stylus_activated_popup_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/task_list_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/text_scroller_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/touch_pane_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/transition_effect_parameters_api/tsrc/group"/>
-		<unit bldFile="classicui_plat/transition_effect_utilities_api/tsrc/group"/>
-		<unit bldFile="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="classicui_pub/aiw_criteria_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/aiw_service_handler_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/animation_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/application_framework_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/base_controls_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/buttons_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/choice_list_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/common_file_dialogs_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/context_pane_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/dialog_shutter_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/dialogs_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/editors_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/error_ui_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/fonts_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/form_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/generic_button_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/grids_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/hierarchical_lists_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/hotkeys_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/images_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/indicators_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/info_popup_note_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/information_preview_popup_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/initialization_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/input_frame_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/keylock_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/labels_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/lists_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/misc_controls_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/navigation_pane_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/notes_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/notifiers_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/options_menu_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/popups_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/private_ui_framework_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/queries_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/screen_clearer_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/screen_mode_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/screen_saver_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/scroller_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/searchfield_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/setting_pages_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/slider_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/sounds_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/status_pane_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/stylus_popup_menu_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/tabs_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/title_pane_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/toolbar_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/touch_ui_utilities_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/ui_framework_definitions_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/ui_framework_utilities_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/volume_control_api/tsrc/group"/>
-		<unit bldFile="classicui_pub/window_server_event_observer_api/tsrc/group"/>
-	</component>
-      <component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="classicui" 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" href="classicui_plat/personalisation_framework_api/personalisation_framework_api.metaxml"/>
+    <unit bldFile="classicui_plat/personalisation_framework_api/group" filter="!test"/>
+	<unit bldFile="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" href="classicui_plat/signal_pane_api/signal_pane_api.metaxml"/>
+    <unit bldFile="classicui_plat/signal_pane_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/japanese_reading_api/japanese_reading_api.metaxml"/>
+    <unit bldFile="classicui_plat/japanese_reading_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/global_popup_priority_controller_api/global_popup_priority_controller_api.metaxml"/>
+    <unit bldFile="classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/item_finder_api/item_finder_api.metaxml"/>
+    <unit bldFile="classicui_plat/item_finder_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/avkon_fonts_api/avkon_fonts_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_fonts_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_utilities_api/extended_utilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_utilities_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/personalisation_plugin_api/personalisation_plugin_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/extended_aiw_criteria_api/extended_aiw_criteria_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/personalisation_application_api/personalisation_application_api.metaxml"/>
+    <unit bldFile="classicui_plat/personalisation_application_api/group"/>
+   </component>
+   <component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/volume_popup_api/volume_popup_api.metaxml"/>
+    <unit bldFile="classicui_plat/volume_popup_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/avkon_secondary_display_support_api/avkon_secondary_display_support_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_setting_pages_api/extended_setting_pages_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_lists_api/extended_lists_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_lists_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/input_block_api/input_block_api.metaxml"/>
+    <unit bldFile="classicui_plat/input_block_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/avkon_ui_server_api/avkon_ui_server_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/number_grouping_api/number_grouping_api.metaxml"/>
+    <unit bldFile="classicui_plat/number_grouping_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_status_pane_api/extended_status_pane_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_status_pane_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_notifiers_api/extended_notifiers_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_notifiers_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/task_list_api/task_list_api.metaxml"/>
+    <unit bldFile="classicui_plat/task_list_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/personalisation_slide_show_dialog_api/personalisation_slide_show_dialog_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/key_event_utilities_api/key_event_utilities_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/emergency_call_support_api/emergency_call_support_api.metaxml"/>
+    <unit bldFile="classicui_plat/emergency_call_support_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_dialogs_api/extended_dialogs_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/legacy_ui_framework_headers_api/legacy_ui_framework_headers_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/extended_editors_api/extended_editors_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_editors_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/alarm_api/alarm_api.metaxml"/>
+    <unit bldFile="classicui_plat/alarm_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/aiw_service_interface_base_api/aiw_service_interface_base_api.metaxml"/>
+    <unit bldFile="classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/list_effects_api/list_effects_api.metaxml"/>
+    <unit bldFile="classicui_plat/list_effects_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/find_item_ui_api/find_item_ui_api.metaxml"/>
+    <unit bldFile="classicui_plat/find_item_ui_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/server_application_services_api/server_application_services_api.metaxml"/>
+    <unit bldFile="classicui_plat/server_application_services_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/common_ui_settings_api/common_ui_settings_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/aiw_service_interface_menu_api/aiw_service_interface_menu_api.metaxml"/>
+    <unit bldFile="classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/eikon_server_extension_client_api/eikon_server_extension_client_api.metaxml"/>
+    <unit bldFile="classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/skinnable_clock_api/skinnable_clock_api.metaxml"/>
+    <unit bldFile="classicui_plat/skinnable_clock_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/battery_pane_api/battery_pane_api.metaxml"/>
+    <unit bldFile="classicui_plat/battery_pane_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/fep_document_navigation_api/fep_document_navigation_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/personalisation_localised_texts_api/personalisation_localised_texts_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/memory_card_ui_api/memory_card_ui_api.metaxml"/>
+    <unit bldFile="classicui_plat/memory_card_ui_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/avkon_status_api/avkon_status_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_status_api/group"/>
+   </component>
+   <component id="application_switching_api" name="Application Switching API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/application_switching_api/application_switching_api.metaxml"/>
+    <unit bldFile="classicui_plat/application_switching_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/avkon_localised_texts_api/avkon_localised_texts_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/avkon_secondary_display_api/avkon_secondary_display_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_secondary_display_api/group"/>
+   </component>
+   <component id="extended_animation_api" name="Extended Animation API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_animation_api/extended_animation_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_animation_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_notes_api/extended_notes_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_notes_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/screensaver_animation_plugin_definitions_api/screensaver_animation_plugin_definitions_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/text_scroller_api/text_scroller_api.metaxml"/>
+    <unit bldFile="classicui_plat/text_scroller_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/custom_cursors_api/custom_cursors_api.metaxml"/>
+    <unit bldFile="classicui_plat/custom_cursors_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/screensaver_settings_api/screensaver_settings_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/global_window_priorities_api/global_window_priorities_api.metaxml"/>
+    <unit bldFile="classicui_plat/global_window_priorities_api/group"/>
+   </component>
+   <component id="extended_indicators_api" name="Extended Indicators API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_indicators_api/extended_indicators_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_indicators_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/special_character_table_api/special_character_table_api.metaxml"/>
+    <unit bldFile="classicui_plat/special_character_table_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/avkon_settings_api/avkon_settings_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_settings_api/group"/>
+   </component>
+   <component id="extended_sounds_api" name="Extended Sounds API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_sounds_api/extended_sounds_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_sounds_api/group"/>
+   </component>
+   <component id="themes_settings_api" name="Themes Settings API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/themes_settings_api/themes_settings_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/media_shared_document_api/media_shared_document_api.metaxml"/>
+    <unit bldFile="classicui_plat/media_shared_document_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_queries_api/extended_queries_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/phone_number_text_utilities_api/phone_number_text_utilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/screensaver_runtime_api/screensaver_runtime_api.metaxml"/>
+    <unit bldFile="classicui_plat/screensaver_runtime_api/group"/>
+   </component>
+   <component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_scroller_api/extended_scroller_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_scroller_api/group"/>
+   </component>
+   <component id="key_rotator_api" name="Key Rotator API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/key_rotator_api/key_rotator_api.metaxml"/>
+    <unit bldFile="classicui_plat/key_rotator_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_grids_api/extended_grids_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_grids_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/generic_parameter_api/generic_parameter_api.metaxml"/>
+    <unit bldFile="classicui_plat/generic_parameter_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/indicator_touch_observer_api/indicator_touch_observer_api.metaxml"/>
+    <unit bldFile="classicui_plat/indicator_touch_observer_api/group"/>
+   </component>
+   <component id="popup_form_api" name="Popup Form API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/popup_form_api/popup_form_api.metaxml"/>
+    <unit bldFile="classicui_plat/popup_form_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/stylus_activated_popup_api/stylus_activated_popup_api.metaxml"/>
+    <unit bldFile="classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/indicator_plugin_api/indicator_plugin_api.metaxml"/>
+    <unit bldFile="classicui_plat/indicator_plugin_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/layout_configuration_api/layout_configuration_api.metaxml"/>
+    <unit bldFile="classicui_plat/layout_configuration_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/common_file_dialogs_filter_factory_api/common_file_dialogs_filter_factory_api.metaxml"/>
+    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/avkon_anim_dll_api/avkon_anim_dll_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_anim_dll_api/group"/>
+   </component>
+   <component id="extended_initialization_api" name="Extended Initialization API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/extended_initialization_api/extended_initialization_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_initialization_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/long_tap_animation_api/long_tap_animation_api.metaxml"/>
+    <unit bldFile="classicui_plat/long_tap_animation_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_ui_framework_definitions_api/extended_ui_framework_definitions_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/extended_buttons_api/extended_buttons_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_buttons_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/aiw_provider_utility_api/aiw_provider_utility_api.metaxml"/>
+    <unit bldFile="classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/transition_effect_parameters_api/transition_effect_parameters_api.metaxml"/>
+    <unit bldFile="classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/extended_input_capabilities_api/extended_input_capabilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/uikon_status_api/uikon_status_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/transition_effect_utilities_api/transition_effect_utilities_api.metaxml"/>
+    <unit bldFile="classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/pointer_event_modifier_api/pointer_event_modifier_api.metaxml"/>
+    <unit bldFile="classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/avkon_testability_api/avkon_testability_api.metaxml"/>
+    <unit bldFile="classicui_plat/avkon_testability_api/group"/>
+   </component>
+   <component id="ganes_api" name="ganes_api" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/ganes_api/ganes_api.metaxml"/>
+    <unit bldFile="classicui_plat/ganes_api/group"/>
+   </component>
+   <component id="ode_api" name="Ode API" class="api" filter="s60">
+    <unit bldFile="classicui_plat/ode_api/group"/>
+   </component>
+   <component id="physics_api" name="Physics API" class="api" filter="s60">
+    <unit bldFile="classicui_plat/physics_api/group"/>
+   </component>
+   <component id="touch_pane_api" name="Touch Pane API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/touch_pane_api/touch_pane_api.metaxml"/>
+    <unit bldFile="classicui_plat/touch_pane_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_plat/touch_pane_observer_api/touch_pane_observer_api.metaxml"/>
+    <unit bldFile="classicui_plat/touch_pane_observer_api/group"/>
+   </component>
+   <component id="alternate_fs_api" name="Alternate FS API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_plat/alternate_fs_api/alternate_fs_api.metaxml"/>
+    <unit bldFile="classicui_plat/alternate_fs_api/group"/>
+   </component>
+   <component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
+    <unit bldFile="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" href="classicui_plat/touch_gesture_framework_api/touch_gesture_framework_api.metaxml"/>
+    <unit bldFile="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" href="classicui_plat/extended_options_menu_api/extended_options_menu_api.metaxml"/>
+    <unit bldFile="classicui_plat/extended_options_menu_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/input_frame_api/input_frame_api.metaxml"/>
+    <unit bldFile="classicui_pub/input_frame_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/window_server_event_observer_api/window_server_event_observer_api.metaxml"/>
+    <unit bldFile="classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/application_framework_api/application_framework_api.metaxml"/>
+    <unit bldFile="classicui_pub/application_framework_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/scroller_api/scroller_api.metaxml"/>
+    <unit bldFile="classicui_pub/scroller_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/ui_framework_utilities_api/ui_framework_utilities_api.metaxml"/>
+    <unit bldFile="classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/ui_framework_definitions_api/ui_framework_definitions_api.metaxml"/>
+    <unit bldFile="classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/buttons_api/buttons_api.metaxml"/>
+    <unit bldFile="classicui_pub/buttons_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/queries_api/queries_api.metaxml"/>
+    <unit bldFile="classicui_pub/queries_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/aiw_generic_parameter_api/aiw_generic_parameter_api.metaxml"/>
+    <unit bldFile="classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/editors_api/editors_api.metaxml"/>
+    <unit bldFile="classicui_pub/editors_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/common_file_dialogs_api/common_file_dialogs_api.metaxml"/>
+    <unit bldFile="classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/dialog_shutter_api/dialog_shutter_api.metaxml"/>
+    <unit bldFile="classicui_pub/dialog_shutter_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/fonts_api/fonts_api.metaxml"/>
+    <unit bldFile="classicui_pub/fonts_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/screen_clearer_api/screen_clearer_api.metaxml"/>
+    <unit bldFile="classicui_pub/screen_clearer_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/notifiers_api/notifiers_api.metaxml"/>
+    <unit bldFile="classicui_pub/notifiers_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/notes_api/notes_api.metaxml"/>
+    <unit bldFile="classicui_pub/notes_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/screen_saver_api/screen_saver_api.metaxml"/>
+    <unit bldFile="classicui_pub/screen_saver_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/status_pane_api/status_pane_api.metaxml"/>
+    <unit bldFile="classicui_pub/status_pane_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/base_controls_api/base_controls_api.metaxml"/>
+    <unit bldFile="classicui_pub/base_controls_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/grids_api/grids_api.metaxml"/>
+    <unit bldFile="classicui_pub/grids_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/context_pane_api/context_pane_api.metaxml"/>
+    <unit bldFile="classicui_pub/context_pane_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/lists_api/lists_api.metaxml"/>
+    <unit bldFile="classicui_pub/lists_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/popups_api/popups_api.metaxml"/>
+    <unit bldFile="classicui_pub/popups_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/misc_controls_api/misc_controls_api.metaxml"/>
+    <unit bldFile="classicui_pub/misc_controls_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/keylock_api/keylock_api.metaxml"/>
+    <unit bldFile="classicui_pub/keylock_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/options_menu_api/options_menu_api.metaxml"/>
+    <unit bldFile="classicui_pub/options_menu_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/hierarchical_lists_api/hierarchical_lists_api.metaxml"/>
+    <unit bldFile="classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/navigation_pane_api/navigation_pane_api.metaxml"/>
+    <unit bldFile="classicui_pub/navigation_pane_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/tabs_api/tabs_api.metaxml"/>
+    <unit bldFile="classicui_pub/tabs_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/title_pane_touch_observer_api/title_pane_touch_observer_api.metaxml"/>
+    <unit bldFile="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" href="classicui_pub/choice_list_api/choice_list_api.metaxml"/>
+    <unit bldFile="classicui_pub/choice_list_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/info_popup_note_api/info_popup_note_api.metaxml"/>
+    <unit bldFile="classicui_pub/info_popup_note_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/setting_pages_api/setting_pages_api.metaxml"/>
+    <unit bldFile="classicui_pub/setting_pages_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/screen_mode_api/screen_mode_api.metaxml"/>
+    <unit bldFile="classicui_pub/screen_mode_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/indicators_api/indicators_api.metaxml"/>
+    <unit bldFile="classicui_pub/indicators_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/error_ui_api/error_ui_api.metaxml"/>
+    <unit bldFile="classicui_pub/error_ui_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/animation_api/animation_api.metaxml"/>
+    <unit bldFile="classicui_pub/animation_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/searchfield_api/searchfield_api.metaxml"/>
+    <unit bldFile="classicui_pub/searchfield_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/labels_api/labels_api.metaxml"/>
+    <unit bldFile="classicui_pub/labels_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/hotkeys_api/hotkeys_api.metaxml"/>
+    <unit bldFile="classicui_pub/hotkeys_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/initialization_api/initialization_api.metaxml"/>
+    <unit bldFile="classicui_pub/initialization_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/volume_control_api/volume_control_api.metaxml"/>
+    <unit bldFile="classicui_pub/volume_control_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/title_pane_api/title_pane_api.metaxml"/>
+    <unit bldFile="classicui_pub/title_pane_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/sounds_api/sounds_api.metaxml"/>
+    <unit bldFile="classicui_pub/sounds_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/aiw_service_handler_api/aiw_service_handler_api.metaxml"/>
+    <unit bldFile="classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/aiw_criteria_api/aiw_criteria_api.metaxml"/>
+    <unit bldFile="classicui_pub/aiw_criteria_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/touch_ui_utilities_api/touch_ui_utilities_api.metaxml"/>
+    <unit bldFile="classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/generic_button_api/generic_button_api.metaxml"/>
+    <unit bldFile="classicui_pub/generic_button_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/form_api/form_api.metaxml"/>
+    <unit bldFile="classicui_pub/form_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/uikon_core_controls/uikon_core_controls.metaxml"/>
+    <unit bldFile="classicui_pub/uikon_core_controls/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/calendar_api/calendar_api.metaxml"/>
+    <unit bldFile="classicui_pub/calendar_api/group"/>
+   </component>
+   <component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/toolbar_api/toolbar_api.metaxml"/>
+    <unit bldFile="classicui_pub/toolbar_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/server_application_api/server_application_api.metaxml"/>
+    <unit bldFile="classicui_pub/server_application_api/group"/>
+   </component>
+   <component id="slider_api" name="Slider API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/slider_api/slider_api.metaxml"/>
+    <unit bldFile="classicui_pub/slider_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/private_ui_framework_api/private_ui_framework_api.metaxml"/>
+    <unit bldFile="classicui_pub/private_ui_framework_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/dialogs_api/dialogs_api.metaxml"/>
+    <unit bldFile="classicui_pub/dialogs_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/document_handler_api/document_handler_api.metaxml"/>
+    <unit bldFile="classicui_pub/document_handler_api/group"/>
+   </component>
+   <component id="images_api" name="Images API" class="api" filter="s60">
+    <meta rel="Api" href="classicui_pub/images_api/images_api.metaxml"/>
+    <unit bldFile="classicui_pub/images_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/stylus_popup_menu_api/stylus_popup_menu_api.metaxml"/>
+    <unit bldFile="classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/information_preview_popup_api/information_preview_popup_api.metaxml"/>
+    <unit bldFile="classicui_pub/information_preview_popup_api/group" filter="!test"/>
+    <unit bldFile="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" href="classicui_pub/intermediate_state_api/intermediate_state_api.metaxml"/>
+    <unit bldFile="classicui_pub/intermediate_state_api/group"/>
+   </component>
+   <component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
+    <unit bldFile="classicui_pub/help_launcher_api/group"/>
+   </component>
+  </collection>
+  <collection id="ode" name="Open Dynamics Engine" level="support">
+   <!-- the collection is really a component. Move down a directory.-->
+   <component id="ode_build" filter="s60" name="ODE">
+    <unit bldFile="ode/group"/>
+   </component>
+  </collection>
+  <collection id="uifw" name="UI Framework" level="server">
+   <component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
+    <unit bldFile="uifw/uiklaf/group"/>
+   </component>
+   <component id="eikctl" filter="s60" name="Eikon Controls">
+    <unit bldFile="uifw/eikctl/group"/>
+   </component>
+   <component id="avkon" filter="s60" name="Avkon">
+    <!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+    <unit bldFile="uifw/avkon/aknphysics/group"/>
+    <unit bldFile="uifw/avkon/group"/>
+    <unit bldFile="uifw/avkon/aknconf/group"/>
+   </component>
+   <component id="eikstd" filter="s60" name="Eikon Standard">
+    <unit bldFile="uifw/eikstd/group"/>
+   </component>
+   <component id="aknglobalui" filter="s60" name="Avkon Global UI">
+    <unit bldFile="uifw/aknglobalui/group"/>
+   </component>
+   <component id="ganes" filter="s60" name="Ganes">
+    <unit bldFile="uifw/ganes/group"/>
+   </component>
+  </collection>
+  <collection id="commonuis" name="Common UIs" level="specific">
+   <component id="commonui" filter="s60" name="Common UI">
+    <unit bldFile="commonuis/commonui/group"/>
+   </component>
+   <component id="commondialogs" filter="s60" name="Common Dialogs">
+    <unit bldFile="commonuis/commondialogs/group"/>
+   </component>
+  </collection>
+  <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
+   <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
+    <unit bldFile="applicationinterworkingfw/servicehandler/group"/>
+   </component>
+  </collection>
+  <collection id="psln" name="Personalization" level="specific">
+   <!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+   <component id="psln_build" filter="s60" name="Personalization Build">
+    <unit bldFile="psln/group"/>
+   </component>
+  </collection>
+  <collection id="commonadapter" name="Common Adapter" level="support">
+   <!-- the collection is really a component. Move down a directory.-->
+   <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
+    <unit bldFile="commonadapter/group"/>
+   </component>
+  </collection>
+  <collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
+   <!-- the collection is really a component. Move down a directory.-->
+   <component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
+    <unit bldFile="akntouchgesturefw/group"/>
+   </component>
+  </collection>
+  <collection id="uiutils" name="UI Utils" level="specific">
+   <component id="localizer" filter="s60" name="Directory Localizer">
+    <unit bldFile="uiutils/localizer/group"/>
+   </component>
+   <component id="findutil" filter="s60" name="Find Utility">
+    <unit bldFile="uiutils/findutil/group"/>
+   </component>
+   <component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
+    <unit bldFile="uiutils/gamerecognizer/group"/>
+   </component>
+   <component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
+    <unit bldFile="uiutils/aknjapanesereading/group"/>
+   </component>
+  </collection>
+  <collection id="commonuisupport" name="Common UI Support" level="support">
+   <component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
+    <unit bldFile="commonuisupport/uikon/group" mrp="commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+   </component>
+   <component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
+    <unit bldFile="commonuisupport/errorresolverdata/group" mrp="commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+   </component>
+   <component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+    <unit bldFile="commonuisupport/uilaf/GROUP" mrp="commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+   </component>
+   <component id="grid" name="Grid" purpose="optional">
+    <unit bldFile="commonuisupport/grid/group" mrp="commonuisupport/grid/group/app-framework_grid.mrp"/>
+   </component>
+   <component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
+    <unit mrp="commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+   </component>
+  </collection>
+  <collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
+   <component id="cone" name="Control Environment" purpose="mandatory">
+    <unit bldFile="lafagnosticuifoundation/cone/group" mrp="lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+   </component>
+   <component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
+    <unit bldFile="lafagnosticuifoundation/graphicseffects/group" mrp="lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+   </component>
+   <component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
+    <unit bldFile="lafagnosticuifoundation/uigraphicsutils/group" mrp="lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+   </component>
+   <component id="clockanim" name="Clock" purpose="optional" class="plugin">
+    <unit bldFile="lafagnosticuifoundation/clockanim/group" mrp="lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+   </component>
+   <component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
+    <unit bldFile="lafagnosticuifoundation/bmpanimation/group" mrp="lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+   </component>
+   <component id="animation" name="Animation" introduced="9.1" purpose="optional">
+    <unit bldFile="lafagnosticuifoundation/animation/group" mrp="lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+   </component>
+  </collection>
+  <collection id="classicui_info" name="Classic UI Info" level="specific">
+   <!-- 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="tsrc/group"/>
+   </component>
+   <component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/dlnasrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -78,6 +78,32 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
@@ -236,9 +262,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="/sf/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="/sf/mw/dlnasrv/group"/>

--- a/symbian3/mw/dlnasrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/dlnasrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,207 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="dlnasrv" 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="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="upnpavcontrolpoint/avcontrolframework/group"/>
-      </component>
-      <component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
-      	<!-- put exports in other component instead -->
-        <unit bldFile="upnpavcontrolpoint/group"/>
-      </component>
-    </collection>
-    <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
-      <component id="avobjects" filter="s60" name="A/V Objects">
-        <unit bldFile="upnpmediaserver/avobjects/group"/>
-      </component>
-      <component id="mediaserverclient" filter="s60" name="Media Server Client">
-        <unit bldFile="upnpmediaserver/mediaserverclient/group"/>
-      </component>
-      <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
-        <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
-      </component>
-      <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
-        <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
-      </component>
-      <component id="mediaserverengine" filter="s60" name="Media Server Engine">
-        <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
-      </component>
-      <component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
-		<!-- move exports into one of above components -->
-        <unit bldFile="upnpmediaserver/group"/>
-      </component>
-    </collection>
-    <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
-      <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
-        <unit bldFile="upnpavcontroller/upnpxmlparser/group"/>
-      </component>
-      <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
-        <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
-      </component>
-      <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
-        <unit bldFile="upnpavcontroller/upnpavcontrollerclient/group"/>
-      </component>
-      <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
-        <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
-      </component>
-      <component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
-		<!-- move exports content into one of above components -->
-        <unit bldFile="upnpavcontroller/group"/>
-      </component>
-    </collection>
-    <collection id="upnpframework" name="UPnP Framework" level="framework">
-      <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
-        <unit bldFile="upnpframework/upnputilities/group"/>
-      </component>
-      <component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>      
-        <!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
-      </component>
-      <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>      
-        <!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
-      </component>
-      <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>      
-        <!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
-      </component>
-      <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>      
-        <!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
-      </component>
-      <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>      
-        <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
-      </component>
-      <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
-        <unit bldFile="upnpframework/upnpmusicadapter/group"/>
-      </component>
-      <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
-        <unit bldFile="upnpframework/upnpcommand/group"/>
-      </component>
-      <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
-		<!-- move exports content into one of above components -->
-        <unit bldFile="upnpframework/group"/>
-      </component>
-    </collection>
-    <collection id="upnpsettings" name="UPnP Settings" level="framework">
-      <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
-        <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
-      </component>
-      <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>      
-        <!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
-      </component>
-      <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>      
-        <!--<unit bldFile="upnpsettings/appwizard/group"/>-->
-      </component>
-      <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>      
-        <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
-      </component>
-      <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
-        <unit bldFile="upnpsettings/upnpgsplugin/group"/>
-      </component>
-      <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
-		<!-- move exports content into one of above components -->
-        <unit bldFile="upnpsettings/group"/>
-      </component>
-    </collection>
-    <collection id="upnpsharing" name="UPnP Sharing" level="server">
-      <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
-        <unit bldFile="upnpsharing/upnpdlnaprofiler/group"/>
-      </component>
-      <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
-        <unit bldFile="upnpsharing/upnpsecurity/group"/>
-      </component>
-      <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
-        <unit bldFile="upnpsharing/upnpcontentserver/group"/>
-      </component>
-      <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
-        <unit bldFile="upnpsharing/applicationengine/group"/>
-      </component>
-      <component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
-		<!-- move exports content into one of above components -->
-        <unit bldFile="upnpsharing/group"/>
-      </component>
-    </collection>
-    <collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
-      <component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
-        <unit bldFile="upnpmpxplugins/upnpplaybackplugins/group"/>
-      </component>
-      <component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
-		<!-- move exports content into other component? -->
-        <unit bldFile="upnpmpxplugins/group"/>
-      </component>
-    </collection>
-    <collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>          
-      <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
-		<!-- need to merge or #include these to a single bld.inf -->
-        <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+ <package id="dlnasrv" 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" href="dlnasrv_plat/upnp_media_server_settings_api/upnp_media_server_settings_api.metaxml"/>
+    <unit bldFile="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" href="dlnasrv_plat/upnp_av_objects_api/upnp_av_objects_api.metaxml"/>
+    <unit bldFile="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" href="dlnasrv_plat/upnp_media_server_api/upnp_media_server_api.metaxml"/>
+    <unit bldFile="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" href="dlnasrv_plat/upnp_security_plugin_api/upnp_security_plugin_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_security_plugin_api/group"/>
+   </component>
+   <component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_avcp_api/upnp_avcp_api.metaxml"/>
+    <unit bldFile="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" href="dlnasrv_plat/upnp_media_server_metadata_api/upnp_media_server_metadata_api.metaxml"/>
+    <unit bldFile="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" href="dlnasrv_plat/upnp_command_api/upnp_command_api.metaxml"/>
+    <unit bldFile="dlnasrv_plat/upnp_command_api/group"/>
+   </component>
+   <component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="dlnasrv_plat/upnp_plugin_api/upnp_plugin_api.metaxml"/>
+    <unit bldFile="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="upnpavcontrolpoint/avcontrolframework/group"/>
+   </component>
+   <component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+    <!-- put exports in other component instead -->
+    <unit bldFile="upnpavcontrolpoint/group"/>
+   </component>
+  </collection>
+  <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+   <component id="avobjects" filter="s60" name="A/V Objects">
+    <unit bldFile="upnpmediaserver/avobjects/group"/>
+   </component>
+   <component id="mediaserverclient" filter="s60" name="Media Server Client">
+    <unit bldFile="upnpmediaserver/mediaserverclient/group"/>
+   </component>
+   <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+    <unit bldFile="upnpmediaserver/connectionmanagerservice/group"/>
+   </component>
+   <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+    <unit bldFile="upnpmediaserver/contentdirectoryservice/group"/>
+   </component>
+   <component id="mediaserverengine" filter="s60" name="Media Server Engine">
+    <unit bldFile="upnpmediaserver/mediaserverengine/group"/>
+   </component>
+   <component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
+    <!-- move exports into one of above components -->
+    <unit bldFile="upnpmediaserver/group"/>
+   </component>
+  </collection>
+  <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
+   <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpxmlparser/group"/>
+   </component>
+   <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpavcontrollerserver/group"/>
+   </component>
+   <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpavcontrollerclient/group"/>
+   </component>
+   <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
+    <unit bldFile="upnpavcontroller/upnpavcontrollerhelper/group"/>
+   </component>
+   <component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
+    <!-- move exports content into one of above components -->
+    <unit bldFile="upnpavcontroller/group"/>
+   </component>
+  </collection>
+  <collection id="upnpframework" name="UPnP Framework" level="framework">
+   <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+    <unit bldFile="upnpframework/upnputilities/group"/>
+   </component>
+   <component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+   </component>
+   <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+   </component>
+   <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+   </component>
+   <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+   </component>
+   <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+   </component>
+   <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
+    <unit bldFile="upnpframework/upnpmusicadapter/group"/>
+   </component>
+   <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+    <unit bldFile="upnpframework/upnpcommand/group"/>
+   </component>
+   <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
+    <!-- move exports content into one of above components -->
+    <unit bldFile="upnpframework/group"/>
+   </component>
+  </collection>
+  <collection id="upnpsettings" name="UPnP Settings" level="framework">
+   <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
+    <unit bldFile="upnpsettings/upnpsettingsengine/group"/>
+   </component>
+   <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+   </component>
+   <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+   </component>
+   <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
+    <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+   </component>
+   <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+    <unit bldFile="upnpsettings/upnpgsplugin/group"/>
+   </component>
+   <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
+    <!-- move exports content into one of above components -->
+    <unit bldFile="upnpsettings/group"/>
+   </component>
+  </collection>
+  <collection id="upnpsharing" name="UPnP Sharing" level="server">
+   <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+    <unit bldFile="upnpsharing/upnpdlnaprofiler/group"/>
+   </component>
+   <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
+    <unit bldFile="upnpsharing/upnpsecurity/group"/>
+   </component>
+   <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+    <unit bldFile="upnpsharing/upnpcontentserver/group"/>
+   </component>
+   <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
+    <unit bldFile="upnpsharing/applicationengine/group"/>
+   </component>
+   <component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
+    <!-- move exports content into one of above components -->
+    <unit bldFile="upnpsharing/group"/>
+   </component>
+  </collection>
+  <collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
+   <component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
+    <unit bldFile="upnpmpxplugins/upnpplaybackplugins/group"/>
+   </component>
+   <component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
+    <!-- move exports content into other component? -->
+    <unit bldFile="upnpmpxplugins/group"/>
+   </component>
+  </collection>
+  <collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
+   <meta rel="config">
+    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+   </meta>
+   <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+    <!-- need to merge or #include these to a single bld.inf -->
+    <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
         <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-      </component>
-      <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
-       <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-      </component>
-      <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-        <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-      </component>
-      <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
-		<!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-        <!--<unit bldFile="upnpharvester/group"/>-->
-      </component>
-    </collection>
-    <collection id="homesync" name="Home Sync" level="plugin">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>              
-      <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
+   </component>
+   <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
+    <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+   </component>
+   <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+    <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+   </component>
+   <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+    <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+    <!--<unit bldFile="upnpharvester/group"/>-->
+   </component>
+  </collection>
+  <collection id="homesync" name="Home Sync" level="plugin">
+   <meta rel="config">
+    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+   </meta>
+   <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
         <!-- <unit bldFile="homesync/group"/>-->  <!-- move bld.inf into contentmanager dir -->
-      </component>
-    </collection>
-    <collection id="homemedia" name="Home Media" level="framework">
-      	<meta rel="config">
-      		<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-      	</meta>
-      	<!-- collection is really just a component. Move down a directory -->
-      <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
-        <!-- <unit bldFile="homemedia/group"/> -->
-      </component>
-    </collection>
-    <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
-      <component id="dlnasrv_plat" filter="s60" name="DLNA Services Platform Interfaces" class="api">
-        <unit bldFile="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="group"/>
-      </component>
-	  <component id="dlnasrv_api_test" filter="s60,test,api_test" name="DLNA Services API Tests" purpose="development">
-        <unit bldFile="tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+   </component>
+  </collection>
+  <collection id="homemedia" name="Home Media" level="framework">
+   <meta rel="config">
+    <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+   </meta>
+   <!-- collection is really just a component. Move down a directory -->
+   <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
+    <!-- <unit bldFile="homemedia/group"/> -->
+   </component>
+  </collection>
+  <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
+   <component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+    <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
+    <unit bldFile="group"/>
+   </component>
+   <component id="dlnasrv_api_test" filter="s60,test,api_test" name="DLNA Services API Tests" purpose="development">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/drm/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/drm/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,61 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/drm/drm_plat/roap_api/group"/>
+          </component>
+          <component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -122,12 +177,6 @@
           </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="/sf/mw/drm/drm_pub/group"/>
-          </component>
-          <component name="drm_plat" filter="s60" long-name="DRM Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/drm/drm_plat/group"/>
-          </component>
           <component name="drm_api_test" filter="s60,test,api_test" long-name="DRM Build" purpose="development">
             <unit bldFile="/sf/mw/drm/tsrc/group"/>
           </component>

--- a/symbian3/mw/drm/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/drm/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,63 +1,135 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="drm" name="DRM" levels="plugin framework server generic specific">
-    <collection id="commondrm" name="Common DRM" level="generic">
-    	<!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-      <component id="drmencryptor" filter="s60" name="DRM Encryptor">
-		<!-- this should have its own bld.inf or be removed as a component -->
-      </component>
-      <component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
-		<!-- this should have its own bld.inf or be removed as a component -->
-      </component>
-      <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
-        <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
-      </component>
-      <component id="drmutility" filter="s60" name="DRM Utility">
-      	<meta rel="config">
-      		<defined condition="RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM"/>
-      	</meta>      
-		<!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
-        <!--<unit bldFile="commondrm/drmutility/group"/>-->
-      </component>
-      <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
-        <unit bldFile="commondrm/drmserviceapiwrapper/group"/>
-      </component>
-      <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
-        <unit bldFile="commondrm/drmrightsstoringlocation/group"/>
-      </component>
-      <component id="commondrm_build" filter="s60" name="Common DRM Build">
-		<!-- should be split into the above files, or them collapsed into a single component -->
-        <unit bldFile="commondrm/group"/>
-      </component>
-    </collection>
-    <collection id="omadrm" name="OMA DRM" level="server">
-    	<!-- collection is really a component. Move down a directory -->
-      <component id="omadrm_build" filter="s60" name="OMA DRM Build">
-        <unit bldFile="omadrm/group"/>
-      </component>
-      <component id="rndcerts" filter="s60,test" name="R&amp;D Certificates">
-        <unit bldFile="omadrm/rndcerts/group"/>
-      </component>
-      <component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
-        <unit bldFile="omadrm/foundationcerts/group"/>
-      </component>
-    </collection>
-    <collection id="wmdrm" name="Windows Media DRM" level="framework">
-    	<!-- collection is really a component. Move down a directory -->
-      <component id="wmdrm_build" filter="s60" name="WM DRM Build">
-        <unit bldFile="wmdrm/group"/>
-      </component>
-    </collection>
-    <collection id="drm_info" name="DRM Info" level="specific">
-      <component id="drm_pub" filter="s60" name="DRM Public Interfaces" class="api">
-        <unit bldFile="drm_pub/group"/>
-      </component>
-      <component id="drm_plat" filter="s60" name="DRM Platform Interfaces" class="api">
-        <unit bldFile="drm_plat/group"/>
-      </component>
-      <component id="drm_api_test" filter="s60,test,api_test" name="DRM Build" purpose="development">
-        <unit bldFile="tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="drm" 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" href="drm_plat/roap_api/roap_api.metaxml"/>
+    <unit bldFile="drm_plat/roap_api/group"/>
+   </component>
+   <component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_common_api/drm_common_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_common_api/group"/>
+   </component>
+   <component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_rights_api/drm_rights_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_rights_api/group"/>
+   </component>
+   <component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_legacy_api/drm_legacy_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_legacy_api/group"/>
+   </component>
+   <component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/dcf_repository_api/dcf_repository_api.metaxml"/>
+    <unit bldFile="drm_plat/dcf_repository_api/group"/>
+   </component>
+   <component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_service_api/drm_service_api.metaxml"/>
+    <unit bldFile="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" href="drm_plat/drm_secondary_display_api/drm_secondary_display_api.metaxml"/>
+    <unit bldFile="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" href="drm_plat/drm_license_manager_api/drm_license_manager_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_license_manager_api/group"/>
+   </component>
+   <component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_utility_api/drm_utility_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_utility_api/group"/>
+   </component>
+   <component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/drm_agents_api/drm_agents_api.metaxml"/>
+    <unit bldFile="drm_plat/drm_agents_api/group"/>
+   </component>
+   <component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/wmdrm_core_api/wmdrm_core_api.metaxml"/>
+    <unit bldFile="drm_plat/wmdrm_core_api/group"/>
+   </component>
+   <component id="wmdrm_access_api" name="WMDRM Access API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/wmdrm_access_api/wmdrm_access_api.metaxml"/>
+    <unit bldFile="drm_plat/wmdrm_access_api/group"/>
+   </component>
+   <component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/camese_utility_api/camese_utility_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="__WINDOWS_MEDIA_DRM"/>
+    </meta>
+    <unit bldFile="drm_plat/camese_utility_api/group"/>
+   </component>
+   <component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
+    <meta rel="Api" href="drm_plat/camese_framework_api/camese_framework_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="__WINDOWS_MEDIA_DRM"/>
+    </meta>
+    <unit bldFile="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" href="drm_pub/drm_helper_api/drm_helper_api.metaxml"/>
+    <unit bldFile="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" href="drm_pub/oma_drm_caf_agent_api/oma_drm_caf_agent_api.metaxml"/>
+    <unit bldFile="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" href="drm_pub/drm_license_checker_api/drm_license_checker_api.metaxml"/>
+    <unit bldFile="drm_pub/drm_license_checker_api/group"/>
+   </component>
+  </collection>
+  <collection id="commondrm" name="Common DRM" level="generic">
+   <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+   <component id="drmencryptor" filter="s60" name="DRM Encryptor">
+    <!-- this should have its own bld.inf or be removed as a component -->
+   </component>
+   <component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
+    <!-- this should have its own bld.inf or be removed as a component -->
+   </component>
+   <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
+    <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
+   </component>
+   <component id="drmutility" filter="s60" name="DRM Utility">
+    <meta rel="config">
+     <defined condition="RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM"/>
+    </meta>
+    <!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
+    <!--<unit bldFile="commondrm/drmutility/group"/>-->
+   </component>
+   <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
+    <unit bldFile="commondrm/drmserviceapiwrapper/group"/>
+   </component>
+   <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
+    <unit bldFile="commondrm/drmrightsstoringlocation/group"/>
+   </component>
+   <component id="commondrm_build" filter="s60" name="Common DRM Build">
+    <!-- should be split into the above files, or them collapsed into a single component -->
+    <unit bldFile="commondrm/group"/>
+   </component>
+  </collection>
+  <collection id="omadrm" name="OMA DRM" level="server">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="omadrm_build" filter="s60" name="OMA DRM Build">
+    <unit bldFile="omadrm/group"/>
+   </component>
+   <component id="rndcerts" filter="s60,test" name="R&amp;D Certificates">
+    <unit bldFile="omadrm/rndcerts/group"/>
+   </component>
+   <component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
+    <unit bldFile="omadrm/foundationcerts/group"/>
+   </component>
+  </collection>
+  <collection id="wmdrm" name="Windows Media DRM" level="framework">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="wmdrm_build" filter="s60" name="WM DRM Build">
+    <unit bldFile="wmdrm/group"/>
+   </component>
+  </collection>
+  <collection id="drm_info" name="DRM Info" level="specific">
+   <component id="drm_api_test" filter="s60,test,api_test" name="DRM Build" purpose="development">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/gsprofilesrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/gsprofilesrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,43 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
+          </component>
+          <component name="filelist_api" long-name="File List API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/gsprofilesrv/gssettingsuis/gs/group"/>
@@ -96,14 +133,6 @@
             <unit bldFile="/sf/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="/sf/mw/gsprofilesrv/gsprofilesrv_plat/group"/>
-          </component>
-          <component name="gsprofilesrv_pub" filter="s60" long-name="GS and Profiles Services Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_pub/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/gsprofilesrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/gsprofilesrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,32 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="gsprofilesrv" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
-    <collection id="gssettingsuis" name="General Settings UIs" level="framework">
-      <component id="gs" filter="s60" name="General Settings" introduced="9.2">
-        <unit bldFile="gssettingsuis/gs/group"/>
-      </component>
-    </collection>
-    <collection id="profilesservices" name="Profiles Services" level="server">
-      <component id="filelist" filter="s60" name="File List" introduced="9.1">
-        <unit bldFile="profilesservices/filelist/group"/>
-      </component>
-      <component id="mediafilelist" filter="s60" name="Media File List" introduced="^2">
-        <unit bldFile="profilesservices/mediafilelist/group"/>
-      </component>
-      <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
-        <unit bldFile="profilesservices/profileengine/group"/>
-      </component>
-      <component id="ringingtone3dplugin" filter="s60" name="Ringing Tone 3D Plugin" class="plugin" introduced="^2">
-        <unit bldFile="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="gsprofilesrv_plat/group"/>
-      </component>
-      <component id="gsprofilesrv_pub" filter="s60" name="GS and Profiles Services Public Interfaces" class="api">
-        <unit bldFile="gsprofilesrv_pub/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="gsprofilesrv" 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" href="gsprofilesrv_pub/profiles_engine_active_profile_settings_api/profiles_engine_active_profile_settings_api.metaxml"/>
+    <unit bldFile="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" href="gsprofilesrv_pub/profiles_engine_wrapper_api/profiles_engine_wrapper_api.metaxml"/>
+    <unit bldFile="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" href="gsprofilesrv_plat/profiles_engine_api/profiles_engine_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/profiles_engine_api/group"/>
+   </component>
+   <component id="profiles_mediafilelist_api" name="Media File List API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/profiles_mediafilelist_api/profiles_mediafilelist_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
+   </component>
+   <component id="filelist_api" name="File List API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/filelist_api/filelist_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/filelist_api/group"/>
+   </component>
+   <component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_backgroundimage_api/settings_backgroundimage_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+   </component>
+   <component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_framework_api/settings_framework_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_framework_api/group"/>
+   </component>
+   <component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_launch_api/settings_launch_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_launch_api/group"/>
+   </component>
+   <component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_listbox_api/settings_listbox_api.metaxml"/>
+    <unit bldFile="gsprofilesrv_plat/settings_listbox_api/group"/>
+   </component>
+   <component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="gsprofilesrv_plat/settings_plugin_api/settings_plugin_api.metaxml"/>
+    <unit bldFile="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" href="gsprofilesrv_plat/settings_uis_cenrep_collection_api/settings_uis_cenrep_collection_api.metaxml"/>
+    <unit bldFile="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="gssettingsuis/gs/group"/>
+   </component>
+  </collection>
+  <collection id="profilesservices" name="Profiles Services" level="server">
+   <component id="filelist" filter="s60" name="File List" introduced="9.1">
+    <unit bldFile="profilesservices/filelist/group"/>
+   </component>
+   <component id="mediafilelist" filter="s60" name="Media File List" introduced="^2">
+    <unit bldFile="profilesservices/mediafilelist/group"/>
+   </component>
+   <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
+    <unit bldFile="profilesservices/profileengine/group"/>
+   </component>
+   <component id="ringingtone3dplugin" filter="s60" name="Ringing Tone 3D Plugin" class="plugin" introduced="^2">
+    <unit bldFile="profilesservices/ringingtone3dplugin/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/hapticsservices/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/hapticsservices/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,22 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -105,14 +121,6 @@
             <unit bldFile="/sf/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="/sf/mw/hapticsservices/hapticsservices_pub/group"/>
-          </component>
-          <component name="hapticsservices_plat" filter="s60" long-name="Haptics Services Platform Interfaces" introduced="^1" class="api">
-            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/hapticsservices/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/hapticsservices/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,41 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="hapticsservices" name="Haptics Services" levels="fw server api">
-    <collection id="tacticonserver" name="Tacticon Server" level="server">
-    <!-- collection is really a component. Move down a directory  -->
-      <component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
-        <unit bldFile="tacticonserver/group"/>
-        <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
-      </component>
-    </collection>
-    <collection id="tactilefeedback" name="Tactile Feedback" level="fw">
-      <component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
-        <unit bldFile="tactilefeedback/tactilearearegistry/group"/>
-      </component>
-      <component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
-        <unit bldFile="tactilefeedback/tactilefeedbackresolver/group"/>
-      </component>
-      <component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
-        <unit bldFile="tactilefeedback/tactileclickplugin/group"/>
-      </component>      
-      <component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
-        <unit bldFile="tactilefeedback/tactilefeedbackclient/group"/>
-      </component>
-      <component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
-        <unit bldFile="tactilefeedback/tactileactionplugin/group"/>
-      </component>      
-      <component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
-		<!-- consider moving IBY to one fo the above components -->
-        <unit bldFile="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="hapticsservices_pub/group"/>
-      </component>
-      <component id="hapticsservices_plat" filter="s60" name="Haptics Services Platform Interfaces" class="api" introduced="^1">
-        <unit bldFile="hapticsservices_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="hapticsservices" 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" href="hapticsservices_plat/tacticon_api/tacticon_api.metaxml"/>
+    <unit bldFile="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" href="hapticsservices_plat/tactile_feedback_core_api/tactile_feedback_core_api.metaxml"/>
+    <unit bldFile="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" href="hapticsservices_plat/tactile_feedback_server_api/tactile_feedback_server_api.metaxml"/>
+    <unit bldFile="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" href="hapticsservices_pub/tactile_feedback_client_api/tactile_feedback_client_api.metaxml"/>
+    <unit bldFile="hapticsservices_pub/tactile_feedback_client_api/group"/>
+   </component>
+  </collection>
+  <collection id="tacticonserver" name="Tacticon Server" level="server">
+   <!-- collection is really a component. Move down a directory  -->
+   <component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
+    <unit bldFile="tacticonserver/group"/>
+    <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+   </component>
+  </collection>
+  <collection id="tactilefeedback" name="Tactile Feedback" level="fw">
+   <component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
+    <unit bldFile="tactilefeedback/tactilearearegistry/group"/>
+   </component>
+   <component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
+    <unit bldFile="tactilefeedback/tactilefeedbackresolver/group"/>
+   </component>
+   <component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
+    <unit bldFile="tactilefeedback/tactileclickplugin/group"/>
+   </component>
+   <component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
+    <unit bldFile="tactilefeedback/tactilefeedbackclient/group"/>
+   </component>
+   <component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
+    <unit bldFile="tactilefeedback/tactileactionplugin/group"/>
+   </component>
+   <component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
+    <!-- consider moving IBY to one fo the above components -->
+    <unit bldFile="tactilefeedback/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/homescreensrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/homescreensrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,80 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/internal/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+          </component>
+          <component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
+          </component>
+          <component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
+          </component>
+          <component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
+          </component>
+          <component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
+          </component>
+          <component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -192,20 +266,6 @@
             <unit bldFile="/sf/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="/sf/mw/homescreensrv/homescreensrv_plat/group"/>
-          </component>
-          <component name="homescreensrv_api_tests" filter="s60,test,api_test" long-name="Home Screen Services Platform API Tests" purpose="developement">
-            <!--  split into components or #include from common bld.inf -->
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/internal/tsrc/group"/>
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/tsrc/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/homescreensrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/homescreensrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,143 +1,221 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
-    <collection id="xcfw" name="XML Content Framework" level="framework">
-   		<!-- collection is really a component, needs to be moved down a directory -->
-      <component id="xcfw_build" filter="s60" name="XML Content Framework Build">
-        <unit bldFile="xcfw/group"/>
-      </component>
-    </collection>
-    <collection id="homescreenpluginsrv" name="Home Screen Plugin Service" level="plugin">
-      <component id="hspsdefinitionengine" filter="s60" name="HS Plugin Service Definition Engine">
-        <!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
-      </component>
-      <component id="hspsdom" filter="s60" name="HS Plugin Service DOM">
-        <!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
-      </component>
-      <component id="hspstools" filter="s60" name="HS Server Tools">
-      	<meta rel="config">
-      		<defined condition="____HSPS_CFG_LOG_ON____"/>
-      	</meta>
-        <!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
-      </component>
-      <component id="hspspluginregistry" filter="s60" name="HS Plugin Registry">
-        <!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
-      </component>
-      <component id="hspsmanager" filter="s60" name="HSPS Manager">
-        <!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
-      </component>
-      <component id="hspsodt" filter="s60" name="HSPS Object Description Tree">
-        <!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
-      </component>
-      <component id="hspsresource" filter="s60" name="HS Plugin Server Resource">
-        <!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
-      </component>
-      <component id="hspsresult" filter="s60" name="HS Plugin Server Result">
-        <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-      </component>
-      <component id="homescreen_settings_api" filter="s60" name="HS Settings API" class="api">
-        <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
-      </component>
-      <component id="homescreenpluginsrv_build" filter="s60" name="HSPS Build">
-      	<!-- need to break this up into the self-contained components above and uncomment them -->
-        <unit bldFile="homescreenpluginsrv/group"/>
-      </component>
-    </collection>
-    <collection id="idlefw" name="Idle Framework" level="framework">
-      	<meta rel="config">
-      		<defined condition="RD_CUSTOMIZABLE_AI"/>
-      	</meta>
-		<!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
-      <component id="idlefw_plugins" filter="s60" name="Idle Framework Plugins" class="plugin">
-        <!--<unit bldFile="idlefw/plugins/group"/>-->
-      </component>
-      <component id="hslaunch" filter="s60" name="Home Screen Launch">
-        <!--<unit bldFile="idlefw/plugins/group"/>-->
-      </component>
-      <component id="idlefw_build" filter="s60" name="Idle Framework Build">
-      	<!--split this into components, or separate from the above components and move this down a directory -->
-        <unit bldFile="idlefw/group"/>
-      </component>
-    </collection>
-    <collection id="menucontentsrv" name="Menu Content Service" level="generic">
-      <component id="menusatinterface" filter="s60" name="Menu SAT Interface">
-        <unit bldFile="menucontentsrv/menusatinterface/group"/>
-      </component>
-      <component id="menucontentsrv_build" filter="s60" name="Menu Content Service Build">
-      	<!--split this into components, or separate from the above component and move this down a directory -->
-        <unit bldFile="menucontentsrv/group"/>
-      </component>
-    </collection>
-    <collection id="backsteppingsrv" name="Back Stepping Service" level="server">
-   		<!-- collection is really a component, needs to be moved down a directory -->
-      <component id="bsengine" name="Back Stepping Engine" filter="s60">
-        <unit bldFile="backsteppingsrv/group"/>
-      </component>
-    </collection>
-    <collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
-      <component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
-         <!-- need to move this component outside of contentpublishingutils and into separate component directory -->
-      	<meta rel="config">
-      		<defined condition="CONTENT_PUBLISHER_DEBUG"/>
-      	</meta>
-        <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
-      </component>
-      <component id="contentpublishingutils" filter="s60" name="Content Publishing Utils">
-        <unit bldFile="contentpublishingsrv/contentpublishingutils/group"/>
-      </component>
-      <component id="contentpublishingserver" filter="s60" name="Content Publishing Server">
-        <unit bldFile="contentpublishingsrv/contentpublishingserver/group"/>
-      </component>
-      <component id="contentharvester" filter="s60" name="Content Harvester">
-        <unit bldFile="contentpublishingsrv/contentharvester/group"/>
-      </component>
-      <component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
-      	<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+ <package id="homescreensrv" 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" href="homescreensrv_plat/ai_content_model_api/ai_content_model_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/ai_content_model_api/group"/>
+   </component>
+   <component id="ai_utilities_api" name="AI Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/ai_utilities_api/ai_utilities_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
+    <unit bldFile="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" href="homescreensrv_plat/ai_plugin_management_api/ai_plugin_management_api.metaxml"/>
+    <unit bldFile="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" href="homescreensrv_plat/ai_plugin_information_api/ai_plugin_information_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/ai_plugin_information_api/group"/>
+   </component>
+   <component id="ai_variation_api" name="AI Variation API" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/ai_variation_api/ai_variation_api.metaxml"/>
+    <unit bldFile="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" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
+    <unit bldFile="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" href="homescreensrv_plat/content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
+    <unit bldFile="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" href="homescreensrv_plat/menu_model_api/menu_model_api.metaxml"/>
+    <unit bldFile="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" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
+    <unit bldFile="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" href="homescreensrv_plat/external_home_screen_api/external_home_screen_api.metaxml"/>
+    <unit bldFile="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" href="homescreensrv_plat/menu_content_service_api/menu_content_service_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
+    <unit bldFile="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" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
+    <unit bldFile="homescreensrv_plat/sapi_contentpublishing/group"/>
+   </component>
+   <component id="sapi_backstepping" name="SAPI Backstepping" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/sapi_backstepping/sapi_backstepping.metaxml"/>
+    <unit bldFile="homescreensrv_plat/sapi_backstepping/group"/>
+   </component>
+   <component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
+    <unit bldFile="homescreensrv_plat/sapi_actionhandler/group"/>
+   </component>
+   <component id="sapi_homescreenplugin" name="SAPI Homescreen Plugin" class="api" filter="s60">
+    <unit bldFile="homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
+    <unit bldFile="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" href="homescreensrv_plat/sapi_menucontent/sapi_menucontent.metaxml"/>
+    <unit bldFile="homescreensrv_plat/sapi_menucontent/group"/>
+   </component>
+   <component id="xcfw_api" name="XCFW API" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/xcfw_api/xcfw_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/xcfw_api/group"/>
+   </component>
+   <component id="idlefw_api" name="Idle Framework API" class="api" filter="s60">
+    <unit bldFile="homescreensrv_plat/idlefw_api/group"/>
+   </component>
+   <component id="hs_widget_publisher_api" name="Home Screen Publishing API" class="api" filter="s60">
+    <meta rel="Api" href="homescreensrv_plat/hs_widget_publisher_api/hs_widget_publisher_api.metaxml"/>
+    <unit bldFile="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" href="homescreensrv_plat/context_utility_api/ui_context_utility_api.metaxml"/>
+    <unit bldFile="homescreensrv_plat/context_utility_api/group"/>
+   </component>
+   <component id="hs_settings_api" name="HS Settings API" class="api" filter="s60">
+    <unit bldFile="homescreensrv_plat/hs_settings_api/group"/>
+   </component>
+   <component id="hs_content_control_api" name="HS Content Control API" class="api" filter="s60">
+    <unit bldFile="homescreensrv_plat/hs_content_control_api/group"/>
+   </component>
+  </collection>
+  <collection id="xcfw" name="XML Content Framework" level="framework">
+   <!-- collection is really a component, needs to be moved down a directory -->
+   <component id="xcfw_build" filter="s60" name="XML Content Framework Build">
+    <unit bldFile="xcfw/group"/>
+   </component>
+  </collection>
+  <collection id="homescreenpluginsrv" name="Home Screen Plugin Service" level="plugin">
+   <component id="hspsdefinitionengine" filter="s60" name="HS Plugin Service Definition Engine">
+    <!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
+   </component>
+   <component id="hspsdom" filter="s60" name="HS Plugin Service DOM">
+    <!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
+   </component>
+   <component id="hspstools" filter="s60" name="HS Server Tools">
+    <meta rel="config">
+     <defined condition="____HSPS_CFG_LOG_ON____"/>
+    </meta>
+    <!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
+   </component>
+   <component id="hspspluginregistry" filter="s60" name="HS Plugin Registry">
+    <!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
+   </component>
+   <component id="hspsmanager" filter="s60" name="HSPS Manager">
+    <!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
+   </component>
+   <component id="hspsodt" filter="s60" name="HSPS Object Description Tree">
+    <!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
+   </component>
+   <component id="hspsresource" filter="s60" name="HS Plugin Server Resource">
+    <!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
+   </component>
+   <component id="hspsresult" filter="s60" name="HS Plugin Server Result">
+    <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+   </component>
+   <component id="homescreen_settings_api" filter="s60" name="HS Settings API" class="api">
+    <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+   </component>
+   <component id="homescreenpluginsrv_build" filter="s60" name="HSPS Build">
+    <!-- need to break this up into the self-contained components above and uncomment them -->
+    <unit bldFile="homescreenpluginsrv/group"/>
+   </component>
+  </collection>
+  <collection id="idlefw" name="Idle Framework" level="framework">
+   <meta rel="config">
+    <defined condition="RD_CUSTOMIZABLE_AI"/>
+   </meta>
+   <!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
+   <component id="idlefw_plugins" filter="s60" name="Idle Framework Plugins" class="plugin">
+    <!--<unit bldFile="idlefw/plugins/group"/>-->
+   </component>
+   <component id="hslaunch" filter="s60" name="Home Screen Launch">
+    <!--<unit bldFile="idlefw/plugins/group"/>-->
+   </component>
+   <component id="idlefw_build" filter="s60" name="Idle Framework Build">
+    <!--split this into components, or separate from the above components and move this down a directory -->
+    <unit bldFile="idlefw/group"/>
+   </component>
+  </collection>
+  <collection id="menucontentsrv" name="Menu Content Service" level="generic">
+   <component id="menusatinterface" filter="s60" name="Menu SAT Interface">
+    <unit bldFile="menucontentsrv/menusatinterface/group"/>
+   </component>
+   <component id="menucontentsrv_build" filter="s60" name="Menu Content Service Build">
+    <!--split this into components, or separate from the above component and move this down a directory -->
+    <unit bldFile="menucontentsrv/group"/>
+   </component>
+  </collection>
+  <collection id="backsteppingsrv" name="Back Stepping Service" level="server">
+   <!-- collection is really a component, needs to be moved down a directory -->
+   <component id="bsengine" name="Back Stepping Engine" filter="s60">
+    <unit bldFile="backsteppingsrv/group"/>
+   </component>
+  </collection>
+  <collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
+   <component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
+    <!-- need to move this component outside of contentpublishingutils and into separate component directory -->
+    <meta rel="config">
+     <defined condition="CONTENT_PUBLISHER_DEBUG"/>
+    </meta>
+    <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
+   </component>
+   <component id="contentpublishingutils" filter="s60" name="Content Publishing Utils">
+    <unit bldFile="contentpublishingsrv/contentpublishingutils/group"/>
+   </component>
+   <component id="contentpublishingserver" filter="s60" name="Content Publishing Server">
+    <unit bldFile="contentpublishingsrv/contentpublishingserver/group"/>
+   </component>
+   <component id="contentharvester" filter="s60" name="Content Harvester">
+    <unit bldFile="contentpublishingsrv/contentharvester/group"/>
+   </component>
+   <component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
+    <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
-        <unit bldFile="contentpublishingsrv/group"/>
-      </component>
-    </collection>
-    <collection id="contextutility" name="Context Utility" level="generic">
-   		<!-- collection is really a component, needs to be moved down a directory -->
-      <component id="contextutility_build" name="Context Utility Build" filter="s60" introduced="^3">
-        <unit bldFile="contextutility/group"/>
-      </component>
-    </collection>
-    <collection id="contentcontrolsrv" name="Content Control Service" level="server">
-      <component id="ccsrv" name="Content Control Service" filter="s60"  introduced="^3">
-        <unit bldFile="contentcontrolsrv/ccsrv/group"/>
-      </component>
-      <component id="ccsrvapi" name="Content Control Service API" filter="s60"  introduced="^3" class="api">
-        <unit bldFile="contentcontrolsrv/ccsrvapi/group"/>
-      </component>
-      <component id="ccclientsession" name="Content Control Client Session" filter="s60"  introduced="^3">
-        <unit bldFile="contentcontrolsrv/ccclientsession/group"/>
-      </component>
-      <component id="hsccclient" name="HS Content Control Client" filter="s60"  introduced="^3">
-        <unit bldFile="contentcontrolsrv/hsccclient/group"/>
-      </component>
-      <component id="hscontentinfo" name="Home Screen Content Info" filter="s60"  introduced="^3">
-        <unit bldFile="contentcontrolsrv/hscontentinfo/group"/>
-      </component>
-      <component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60"  introduced="^3">
-      	<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+    <unit bldFile="contentpublishingsrv/group"/>
+   </component>
+  </collection>
+  <collection id="contextutility" name="Context Utility" level="generic">
+   <!-- collection is really a component, needs to be moved down a directory -->
+   <component id="contextutility_build" name="Context Utility Build" filter="s60" introduced="^3">
+    <unit bldFile="contextutility/group"/>
+   </component>
+  </collection>
+  <collection id="contentcontrolsrv" name="Content Control Service" level="server">
+   <component id="ccsrv" name="Content Control Service" filter="s60" introduced="^3">
+    <unit bldFile="contentcontrolsrv/ccsrv/group"/>
+   </component>
+   <component id="ccsrvapi" name="Content Control Service API" filter="s60" introduced="^3" class="api">
+    <unit bldFile="contentcontrolsrv/ccsrvapi/group"/>
+   </component>
+   <component id="ccclientsession" name="Content Control Client Session" filter="s60" introduced="^3">
+    <unit bldFile="contentcontrolsrv/ccclientsession/group"/>
+   </component>
+   <component id="hsccclient" name="HS Content Control Client" filter="s60" introduced="^3">
+    <unit bldFile="contentcontrolsrv/hsccclient/group"/>
+   </component>
+   <component id="hscontentinfo" name="Home Screen Content Info" filter="s60" introduced="^3">
+    <unit bldFile="contentcontrolsrv/hscontentinfo/group"/>
+   </component>
+   <component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
+    <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
-        <unit bldFile="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="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="homescreensrv_plat/content_harvester_plugin_api/tsrc/group" />
-		<unit bldFile="homescreensrv_plat/menu_content_service_api/tsrc/group" />
-		<unit bldFile="homescreensrv_plat/ai_utilities_api/internal/tsrc/group" />
-		<unit bldFile="homescreensrv_plat/action_handler_plugin_api/tsrc/group" />
-		<unit bldFile="homescreensrv_plat/menu_sat_interface_api/tsrc/group" />
-		<unit bldFile="homescreensrv_plat/sapi_homescreenplugin/tsrc/group" />
-	</component>
-    </collection>
-  </package>
+    <unit bldFile="contentcontrolsrv/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/imghandling/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,18 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+          </component>
+          <component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_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">
@@ -91,14 +103,6 @@
             <unit bldFile="/sf/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="/sf/mw/imghandling/imagehandling_plat/group"/>
-          </component>
-          <component name="imagehandling_api_test" filter="s60,test,api_test" long-name="Image Handling Platform API Test" purpose="development">
-            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/imghandling/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="imghandling" name="Image Handling" levels="lib util if">
-    <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
-    	<!-- collection is really a component, need to move down a directory -->
-      <component id="ihl" filter="s60" name="IHL">
-        <unit bldFile="imagehandlinglib/group"/>
-      </component>
-	    <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
-	     	<unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
-		</component>
-    </collection>
-    <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
-      <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
-        <unit bldFile="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="imagehandling_plat/group"/>
-      </component>
-      <component id="imagehandling_api_test" filter="s60,test,api_test" name="Image Handling Platform API Test" purpose="development">
-        <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="imghandling" 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" href="imagehandling_plat/image_handling_library_api/image_handling_library_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/image_handling_library_api/group"/>
+   </component>
+   <component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+    <meta rel="Api" href="imagehandling_plat/3gp_library_api/3gp_library_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/3gp_library_api/group"/>
+   </component>
+   <component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+    <meta rel="Api" href="imagehandling_plat/thumbnailmanager_api/thumbnailmanager_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+    <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+   <!-- collection is really a component, need to move down a directory -->
+   <component id="ihl" filter="s60" name="IHL">
+    <unit bldFile="imagehandlinglib/group"/>
+   </component>
+   <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
+    <unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
+   <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
+    <unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/imsrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/imsrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,86 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -109,11 +189,6 @@
             <unit bldFile="/sf/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="/sf/mw/imsrv/imsrv_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/imsrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/imsrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,42 +1,142 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="imsrv" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
-    <collection id="ximpfw" name="XIMP Framework" level="framework">
-    	<!-- collection is really a component. Needs to be moved down a directory -->
-      <component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
-        <unit bldFile="ximpfw/group"/>
-      </component>
-    </collection>
-    <collection id="imservices" name="IM Services" level="generic">
-      <component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
-        <unit bldFile="imservices/imfeatureplugin/group"/>
-      </component>
-      <component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
-        <unit bldFile="imservices/searchfeatureplugin/group"/>
-      </component>
-      <component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
-        <unit bldFile="imservices/xmppsettingsapi/group"/>
-      </component>
-      <component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
-        <unit bldFile="imservices/xmppsettingsfetcher/group"/>
-      </component>
-      <component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
-        <unit bldFile="imservices/ossprotocoladaptation/group"/>
-      </component>
-      <component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
-        <unit bldFile="imservices/instantmessagingcache/group"/>
-      </component>
-    </collection>
-    <collection id="brandingserver" name="Branding Server" level="specific">
-    	<!-- collection is really a component. Needs to be moved down a directory -->
-      <component id="brandingserver_build" filter="s60" name="Branding Server Build">
-        <unit bldFile="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="imsrv_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="imsrv" 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" href="imsrv_plat/ximp_core_data_model_api/ximp_core_data_model_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_presence_protocol_plugin_host_api/ximp_presence_protocol_plugin_host_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_presence_data_model_api/ximp_presence_data_model_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_presence_protocol_plugin_api/ximp_presence_protocol_plugin_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_presence_management_api/ximp_presence_management_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_core_protocol_plugin_host_api/ximp_core_protocol_plugin_host_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_core_management_api/ximp_core_management_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_presence_base_api/ximp_presence_base_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_core_protocol_plugin_api/ximp_core_protocol_plugin_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_core_base_api/ximp_core_base_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_presence_cache_api/ximp_presence_cache_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_core_feature_plugin_api/ximp_core_feature_plugin_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_im_protocol_plugin_host_api/ximp_im_protocol_plugin_host_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_im_data_model_api/ximp_im_data_model_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_im_protocol_plugin_api/ximp_im_protocol_plugin_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_im_management_api/ximp_im_management_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_im_base_api/ximp_im_base_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_search_protocol_plugin_host_api/ximp_search_protocol_plugin_host_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_search_data_model_api/ximp_search_data_model_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_search_protocol_plugin_api/ximp_search_protocol_plugin_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_search_management_api/ximp_search_management_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/ximp_search_base_api/ximp_search_base_api.metaxml"/>
+    <unit bldFile="imsrv_plat/ximp_search_base_api/group"/>
+   </component>
+   <component id="xmpp_settings_api" name="XMPP Settings API" class="api" filter="s60">
+    <meta rel="Api" href="imsrv_plat/xmpp_settings_api/xmpp_settings_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/im_cache_client_api/im_cache_client_api.metaxml"/>
+    <unit bldFile="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" href="imsrv_plat/im_cache_server_api/im_cache_server_api.metaxml"/>
+    <unit bldFile="imsrv_plat/im_cache_server_api/group"/>
+   </component>
+   <component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+    <unit bldFile="imsrv_plat/presence_avabilitytext/group"/>
+   </component>
+  </collection>
+  <collection id="ximpfw" name="XIMP Framework" level="framework">
+   <!-- collection is really a component. Needs to be moved down a directory -->
+   <component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
+    <unit bldFile="ximpfw/group"/>
+   </component>
+  </collection>
+  <collection id="imservices" name="IM Services" level="generic">
+   <component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
+    <unit bldFile="imservices/imfeatureplugin/group"/>
+   </component>
+   <component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
+    <unit bldFile="imservices/searchfeatureplugin/group"/>
+   </component>
+   <component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
+    <unit bldFile="imservices/xmppsettingsapi/group"/>
+   </component>
+   <component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
+    <unit bldFile="imservices/xmppsettingsfetcher/group"/>
+   </component>
+   <component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
+    <unit bldFile="imservices/ossprotocoladaptation/group"/>
+   </component>
+   <component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
+    <unit bldFile="imservices/instantmessagingcache/group"/>
+   </component>
+  </collection>
+  <collection id="brandingserver" name="Branding Server" level="specific">
+   <!-- collection is really a component. Needs to be moved down a directory -->
+   <component id="brandingserver_build" filter="s60" name="Branding Server Build">
+    <unit bldFile="brandingserver/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/inputmethods/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/inputmethods/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -76,7 +76,50 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework">
+      <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="/sf/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="/sf/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="/sf/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="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group" filter="test,api_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-->
@@ -158,19 +201,7 @@
             <unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/group" mrp="/sf/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="/sf/mw/inputmethods/inputmethods_plat/group"/>
-          </component>
-          <component name="inputmethods_pub" filter="s60" long-name="Input Methods Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/group"/>
-          </component>
-          <component name="inputmethods_test" filter="s60,test,api_test" long-name="Input Methods Tests" introduced="^2" purpose="development">
-            <!-- can only have one unit, #include from a single bld.inf -->
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/>
-          </component>
+        <collection name="inputmethods_info" long-name="Input Methods Info" level="api">
           <component name="inputmethods_api_tests" filter="s60,test,api_test" long-name="Input Methods API Tests" introduced="^2" purpose="development">
             <unit bldFile="/sf/mw/inputmethods/tsrc/group"/>
           </component>

--- a/symbian3/mw/inputmethods/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/inputmethods/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,109 +1,161 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="inputmethods" name="Input Methods" levels="plugin engine framework">
-    <collection id="textinput" name="Text Input" level="framework">
-      <component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
-      	<meta rel="config">
-      		<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
-      	</meta>
-      		<!--uncomment when configuration is turned on and textinput_build is removed-->
-      		<!--  <unit bldFile="textinput/ptienginev2/group"/>-->
-      </component>
-      <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
-        <unit bldFile="textinput/akninputlanguage/group"/>
-      </component>
-      <component id="ptihangulcore" filter="s60" name="PIT Hangul Core" introduced="^3">
-        <unit bldFile="textinput/ptihangulcore/group"/>
-      </component>
-      <component id="ptikoreanqwertycore" filter="s60" name="PTI Korean QWERTY Core" introduced="^3">
-        <unit bldFile="textinput/ptikoreanqwertycore/group"/>
-      </component>
-      <component id="peninputarc" filter="s60" name="Pen Input Arc">
-        <unit bldFile="textinput/peninputarc/group"/>
-      </component>
-      <component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
-        <unit bldFile="textinput/peninputcommonctrls/group"/>
-      </component>
-      <component id="peninputhwrboxcn" filter="s60" name="Chinese Handwriting Recognition Box" class="plugin">
-        <unit bldFile="textinput/peninputhwrboxcn/group"/>
-      </component>
-      <component id="peninputvkbcn" filter="s60" name="Chinese Virtual Keyboard" class="plugin">
-        <unit bldFile="textinput/peninputvkbcn/group"/>
-      </component>
-      <component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
-        <unit bldFile="textinput/peninputcommonlayout/group"/>
-      </component>
-      <component id="peninputgenerichwr" filter="s60" name="Pen Input Generic Handwriting Recognition" class="plugin">
-        <unit bldFile="textinput/peninputgenerichwr/group"/>
-      </component>
-      <component id="peninputgenericvkb" filter="s60" name="Pen Input Generic Virtual Keyboard" class="plugin">
-        <unit bldFile="textinput/peninputgenericvkb/group"/>
-      </component>
-      <component id="peninputcommonctrlsjp" filter="s60" name="Pen Input Common Controls Japanese">
-        <unit bldFile="textinput/peninputcommonctrlsjp/group"/>
-      </component>
-      <component id="peninputhwrboxjp" filter="s60" name="Japanese Handwriting Recognition Box" class="plugin">
-        <unit bldFile="textinput/peninputhwrboxjp/group"/>
-      </component>
-      <component id="peninputvkbjp" filter="s60" name="Japanese Virtual Keyboard" class="plugin">
-        <unit bldFile="textinput/peninputvkbjp/group"/>
-      </component>
-      <component id="gslangplugin" filter="s60" name="GS Language Plugin" class="plugin">
-        <unit bldFile="textinput/GSLangPlugin"/>
-      </component>
-      <component id="peninputgenericitut" filter="s60" name="Pen Input Generic ITU-T" class="plugin" introduced="^3">
-        <unit bldFile="textinput/peninputgenericitut/group"/>
-      </component>
-      <component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
-        <unit bldFile="textinput/peninputhwrtrui/group"/>
-      </component>
-      <component id="peninputhwrfscn" filter="s60" name="Pen Input Chinese Full Screen Handwriting Recognition" class="plugin" introduced="^3">
-        <unit bldFile="textinput/peninputhwrfscn/group"/>
-      </component>
-      <component id="peninputvkbkr" filter="s60" name="Pen Input Korean Virtual Keyboard" class="plugin" introduced="^3">
-        <unit bldFile="textinput/peninputvkbkr/group"/>
-      </component>
-      <component id="peninputfingerhwr" filter="s60" name="Pen Input Finger Handwriting Recognition" class="plugin" introduced="^3">
-        <unit bldFile="textinput/peninputfingerhwr/group"/>
-      </component>
-      <component id="peninputsplititut" filter="s60" name="Pen Input Split ITU-T" class="plugin" introduced="^3">
-        <unit bldFile="textinput/peninputsplititut/group"/>
-      </component>
-      <component id="peninputsplitqwerty" filter="s60" name="Pen Input Split QWERTY" class="plugin" introduced="^3">
-        <unit bldFile="textinput/peninputsplitqwerty/group"/>
-      </component>
-      <component id="textinput_build" filter="s60" name="Text Input Build">
-       <!--needed for #ifdef, can be removed when configuration is implemented -->
-        <unit bldFile="textinput/group"/>
-      </component>
-    </collection>
-    <collection id="fep" name="FEP" level="engine">
-      <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
-        <unit bldFile="fep/aknfep/group"/>
-      </component>
-      <component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
-        <unit bldFile="fep/frontendprocessor/group" mrp="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="inputmethods_plat/group"/>
-      </component>
-      <component id="inputmethods_pub" filter="s60" name="Input Methods Public Interfaces" class="api">
-        <unit bldFile="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="inputmethods_plat/pen_input_server_api/tsrc/group"/>
-	    <unit bldFile="inputmethods_plat/ptiengine_hwr_api/tsrc/group"/>
-	    <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/>
-      </component>
-      <component id="inputmethods_api_tests" filter="s60,test,api_test" name="Input Methods API Tests" introduced="^2" purpose="development">
-        <unit bldFile="tsrc/group"/>
-      </component>
-      <component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="inputmethods" 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" href="inputmethods_pub/ptiengine_iti_api/ptiengine_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+    </meta>
+    <unit bldFile="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" href="inputmethods_pub/optical_character_recognition_api/optical_character_recognition_api.metaxml"/>
+    <unit bldFile="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" href="inputmethods_pub/input_language_info_api/input_language_info_api.metaxml"/>
+    <unit bldFile="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" href="inputmethods_plat/pen_input_server_api/pen_input_server_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+    <unit bldFile="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" href="inputmethods_plat/ptiengine_hwr_api/ptiengine_hwr_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+    <unit bldFile="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" href="inputmethods_plat/aknfep_settings_api/aknfep_settings_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/aknfep_settings_api/group"/>
+   </component>
+   <component id="aknfep_status_api" name="Avkon FEP Status API" class="api" filter="s60">
+    <meta rel="Api" href="inputmethods_plat/aknfep_status_api/aknfep_status_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+    </meta>
+    <unit bldFile="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" href="inputmethods_plat/ptiengine_key_definations_api/ptiengine_key_definations_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+    </meta>
+    <unit bldFile="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" href="inputmethods_plat/aknfep_definitions_api/aknfep_definitions_api.metaxml"/>
+    <unit bldFile="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" href="inputmethods_plat/aknfep_pen_support_api/aknfep_pen_support_api.metaxml"/>
+    <unit bldFile="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" href="inputmethods_plat/ptiengine_indic_definitions_api/ptiengine_indic_definitions_api.metaxml"/>
+    <unit bldFile="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" href="inputmethods_plat/aknfep_uiinterface_api/aknfep_uiinterface_api.metaxml"/>
+    <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+    <unit bldFile="inputmethods_plat/aknfep_uiinterface_api/tsrc/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="textinput" name="Text Input" level="framework">
+   <component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
+    <meta rel="config">
+     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+    </meta>
+    <!--uncomment when configuration is turned on and textinput_build is removed-->
+    <!--  <unit bldFile="textinput/ptienginev2/group"/>-->
+   </component>
+   <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
+    <unit bldFile="textinput/akninputlanguage/group"/>
+   </component>
+   <component id="ptihangulcore" filter="s60" name="PIT Hangul Core" introduced="^3">
+    <unit bldFile="textinput/ptihangulcore/group"/>
+   </component>
+   <component id="ptikoreanqwertycore" filter="s60" name="PTI Korean QWERTY Core" introduced="^3">
+    <unit bldFile="textinput/ptikoreanqwertycore/group"/>
+   </component>
+   <component id="peninputarc" filter="s60" name="Pen Input Arc">
+    <unit bldFile="textinput/peninputarc/group"/>
+   </component>
+   <component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
+    <unit bldFile="textinput/peninputcommonctrls/group"/>
+   </component>
+   <component id="peninputhwrboxcn" filter="s60" name="Chinese Handwriting Recognition Box" class="plugin">
+    <unit bldFile="textinput/peninputhwrboxcn/group"/>
+   </component>
+   <component id="peninputvkbcn" filter="s60" name="Chinese Virtual Keyboard" class="plugin">
+    <unit bldFile="textinput/peninputvkbcn/group"/>
+   </component>
+   <component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
+    <unit bldFile="textinput/peninputcommonlayout/group"/>
+   </component>
+   <component id="peninputgenerichwr" filter="s60" name="Pen Input Generic Handwriting Recognition" class="plugin">
+    <unit bldFile="textinput/peninputgenerichwr/group"/>
+   </component>
+   <component id="peninputgenericvkb" filter="s60" name="Pen Input Generic Virtual Keyboard" class="plugin">
+    <unit bldFile="textinput/peninputgenericvkb/group"/>
+   </component>
+   <component id="peninputcommonctrlsjp" filter="s60" name="Pen Input Common Controls Japanese">
+    <unit bldFile="textinput/peninputcommonctrlsjp/group"/>
+   </component>
+   <component id="peninputhwrboxjp" filter="s60" name="Japanese Handwriting Recognition Box" class="plugin">
+    <unit bldFile="textinput/peninputhwrboxjp/group"/>
+   </component>
+   <component id="peninputvkbjp" filter="s60" name="Japanese Virtual Keyboard" class="plugin">
+    <unit bldFile="textinput/peninputvkbjp/group"/>
+   </component>
+   <component id="gslangplugin" filter="s60" name="GS Language Plugin" class="plugin">
+    <unit bldFile="textinput/GSLangPlugin"/>
+   </component>
+   <component id="peninputgenericitut" filter="s60" name="Pen Input Generic ITU-T" class="plugin" introduced="^3">
+    <unit bldFile="textinput/peninputgenericitut/group"/>
+   </component>
+   <component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
+    <unit bldFile="textinput/peninputhwrtrui/group"/>
+   </component>
+   <component id="peninputhwrfscn" filter="s60" name="Pen Input Chinese Full Screen Handwriting Recognition" class="plugin" introduced="^3">
+    <unit bldFile="textinput/peninputhwrfscn/group"/>
+   </component>
+   <component id="peninputvkbkr" filter="s60" name="Pen Input Korean Virtual Keyboard" class="plugin" introduced="^3">
+    <unit bldFile="textinput/peninputvkbkr/group"/>
+   </component>
+   <component id="peninputfingerhwr" filter="s60" name="Pen Input Finger Handwriting Recognition" class="plugin" introduced="^3">
+    <unit bldFile="textinput/peninputfingerhwr/group"/>
+   </component>
+   <component id="peninputsplititut" filter="s60" name="Pen Input Split ITU-T" class="plugin" introduced="^3">
+    <unit bldFile="textinput/peninputsplititut/group"/>
+   </component>
+   <component id="peninputsplitqwerty" filter="s60" name="Pen Input Split QWERTY" class="plugin" introduced="^3">
+    <unit bldFile="textinput/peninputsplitqwerty/group"/>
+   </component>
+   <component id="textinput_build" filter="s60" name="Text Input Build">
+    <!--needed for #ifdef, can be removed when configuration is implemented -->
+    <unit bldFile="textinput/group"/>
+   </component>
+  </collection>
+  <collection id="fep" name="FEP" level="engine">
+   <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
+    <unit bldFile="fep/aknfep/group"/>
+   </component>
+   <component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
+    <unit bldFile="fep/frontendprocessor/group" mrp="fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+   </component>
+  </collection>
+  <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="tsrc/group"/>
+   </component>
+   <component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/ipappprotocols/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/ipappprotocols/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,14 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+          </component>
+          <component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/ipappprotocols/rtp/srtpstack/group"/>
@@ -117,9 +125,6 @@
           </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="/sf/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="/sf/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
           </component>

--- a/symbian3/mw/ipappprotocols/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/ipappprotocols/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,52 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="ipappprotocols" name="IP App Protocols" levels="plugin conn server if">
-    <collection id="rtp" name="RTP" level="server">
-      <component id="srtpstack" filter="s60" name="SRTP Stack">
-        <unit bldFile="rtp/srtpstack/group"/>
-      </component>
-      <component id="rtpstack" filter="s60" name="RTP Stack">
-        <unit bldFile="rtp/rtpstack/group"/>
-      </component>
-    </collection>
-    <collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
-      <component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
-        <!-- Real Time Data Protocol -->
-        <unit bldFile="realtimenetprots/rtp/group" mrp="realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-      </component>
-      <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
-        <unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
-      </component>
-    </collection>
-    <collection id="sipplugins" name="SIP Plugins" level="plugin">
-      <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
-        <unit bldFile="sipplugins/sippwlanplugin/group"/>
-      </component>
-      <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
-        <unit bldFile="sipplugins/sippsipsettingsui/group"/>
-      </component>
-      <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
-        <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
-      </component>
-      <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
-        <unit bldFile="sipplugins/sippsystemstatemonitor/group"/>
-      </component>
-      <component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
-        <unit bldFile="sipplugins/sippsipadapter/group"/>
-      </component>
-    </collection>
-    <collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
-      <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="sipproviderplugins/sipprovider/group" mrp="sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-      </component>
-    </collection>
-    <collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
-      <component id="ipappprotocols_plat" filter="s60" name="IP App Protocols Platform Interfaces" class="api">
-        <unit bldFile="ipappprotocols_plat/group"/>
-      </component>
-      <component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="ipappprotocols" 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" href="ipappprotocols_plat/srtp_api/srtp_api.metaxml"/>
+    <unit bldFile="ipappprotocols_plat/srtp_api/group"/>
+   </component>
+   <component id="rtprtcp_api" name="RTP/RTCP API" class="api" filter="s60">
+    <meta rel="Api" href="ipappprotocols_plat/rtprtcp_api/rtprtcp_api.metaxml"/>
+    <unit bldFile="ipappprotocols_plat/rtprtcp_api/group"/>
+   </component>
+  </collection>
+  <collection id="rtp" name="RTP" level="server">
+   <component id="srtpstack" filter="s60" name="SRTP Stack">
+    <unit bldFile="rtp/srtpstack/group"/>
+   </component>
+   <component id="rtpstack" filter="s60" name="RTP Stack">
+    <unit bldFile="rtp/rtpstack/group"/>
+   </component>
+  </collection>
+  <collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
+   <component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+    <!-- Real Time Data Protocol -->
+    <unit bldFile="realtimenetprots/rtp/group" mrp="realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+   </component>
+   <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+    <unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+   </component>
+  </collection>
+  <collection id="sipplugins" name="SIP Plugins" level="plugin">
+   <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+    <unit bldFile="sipplugins/sippwlanplugin/group"/>
+   </component>
+   <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+    <unit bldFile="sipplugins/sippsipsettingsui/group"/>
+   </component>
+   <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+    <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
+   </component>
+   <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+    <unit bldFile="sipplugins/sippsystemstatemonitor/group"/>
+   </component>
+   <component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
+    <unit bldFile="sipplugins/sippsipadapter/group"/>
+   </component>
+  </collection>
+  <collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
+   <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="sipproviderplugins/sipprovider/group" mrp="sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+   </component>
+  </collection>
+  <collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
+   <component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/ipappsrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/ipappsrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,26 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+          </component>
+          <component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -110,9 +130,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="/sf/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="/sf/mw/ipappsrv/group"/>

--- a/symbian3/mw/ipappsrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/ipappsrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,49 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="ipappsrv" name="IP App Services" levels="framework generic server conn plugin">
-    <collection id="natfw" name="NAT Framework" level="framework">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
-        <unit bldFile="natfw/group"/>
-      </component>
-    </collection>
-    <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
-        <unit bldFile="multimediacommscontroller/group"/>
-      </component>
-    </collection>
-    <collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
-        <unit bldFile="multimediacommsengine/group"/>
-      </component>
-    </collection>
-    <collection id="natplugins" name="NAT Plugins" level="plugin">
-      <component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
-        <unit bldFile="natplugins/natpcliprovisioningnatfwadapter/group"/>
-      </component>
-      <component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
-        <unit bldFile="natplugins/natpdevmgmtnatfwadapter/group"/>
-      </component>
-      <component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
-        <unit bldFile="natplugins/natptraversalcontroller/group"/>
-      </component>
-      <component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
-        <unit bldFile="natplugins/natpnatfwsdpprovider/group"/>
-      </component>
-    </collection>
-    <collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
-      <component id="ipappsrv_plat" filter="s60" name="IP App Services Platform Interfaces" class="api">
-        <unit bldFile="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="group"/>
-      </component>
-      <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="ipappsrv" 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" href="ipappsrv_plat/transcoder_api/transcoder_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/transcoder_api/group"/>
+   </component>
+   <component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/comms_event_api/comms_event_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/comms_event_api/group"/>
+   </component>
+   <component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/floor_control_api/floor_control_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/floor_control_api/group"/>
+   </component>
+   <component id="media_control_api" name="Media Control API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/media_control_api/media_control_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/media_control_api/group"/>
+   </component>
+   <component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/multimedia_comms_api/multimedia_comms_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/multimedia_comms_api/group"/>
+   </component>
+   <component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
+    <meta rel="Api" href="ipappsrv_plat/nat_settings_api/nat_settings_api.metaxml"/>
+    <unit bldFile="ipappsrv_plat/nat_settings_api/group"/>
+   </component>
+  </collection>
+  <collection id="natfw" name="NAT Framework" level="framework">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
+    <unit bldFile="natfw/group"/>
+   </component>
+  </collection>
+  <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
+    <unit bldFile="multimediacommscontroller/group"/>
+   </component>
+  </collection>
+  <collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
+    <unit bldFile="multimediacommsengine/group"/>
+   </component>
+  </collection>
+  <collection id="natplugins" name="NAT Plugins" level="plugin">
+   <component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
+    <unit bldFile="natplugins/natpcliprovisioningnatfwadapter/group"/>
+   </component>
+   <component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
+    <unit bldFile="natplugins/natpdevmgmtnatfwadapter/group"/>
+   </component>
+   <component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
+    <unit bldFile="natplugins/natptraversalcontroller/group"/>
+   </component>
+   <component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
+    <unit bldFile="natplugins/natpnatfwsdpprovider/group"/>
+   </component>
+  </collection>
+  <collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
+   <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="group"/>
+   </component>
+   <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/ipconnmgmt/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,70 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
@@ -158,12 +222,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="/sf/mw/ipconnmgmt/ipcm_pub/group"/>
-          </component>
-          <component name="ipcm_plat" filter="s60" long-name="IP Connectivity Management Platform Interfaces" class="api">
-            <unit bldFile="/sf/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="/sf/mw/ipconnmgmt/group"/>

--- a/symbian3/mw/ipconnmgmt/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,100 +1,177 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="ipconnmgmt" name="IP Connectivity Management" levels="plugin framework server generic utils">
-    <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="accesspointcontrol/apcontrollistplugin/group"/>
-      </component>
-    </collection>
-    <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
-      <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
-        <unit bldFile="alwayson_net_plugin/pdpcontextmanager2/group"/>
-      </component>
-    </collection>
-    <collection id="apengine" name="Access Point Engine" level="framework">
-      <component id="apeng" filter="s60" name="Access Point Engine">
-        <unit bldFile="apengine/apeng/group"/>
-      </component>
-      <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
-        <unit bldFile="apengine/apsettingshandlerui/group"/>
-      </component>
-      <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
-        <unit bldFile="apengine/apsettingsplugin/group"/>
-      </component>
-    </collection>
-    <collection id="bearermanagement" name="Bearer Management" level="framework">
-      <component id="mpm" filter="s60" name="Mobility Policy Manager">
-        <unit bldFile="bearermanagement/mpm/group"/>
-      </component>
-      <component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
-        <unit bldFile="bearermanagement/extendedconnpref/group"/>
-      </component>
-      <component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
-        <unit bldFile="bearermanagement/S60MCPR/group"/>
-      </component>
-    </collection>
-    <collection id="cmmanager" name="Connection Method Manager" level="framework">
-      <component id="cmmgr" filter="s60" name="CM Manager">
-        <unit bldFile="cmmanager/cmmgr/group"/>
-      </component>
-      <component id="gsconnsettingsplugin" filter="s60" name="GS Connection Settings Plugin" introduced="^3" class="plugin">
-        <unit bldFile="cmmanager/gsconnsettingsplugin/group"/>
-      </component>
-    </collection>
-    <collection id="connectionmonitoring" name="Connection Monitoring" level="server">
-      <component id="connectionmonitorplugin" filter="s60" name="Connection Monitor Plugin" class="plugin">
-        <unit bldFile="connectionmonitoring/connectionmonitorplugin/group"/>
-      </component>
-      <component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
-        <unit bldFile="connectionmonitoring/connectionmonitorui/group"/>
-      </component>
-      <component id="connmon" filter="s60" name="Connection Monitor">
-		<!-- either split into two components, or #include from a common bld.inf -->
-        <unit bldFile="connectionmonitoring/connmon/connectionmonitor/group"/>
-        <unit bldFile="connectionmonitoring/connmon/dataconnectionlogger/group"/>
-      </component>
-      <component id="connmonext" filter="s60" name="Connection Monitor Extension API">
-        <unit bldFile="connectionmonitoring/connmonext/group"/>
-      </component>
-    </collection>
-    <collection id="connectionutilities" name="Connection Utilities" level="utils">
-      <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
-        <unit bldFile="connectionutilities/connectiondialogs/group"/>
-      </component>
-    </collection>
-    <collection id="dbcreator" name="DB Creator" level="utils">
-      <component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
-        <unit bldFile="dbcreator/commsdatcreator/group"/>
-      </component>
-      <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
-      	<meta rel="config">
-      		<not-defined condition="WINSCW"/>
-      	</meta>
-      		<!-- uncomment when config is turned on -->
-        <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
-      </component>
-      <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
-        <unit bldFile="dbcreator/commsdatstartup/group"/>
-      </component>
-      <component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
-        <unit bldFile="dbcreator/dbcreatorexe/group"/>
-      </component>
-      <component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
-		<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-        <unit bldFile="dbcreator/group"/>
-      </component>
-    </collection>
-    <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="utils">
-      <component id="ipcm_pub" filter="s60" class="api" name="IP Connectivity Management Public Interfaces">
-        <unit bldFile="ipcm_pub/group"/>
-      </component>
-      <component id="ipcm_plat" filter="s60" class="api" name="IP Connectivity Management Platform Interfaces">
-        <unit bldFile="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="group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="ipconnmgmt" 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" href="ipcm_plat/access_point_engine_misc_api/access_point_engine_misc_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_plat/bearer_settings_plugin_api/bearer_settings_plugin_api.metaxml"/>
+    <unit bldFile="ipcm_plat/bearer_settings_plugin_api/group"/>
+   </component>
+   <component id="commsdat_wlan_api" name="CommsDat WLAN API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/commsdat_wlan_api/commsdat_wlan_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_plat/connection_monitor_extension_api/connection_monitor_extension_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_plat/connection_ui_utilities_api/connection_ui_utilities_api.metaxml"/>
+    <unit bldFile="ipcm_plat/connection_ui_utilities_api/group"/>
+   </component>
+   <component id="disconnect_dialog_api" name="Disconnect Dialog API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_plat/disconnect_dialog_api/disconnect_dialog_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_plat/disconnect_dialog_disable_api/disconnect_dialog_disable_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_plat/extended_connection_settings_api/extended_connection_settings_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_plat/mpm_default_connection_api/mpm_default_connection_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/pdpcontextmanager2_reset_factory_settings_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_plat/pdpcontextmanager2_settings_api/pdpcontextmanager2_settings_api.metaxml"/>
+    <unit bldFile="ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+   </component>
+   <component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
+    <unit bldFile="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" href="ipcm_pub/connection_settings_api/connection_settings_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_pub/access_point_engine_api/access_point_engine_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_pub/access_point_settings_handler_api/access_point_settings_handler_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_pub/data_connection_log_counters_api/data_connection_log_counters_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_pub/connection_monitor_server_api/connection_monitor_server_api.metaxml"/>
+    <unit bldFile="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" href="ipcm_pub/connection_settings_ui_api/connection_settings_ui_api.metaxml"/>
+    <unit bldFile="ipcm_pub/connection_settings_ui_api/group"/>
+   </component>
+   <component id="agent_dialog_api" name="Agent Dialog API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/agent_dialog_api/agent_dialog_api.metaxml"/>
+    <unit bldFile="ipcm_pub/agent_dialog_api/group"/>
+   </component>
+   <component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
+    <meta rel="Api" href="ipcm_pub/extendedconnpref_api/extendedconnpref_api.metaxml"/>
+    <unit bldFile="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="accesspointcontrol/apcontrollistplugin/group"/>
+   </component>
+  </collection>
+  <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
+   <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
+    <unit bldFile="alwayson_net_plugin/pdpcontextmanager2/group"/>
+   </component>
+  </collection>
+  <collection id="apengine" name="Access Point Engine" level="framework">
+   <component id="apeng" filter="s60" name="Access Point Engine">
+    <unit bldFile="apengine/apeng/group"/>
+   </component>
+   <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
+    <unit bldFile="apengine/apsettingshandlerui/group"/>
+   </component>
+   <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
+    <unit bldFile="apengine/apsettingsplugin/group"/>
+   </component>
+  </collection>
+  <collection id="bearermanagement" name="Bearer Management" level="framework">
+   <component id="mpm" filter="s60" name="Mobility Policy Manager">
+    <unit bldFile="bearermanagement/mpm/group"/>
+   </component>
+   <component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
+    <unit bldFile="bearermanagement/extendedconnpref/group"/>
+   </component>
+   <component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
+    <unit bldFile="bearermanagement/S60MCPR/group"/>
+   </component>
+  </collection>
+  <collection id="cmmanager" name="Connection Method Manager" level="framework">
+   <component id="cmmgr" filter="s60" name="CM Manager">
+    <unit bldFile="cmmanager/cmmgr/group"/>
+   </component>
+   <component id="gsconnsettingsplugin" filter="s60" name="GS Connection Settings Plugin" introduced="^3" class="plugin">
+    <unit bldFile="cmmanager/gsconnsettingsplugin/group"/>
+   </component>
+  </collection>
+  <collection id="connectionmonitoring" name="Connection Monitoring" level="server">
+   <component id="connectionmonitorplugin" filter="s60" name="Connection Monitor Plugin" class="plugin">
+    <unit bldFile="connectionmonitoring/connectionmonitorplugin/group"/>
+   </component>
+   <component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
+    <unit bldFile="connectionmonitoring/connectionmonitorui/group"/>
+   </component>
+   <component id="connmon" filter="s60" name="Connection Monitor">
+    <!-- either split into two components, or #include from a common bld.inf -->
+    <unit bldFile="connectionmonitoring/connmon/connectionmonitor/group"/>
+    <unit bldFile="connectionmonitoring/connmon/dataconnectionlogger/group"/>
+   </component>
+   <component id="connmonext" filter="s60" name="Connection Monitor Extension API">
+    <unit bldFile="connectionmonitoring/connmonext/group"/>
+   </component>
+  </collection>
+  <collection id="connectionutilities" name="Connection Utilities" level="utils">
+   <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
+    <unit bldFile="connectionutilities/connectiondialogs/group"/>
+   </component>
+  </collection>
+  <collection id="dbcreator" name="DB Creator" level="utils">
+   <component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
+    <unit bldFile="dbcreator/commsdatcreator/group"/>
+   </component>
+   <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
+    <meta rel="config">
+     <not-defined condition="WINSCW"/>
+    </meta>
+    <!-- uncomment when config is turned on -->
+    <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+   </component>
+   <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
+    <unit bldFile="dbcreator/commsdatstartup/group"/>
+   </component>
+   <component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
+    <unit bldFile="dbcreator/dbcreatorexe/group"/>
+   </component>
+   <component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
+    <!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+    <unit bldFile="dbcreator/group"/>
+   </component>
+  </collection>
+  <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="utils">
+   <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="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/legacypresence/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/legacypresence/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,47 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+          </component>
+          <component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+          </component>
+          <component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/watcher_api/group"/>
+          </component>
+          <component name="xdm_api" long-name="XDM API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/xdm_api/group"/>
+          </component>
+          <component name="registration_api" long-name="Registration API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/legacypresence/pressrv_plat/registration_api/group"/>
+          </component>
+          <component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -124,11 +165,6 @@
             <unit bldFile="/sf/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="/sf/mw/legacypresence/pressrv_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/legacypresence/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/legacypresence/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,57 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="legacypresence" name="Legacy Presence Services" levels="engine fw ui">
-    <collection id="xdmengine" name="XDM Engine" level="engine">
-    	<!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
-      <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
-        <unit bldFile="xdmengine/group"/>
-      </component>
-    </collection>
-    <collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
-    	<!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
-      <component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
-        <unit bldFile="xdmsettingsui/group"/>
-      </component>
-    </collection>
-    <collection id="xdmprotocols" name="XDM Protocols" level="fw">
-    	<!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
-      <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
-        <unit bldFile="xdmprotocols/group"/>
-      </component>
-    </collection>
-    <collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
-    	<!-- collection is really a component. Need to move down a directory-->
-      <component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
-        <unit bldFile="msgconnmanager/group"/>
-      </component>
-    </collection>
-    <collection id="presencesettingsui" name="Presence Settings UI" level="ui">
-    	<!-- collection is really a component. Need to move down a directory-->
-      <component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
-        <unit bldFile="presencesettingsui/group"/>
-      </component>
-    </collection>
-    <collection id="simpleengine" name="SIMPLE Engine" level="engine">
-    	<!-- collection is really a component. Need to move down a directory-->
-      <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
-        <unit bldFile="simpleengine/group"/>
-      </component>
-    </collection>
-    <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
-    	<!-- collection is really a component. Need to move down a directory-->
-      <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
-        <unit bldFile="presencefwsimpleadpt/group"/>
-      </component>
-    </collection>
-    <collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
-      <component id="presenceplugin" filter="s60" class="plugin"  name="Presence Plugin" introduced="^2">
-        <unit bldFile="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="pressrv_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="legacypresence" 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" href="pressrv_plat/presence_list_api/presence_list_api.metaxml"/>
+    <unit bldFile="pressrv_plat/presence_list_api/group"/>
+   </component>
+   <component id="watcher_info_api" name="Watcher Info API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/watcher_info_api/watcher_info_api.metaxml"/>
+    <unit bldFile="pressrv_plat/watcher_info_api/group"/>
+   </component>
+   <component id="simple_documents_api" name="SIMPLE Documents API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/simple_documents_api/simple_documents_api.metaxml"/>
+    <unit bldFile="pressrv_plat/simple_documents_api/group"/>
+   </component>
+   <component id="authorization_api" name="Authorization API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/authorization_api/authorization_api.metaxml"/>
+    <unit bldFile="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" href="pressrv_plat/xdm_protocol_plugin_api/xdm_protocol_plugin_api.metaxml"/>
+    <unit bldFile="pressrv_plat/xdm_protocol_plugin_api/group"/>
+   </component>
+   <component id="watcher_api" name="Watcher API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/watcher_api/watcher_api.metaxml"/>
+    <unit bldFile="pressrv_plat/watcher_api/group"/>
+   </component>
+   <component id="xdm_api" name="XDM API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/xdm_api/xdm_api.metaxml"/>
+    <unit bldFile="pressrv_plat/xdm_api/group"/>
+   </component>
+   <component id="registration_api" name="Registration API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/registration_api/registration_api.metaxml"/>
+    <unit bldFile="pressrv_plat/registration_api/group"/>
+   </component>
+   <component id="publisher_api" name="Publisher API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/publisher_api/publisher_api.metaxml"/>
+    <unit bldFile="pressrv_plat/publisher_api/group"/>
+   </component>
+   <component id="messaging_connection_manager_api" name="Messaging Connection Manager API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/messaging_connection_manager_api/messaging_connection_manager_api.metaxml"/>
+    <unit bldFile="pressrv_plat/messaging_connection_manager_api/group"/>
+   </component>
+   <component id="xdm_settings_api" name="XDM Settings API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/xdm_settings_api/xdm_settings_api.metaxml"/>
+    <unit bldFile="pressrv_plat/xdm_settings_api/group"/>
+   </component>
+   <component id="simple_settings_api" name="SIMPLE Settings API" class="api" filter="s60">
+    <meta rel="Api" href="pressrv_plat/simple_settings_api/simple_settings_api.metaxml"/>
+    <unit bldFile="pressrv_plat/simple_settings_api/group"/>
+   </component>
+   <component id="simple_instant_msg_api" name="Simple Instant Msg API" class="api" filter="s60">
+    <unit bldFile="pressrv_plat/simple_instant_msg_api/group"/>
+   </component>
+  </collection>
+  <collection id="xdmengine" name="XDM Engine" level="engine">
+   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+   <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
+    <unit bldFile="xdmengine/group"/>
+   </component>
+  </collection>
+  <collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
+   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
+   <component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
+    <unit bldFile="xdmsettingsui/group"/>
+   </component>
+  </collection>
+  <collection id="xdmprotocols" name="XDM Protocols" level="fw">
+   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
+   <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
+    <unit bldFile="xdmprotocols/group"/>
+   </component>
+  </collection>
+  <collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
+    <unit bldFile="msgconnmanager/group"/>
+   </component>
+  </collection>
+  <collection id="presencesettingsui" name="Presence Settings UI" level="ui">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
+    <unit bldFile="presencesettingsui/group"/>
+   </component>
+  </collection>
+  <collection id="simpleengine" name="SIMPLE Engine" level="engine">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
+    <unit bldFile="simpleengine/group"/>
+   </component>
+  </collection>
+  <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
+    <unit bldFile="presencefwsimpleadpt/group"/>
+   </component>
+  </collection>
+  <collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
+   <component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
+    <unit bldFile="simpledatamodeladapter/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/locationsrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/locationsrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,94 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+          </component>
+          <component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+          </component>
+          <component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
@@ -161,14 +249,6 @@
             <unit bldFile="/sf/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="/sf/mw/locationsrv/locsrv_plat/group"/>
-          </component>
-          <component name="locsrv_pub" filter="s60" long-name="Location Services Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/locationsrv/locsrv_pub/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/locationsrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/locationsrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,97 +1,204 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="locationsrv" name="Location Services" levels="plugin fw server if">
-    <collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
-      <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin"> 
-        <unit bldFile="genericpositioningplugins/locationnpppsy/group"/>
-      </component>
-      <component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3"> 
-        <unit bldFile="genericpositioningplugins/locationsuplpsy/group"/>
-      </component>
-      <component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
-      	<!-- need to break this up into the other components -->
-        <unit bldFile="genericpositioningplugins/group"/>
-      </component>    
-    </collection>
-    <collection id="landmarks" name="Landmarks" level="server">
-      <component id="locationlandmarks" filter="s60" name="Location Landmarks">
-        <unit bldFile="landmarks/locationlandmarks/group"/>
-      </component>
-    </collection>
-    <collection id="locationmapnavfw" name="Location Map and Navigation Framework" level="fw">
-      <component id="mnlibrary" filter="s60" name="Map and Navigation Library">
-        <unit bldFile="locationmapnavfw/library/group"/>
-      </component>
-      <component id="mnaiwprovider" filter="s60" name="Map and Navigation AIW Provider" class="plugin">
-        <unit bldFile="locationmapnavfw/aiwprovider/group"/>
-      </component>
-      <component id="locationmapnavfw_build" filter="s60" name="Location Map and Navigation Framework Build">
-      	<!-- need to break this up into the other components -->
-        <unit bldFile="locationmapnavfw/group"/>
-      </component>
-    </collection>
-    <collection id="locationsystemui" name="Location System UI" level="if">
-      <component id="locationsysui" filter="s60" name="Location System UI">
-        <unit bldFile="locationsystemui/locationsysui/group"/>
-      </component>
-    </collection>
-    <collection id="supl" name="SUPL" level="fw">
-      <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
-        <unit bldFile="supl/locationsuplfw/group"/>
-      </component>
-      <component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
-        <unit bldFile="supl/locationomasuplprotocolhandler/group"/>
-      </component>
-      <component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
-        <unit bldFile="supl/supltiapiimplementation/group"/>
-      </component>
-    </collection>
-    <collection id="locationtriggering" name="Location Triggering" level="server">
-      <component id="ltlogger" filter="s60" name="LT Logger">
-        <unit bldFile="locationtriggering/ltlogger/group"/>
-      </component>
-      <component id="ltclientlib" filter="s60" name="LT Client Library">
-        <unit bldFile="locationtriggering/ltclientlib/group"/>
-      </component>
-      <component id="ltmanagementlib" filter="s60" name="LT Management Library">
-        <unit bldFile="locationtriggering/ltmanagementlib/group"/>
-      </component>
-      <component id="ltcontainer" filter="s60" name="LT Container">
-        <unit bldFile="locationtriggering/ltcontainer/group"/>
-      </component>
-      <component id="ltserver" filter="s60" name="LT Server">
-        <unit bldFile="locationtriggering/ltserver/group"/>
-      </component>
-      <component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
-        <unit bldFile="locationtriggering/ltstrategypluginapi/group"/>
-      </component>
-      <component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
-        <unit bldFile="locationtriggering/ltstrategyengine/group"/>
-      </component>
-      <component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
-        <unit bldFile="locationtriggering/ltmovementdetectionpluginapi/group"/>
-      </component>
-      <component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
-        <unit bldFile="locationtriggering/ltcellidmovementdetector/group"/>
-      </component>
-      <component id="lbtmgmtui" filter="s60" name="LBT Management UI" class="plugin">
-        <unit bldFile="locationtriggering/lbtmgmtui/group"/>
-      </component>
-      <component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
-        <unit bldFile="locationtriggering/ltcontextsourceplugin/group"/>
-      </component>
-      <component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
-      	<!--  should remove #include from this and maybe put exports in the above components -->
-        <unit bldFile="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="locsrv_plat/group"/>
-      </component>
-      <component id="locsrv_pub" filter="s60" class="api" name="Location Services Public Interfaces">
-        <unit bldFile="locsrv_pub/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="locationsrv" 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" href="locsrv_pub/landmarks_search_api/landmarks_search_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_search_api/group"/>
+   </component>
+   <component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/landmarks_api/landmarks_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_api/group"/>
+   </component>
+   <component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/landmarks_database_management_api/landmarks_database_management_api.metaxml"/>
+    <unit bldFile="locsrv_pub/landmarks_database_management_api/group"/>
+   </component>
+   <component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_pub/location_triggering_api/location_triggering_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_pub/blid_application_satellite_info_api/blid_application_satellite_info_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/map_and_navigation_api/map_and_navigation_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/map_and_navigation_provider_discovery_api/map_and_navigation_provider_discovery_api.metaxml"/>
+    <unit bldFile="locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
+   </component>
+   <component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/geocoding_api/geocoding_api.metaxml"/>
+    <unit bldFile="locsrv_plat/geocoding_api/group"/>
+   </component>
+   <component id="map_image_api" name="Map Image API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/map_image_api/map_image_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/map_and_navigation_aiw_api/map_and_navigation_aiw_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/map_and_navigation_provider_api/map_and_navigation_provider_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/landmarks_category_definition_api/landmarks_category_definition_api.metaxml"/>
+    <unit bldFile="locsrv_plat/landmarks_category_definition_api/group"/>
+   </component>
+   <component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
+    <meta rel="Api" href="locsrv_plat/supl_settings_api/supl_settings_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/location_settings_launch_api/location_settings_launch_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/map_image_conversion_plugin_api/map_image_conversion_plugin_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/psy_configuration_ui_plugin_api/psy_configuration_ui_plugin_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/np_proxy_configuration_api/np_proxy_configuration_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/supl_terminal_initiation_api/supl_terminal_initiation_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/location_notation_preferences_settings_api/location_notation_preferences_settings_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/supl_settings_notifier_secondary_display_api/supl_settings_notifier_secondary_display_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/supl_network_initiation_api/supl_network_initiation_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/privacy_notifiers_secondary_display_api/privacy_notifiers_secondary_display_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/oma_supl_configuration_parameter_api/oma_supl_configuration_parameter_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/supl_query_secondary_display_api/supl_query_secondary_display_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/location_triggering_management_api/location_triggering_management_api.metaxml"/>
+    <unit bldFile="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" href="locsrv_plat/location_triggering_status_information_api/location_triggering_status_information_api.metaxml"/>
+    <unit bldFile="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="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" href="locsrv_plat/location_local_variation_api/location_local_variation_api.metaxml"/>
+    <unit bldFile="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="genericpositioningplugins/locationnpppsy/group"/>
+   </component>
+   <component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
+    <unit bldFile="genericpositioningplugins/locationsuplpsy/group"/>
+   </component>
+   <component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
+    <!-- need to break this up into the other components -->
+    <unit bldFile="genericpositioningplugins/group"/>
+   </component>
+  </collection>
+  <collection id="landmarks" name="Landmarks" level="server">
+   <component id="locationlandmarks" filter="s60" name="Location Landmarks">
+    <unit bldFile="landmarks/locationlandmarks/group"/>
+   </component>
+  </collection>
+  <collection id="locationmapnavfw" name="Location Map and Navigation Framework" level="fw">
+   <component id="mnlibrary" filter="s60" name="Map and Navigation Library">
+    <unit bldFile="locationmapnavfw/library/group"/>
+   </component>
+   <component id="mnaiwprovider" filter="s60" name="Map and Navigation AIW Provider" class="plugin">
+    <unit bldFile="locationmapnavfw/aiwprovider/group"/>
+   </component>
+   <component id="locationmapnavfw_build" filter="s60" name="Location Map and Navigation Framework Build">
+    <!-- need to break this up into the other components -->
+    <unit bldFile="locationmapnavfw/group"/>
+   </component>
+  </collection>
+  <collection id="locationsystemui" name="Location System UI" level="if">
+   <component id="locationsysui" filter="s60" name="Location System UI">
+    <unit bldFile="locationsystemui/locationsysui/group"/>
+   </component>
+  </collection>
+  <collection id="supl" name="SUPL" level="fw">
+   <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
+    <unit bldFile="supl/locationsuplfw/group"/>
+   </component>
+   <component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
+    <unit bldFile="supl/locationomasuplprotocolhandler/group"/>
+   </component>
+   <component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
+    <unit bldFile="supl/supltiapiimplementation/group"/>
+   </component>
+  </collection>
+  <collection id="locationtriggering" name="Location Triggering" level="server">
+   <component id="ltlogger" filter="s60" name="LT Logger">
+    <unit bldFile="locationtriggering/ltlogger/group"/>
+   </component>
+   <component id="ltclientlib" filter="s60" name="LT Client Library">
+    <unit bldFile="locationtriggering/ltclientlib/group"/>
+   </component>
+   <component id="ltmanagementlib" filter="s60" name="LT Management Library">
+    <unit bldFile="locationtriggering/ltmanagementlib/group"/>
+   </component>
+   <component id="ltcontainer" filter="s60" name="LT Container">
+    <unit bldFile="locationtriggering/ltcontainer/group"/>
+   </component>
+   <component id="ltserver" filter="s60" name="LT Server">
+    <unit bldFile="locationtriggering/ltserver/group"/>
+   </component>
+   <component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
+    <unit bldFile="locationtriggering/ltstrategypluginapi/group"/>
+   </component>
+   <component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
+    <unit bldFile="locationtriggering/ltstrategyengine/group"/>
+   </component>
+   <component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
+    <unit bldFile="locationtriggering/ltmovementdetectionpluginapi/group"/>
+   </component>
+   <component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
+    <unit bldFile="locationtriggering/ltcellidmovementdetector/group"/>
+   </component>
+   <component id="lbtmgmtui" filter="s60" name="LBT Management UI" class="plugin">
+    <unit bldFile="locationtriggering/lbtmgmtui/group"/>
+   </component>
+   <component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
+    <unit bldFile="locationtriggering/ltcontextsourceplugin/group"/>
+   </component>
+   <component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
+    <!--  should remove #include from this and maybe put exports in the above components -->
+    <unit bldFile="locationtriggering/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/mds/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/mds/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,43 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
+            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+            <unit bldFile="/sf/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="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group" filter="test,api_test"/>
+            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group" filter="test,api_test"/>
+            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group" filter="test,api_test"/>
+            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group" filter="test,api_test"/>
+            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group" filter="test,api_test"/>
+          </component>
+          <component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
+            <unit bldFile="/sf/mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/mds/mds_plat/location_manager_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
+            <unit bldFile="/sf/mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/mds/mds_plat/metadata_engine_api/tsrc/group" filter="test,api_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="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/mds/mds_pub/content_listing_framework_api/tsrc/group" filter="test,api_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="/sf/mw/mds/metadataengine/common/group"/>
@@ -160,25 +197,6 @@
           </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="/sf/mw/mds/mds_pub/group"/>
-          </component>
-          <component name="mds_plat" filter="s60" long-name="Metadata Services Platform Interfaces" introduced="^2" class="api">
-            <unit bldFile="/sf/mw/mds/mds_plat/group"/>
-          </component>
-          <component name="mds_api_tests" filter="s60,test,api_test" long-name="Metadata Services API Tests" purpose="development" introduced="^2">
-            <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/location_manager_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/mds/mds_plat/metadata_engine_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/mds/mds_pub/content_listing_framework_api/tsrc/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="/sf/mw/mds/group"/>

--- a/symbian3/mw/mds/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/mds/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,115 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="mds" name="Metadata Services" levels="mgr eng server int">
-    <collection id="metadataengine" name="Metadata Engine" level="eng">
-      <component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
-        <unit bldFile="metadataengine/common/group"/>
-      </component>
-      <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
-        <unit bldFile="metadataengine/server/group"/>
-      </component>
-      <component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
-        <unit bldFile="metadataengine/client/group"/>
-      </component>
-      <component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
-      	<!--make this collection a single component, or split this bld.inf into the other units  -->
-        <unit bldFile="metadataengine/group"/>
-      </component>
-    </collection>
-    <collection id="locationmanager" name="Location Manager" level="mgr">
-      <component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
-        <unit bldFile="locationmanager/locationtrail/group"/>
-      </component>
-      <component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
-        <unit bldFile="locationmanager/server/group"/>
-      </component>
-      <component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
-        <unit bldFile="locationmanager/client/group"/>
-      </component>
-      <component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
-      	<!--make this collection a single component, or split this bld.inf into the other units  -->
-        <unit bldFile="locationmanager/group"/>
-      </component>
-    </collection>
-    <collection id="contextengine" name="Context Engine" level="eng">
-      <component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
-        <unit bldFile="contextengine/plugins/group"/>
-      </component>
-      <component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
-      	<!--make this collection a single component, or make this unit self-contained  -->
-        <unit bldFile="contextengine/group"/>
-      </component>
-    </collection>
-    <collection id="harvester" name="Harvester" level="eng">
-      <component id="blacklistclient" filter="s60" name="Blacklist Client" introduced="^2">
-        <unit bldFile="harvester/blacklistclient/group"/>
-      </component>
-      <component id="blacklistserver" filter="s60" name="Blacklist Server" introduced="^2">
-        <unit bldFile="harvester/blacklistserver/group"/>
-      </component>
-      <component id="harvester_common" filter="s60" name="Harvester Common" introduced="^2">
-        <unit bldFile="harvester/common/group"/>
-      </component>
-      <component id="composerplugins" filter="s60" name="Composer Plugins" class="plugin" introduced="^2">
-        <unit bldFile="harvester/composerplugins/group"/>
-      </component>
-      <component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
-        <unit bldFile="harvester/harvesterplugins/group"/>
-      </component>
-      <component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
-        <unit bldFile="harvester/monitorplugins/group"/>
-      </component>
-      <component id="harvester_server" filter="s60" name="Harvester Server" introduced="^2">
-        <unit bldFile="harvester/server/group"/>
-      </component>
-      <component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
-        <unit bldFile="harvester/client/group"/>
-      </component>
-      <component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
-      	<!-- split these exports into the other components -->
-        <unit bldFile="harvester/group"/>
-      </component>
-    </collection>
-    <collection id="watchdog" name="Watchdog" level="server">
-    	<!-- collection is really a component. Move down a directory -->
-      <component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
-        <unit bldFile="watchdog/group"/>
-      </component>
-    </collection>
-    <collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
-    	<!-- collection is really a component. Move down a directory -->
-     	<meta rel="config">
-     		<defined condition="RD_MDS_2_5"/>
-     	</meta>
-      <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
-		  <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-        <!--<unit bldFile="clfwrapper/group"/>-->
-      </component>
-    </collection>
-    <collection id="mds_info" name="Metadata Services Info" level="int">
-      <component id="mds_pub" filter="s60" name="Metadata Services Public Interfaces" class="api" introduced="^2">
-        <unit bldFile="mds_pub/group"/>
-      </component>
-      <component id="mds_plat" filter="s60" name="Metadata Services Platform Interfaces" class="api" introduced="^2">
-        <unit bldFile="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="mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/>
-        <unit bldFile="mds_plat/context_engine_plugin_api/tsrc/group"/>
-        <unit bldFile="mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/>
-        <unit bldFile="mds_plat/harvester_framework_api/tsrc/group"/>
-        <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/>
-        <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/>
-        <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/>
-        <unit bldFile="mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/>
-        <unit bldFile="mds_plat/location_manager_api/tsrc/group"/>
-        <unit bldFile="mds_plat/metadata_engine_api/tsrc/group"/>
-        <unit bldFile="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="group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="mds" 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" href="mds_plat/context_engine_plugin_api/context_engine_plugin_api.metaxml"/>
+    <unit bldFile="mds_plat/context_engine_plugin_api/group" filter="!test"/>
+    <unit bldFile="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" href="mds_plat/harvester_framework_api/harvester_framework_api.metaxml"/>
+    <unit bldFile="mds_plat/harvester_framework_api/group" filter="!test"/>
+    <unit bldFile="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="mds_plat/harvester_framework_api/tsrc/composerplugintest/group" filter="test,api_test"/>
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group" filter="test,api_test"/>
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group" filter="test,api_test"/>
+    <unit bldFile="mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group" filter="test,api_test"/>
+    <unit bldFile="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" href="mds_plat/location_manager_api/location_manager_api.metaxml"/>
+    <unit bldFile="mds_plat/location_manager_api/group" filter="!test"/>
+    <unit bldFile="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" href="mds_plat/metadata_engine_api/metadata_engine_api.metaxml"/>
+    <unit bldFile="mds_plat/metadata_engine_api/group" filter="!test"/>
+    <unit bldFile="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" href="mds_plat/content_listing_framework_collection_manager_api/content_listing_framework_collection_manager_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+    <unit bldFile="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" href="mds_plat/content_listing_framework_extended_api/content_listing_framework_extended_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="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" href="mds_pub/content_listing_framework_api/content_listing_framework_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="RD_MDS_2_5"/>
+    </meta>
+    <unit bldFile="mds_pub/content_listing_framework_api/group" filter="!test"/>
+    <unit bldFile="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="metadataengine/common/group"/>
+   </component>
+   <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
+    <unit bldFile="metadataengine/server/group"/>
+   </component>
+   <component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
+    <unit bldFile="metadataengine/client/group"/>
+   </component>
+   <component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
+    <!--make this collection a single component, or split this bld.inf into the other units  -->
+    <unit bldFile="metadataengine/group"/>
+   </component>
+  </collection>
+  <collection id="locationmanager" name="Location Manager" level="mgr">
+   <component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
+    <unit bldFile="locationmanager/locationtrail/group"/>
+   </component>
+   <component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
+    <unit bldFile="locationmanager/server/group"/>
+   </component>
+   <component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
+    <unit bldFile="locationmanager/client/group"/>
+   </component>
+   <component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
+    <!--make this collection a single component, or split this bld.inf into the other units  -->
+    <unit bldFile="locationmanager/group"/>
+   </component>
+  </collection>
+  <collection id="contextengine" name="Context Engine" level="eng">
+   <component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
+    <unit bldFile="contextengine/plugins/group"/>
+   </component>
+   <component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
+    <!--make this collection a single component, or make this unit self-contained  -->
+    <unit bldFile="contextengine/group"/>
+   </component>
+  </collection>
+  <collection id="harvester" name="Harvester" level="eng">
+   <component id="blacklistclient" filter="s60" name="Blacklist Client" introduced="^2">
+    <unit bldFile="harvester/blacklistclient/group"/>
+   </component>
+   <component id="blacklistserver" filter="s60" name="Blacklist Server" introduced="^2">
+    <unit bldFile="harvester/blacklistserver/group"/>
+   </component>
+   <component id="harvester_common" filter="s60" name="Harvester Common" introduced="^2">
+    <unit bldFile="harvester/common/group"/>
+   </component>
+   <component id="composerplugins" filter="s60" name="Composer Plugins" class="plugin" introduced="^2">
+    <unit bldFile="harvester/composerplugins/group"/>
+   </component>
+   <component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
+    <unit bldFile="harvester/harvesterplugins/group"/>
+   </component>
+   <component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
+    <unit bldFile="harvester/monitorplugins/group"/>
+   </component>
+   <component id="harvester_server" filter="s60" name="Harvester Server" introduced="^2">
+    <unit bldFile="harvester/server/group"/>
+   </component>
+   <component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
+    <unit bldFile="harvester/client/group"/>
+   </component>
+   <component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
+    <!-- split these exports into the other components -->
+    <unit bldFile="harvester/group"/>
+   </component>
+  </collection>
+  <collection id="watchdog" name="Watchdog" level="server">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
+    <unit bldFile="watchdog/group"/>
+   </component>
+  </collection>
+  <collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
+   <!-- collection is really a component. Move down a directory -->
+   <meta rel="config">
+    <defined condition="RD_MDS_2_5"/>
+   </meta>
+   <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
+    <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+    <!--<unit bldFile="clfwrapper/group"/>-->
+   </component>
+  </collection>
+  <collection id="mds_info" name="Metadata Services Info" level="int">
+   <component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
+    <!-- consider distributiing this into the rest of the components in the package -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/messagingmw/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/messagingmw/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,28 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -138,12 +160,6 @@
           </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="/sf/mw/messagingmw/msgfw_plat/group"/>
-          </component>
-          <component name="msgfw_pub" filter="s60" long-name="Messaging Middleware Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/messagingmw/msgfw_pub/group"/>
-          </component>
           <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
           </component>

--- a/symbian3/mw/messagingmw/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/messagingmw/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,76 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="messagingmw" name="Messaging Middleware" levels="stack fw api">
-    <collection id="msgbranched" name="Messaging Branched" level="fw">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="msgbranched_build" filter="s60" name="Messaging Branched Build">
-        <unit bldFile="msgbranched/group"/>
-      </component>
-    </collection>
-    <collection id="messagingfw" name="Messaging Framework" level="fw">
-    	<!-- should break this collection up into smaller related collections -->
-      <component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
-        <unit bldFile="messagingfw/alwaysonline/group"/>
-      </component>
-      <component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
-        <unit bldFile="messagingfw/msgcommonutils/group"/>
-      </component>
-      <component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2">
-        <unit bldFile="messagingfw/senduiservices/group"/>
-      </component>
-      <component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
-        <unit bldFile="messagingfw/scheduledsendmtm/group" mrp="messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-      </component>
-      <component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
-        <unit bldFile="messagingfw/msgsrvnstore/group" mrp="messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-      </component>
-      <component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
-        <unit bldFile="messagingfw/biomsgfw/group" mrp="messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-      </component>
-      <component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
-        <unit bldFile="messagingfw/msgconf/group" mrp="messagingfw/msgconf/group/messaging_config.mrp"/>
-      </component>
-      <component id="watcherfw" name="Watcher Framework" purpose="optional">
-        <unit bldFile="messagingfw/watcherfw/group" mrp="messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-      </component>
-      <component id="msgtest" name="Messaging Test" purpose="development">
-        <unit bldFile="messagingfw/msgtest/group" mrp="messagingfw/msgtest/group/messaging_test.mrp"/>
-      </component>
-      <component id="msgtests" name="Messaging Tests" purpose="development" filter="test">
-        <unit mrp="messagingfw/msgtests/group/messaging.mrp" bldFile="messagingfw/msgtests/group"/>
-      </component>
-      <component id="msgtestfw" name="Messaging Test Framework" deprecated="^3" purpose="development" filter="test">
-        <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="messagingfw/msgtestfw/group"/>
-      </component>
-      <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
-        <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="messagingfw/msgtestproduct/group"/>
-      </component>
-      <component id="sendas" name="Send As" purpose="optional">
-        <unit bldFile="messagingfw/sendas/group" mrp="messagingfw/sendas/group/messaging_sendas2.mrp"/>
-      </component>
-      <component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
-        <unit bldFile="messagingfw/msgurlhandler/group" mrp="messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-      </component>
-      <component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
-        <unit bldFile="messagingfw/wappushfw/group" mrp="messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-      </component>
-      <component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
-        <unit bldFile="messagingfw/suplsmshandler/group" mrp="messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
-      </component>
-      <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="messagingfw/suplwappushhandler/group" mrp="messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
-      </component>
-    </collection>
-    <collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
-      <component id="msgfw_plat" filter="s60" name="Messaging Middleware Platform Interfaces" class="api">
-        <unit bldFile="msgfw_plat/group"/>
-      </component>
-      <component id="msgfw_pub" filter="s60" name="Messaging Middleware Public Interfaces" class="api">
-        <unit bldFile="msgfw_pub/group"/>
-      </component>
-      <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="messagingmw" 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" href="msgfw_pub/send_ui_api/send_ui_api.metaxml"/>
+    <unit bldFile="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" href="msgfw_plat/always_online_plugin_api/always_online_plugin_api.metaxml"/>
+    <unit bldFile="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" href="msgfw_plat/always_online_client_api/always_online_client_api.metaxml"/>
+    <unit bldFile="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" href="msgfw_plat/msg_common_utils_api/msg_common_utils_api.metaxml"/>
+    <unit bldFile="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" href="msgfw_plat/send_ui_plugin_api/send_ui_plugin_api.metaxml"/>
+    <unit bldFile="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" href="msgfw_plat/send_ui_datautils_api/send_ui_datautils_api.metaxml"/>
+    <unit bldFile="msgfw_plat/send_ui_datautils_api/group"/>
+   </component>
+  </collection>
+  <collection id="msgbranched" name="Messaging Branched" level="fw">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="msgbranched_build" filter="s60" name="Messaging Branched Build">
+    <unit bldFile="msgbranched/group"/>
+   </component>
+  </collection>
+  <collection id="messagingfw" name="Messaging Framework" level="fw">
+   <!-- should break this collection up into smaller related collections -->
+   <component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
+    <unit bldFile="messagingfw/alwaysonline/group"/>
+   </component>
+   <component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
+    <unit bldFile="messagingfw/msgcommonutils/group"/>
+   </component>
+   <component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2">
+    <unit bldFile="messagingfw/senduiservices/group"/>
+   </component>
+   <component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
+    <unit bldFile="messagingfw/scheduledsendmtm/group" mrp="messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+   </component>
+   <component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
+    <unit bldFile="messagingfw/msgsrvnstore/group" mrp="messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+   </component>
+   <component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+    <unit bldFile="messagingfw/biomsgfw/group" mrp="messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+   </component>
+   <component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
+    <unit bldFile="messagingfw/msgconf/group" mrp="messagingfw/msgconf/group/messaging_config.mrp"/>
+   </component>
+   <component id="watcherfw" name="Watcher Framework" purpose="optional">
+    <unit bldFile="messagingfw/watcherfw/group" mrp="messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+   </component>
+   <component id="msgtest" name="Messaging Test" purpose="development">
+    <unit bldFile="messagingfw/msgtest/group" mrp="messagingfw/msgtest/group/messaging_test.mrp"/>
+   </component>
+   <component id="msgtests" name="Messaging Tests" purpose="development" filter="test">
+    <unit mrp="messagingfw/msgtests/group/messaging.mrp" bldFile="messagingfw/msgtests/group"/>
+   </component>
+   <component id="msgtestfw" name="Messaging Test Framework" deprecated="^3" purpose="development" filter="test">
+    <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="messagingfw/msgtestfw/group"/>
+   </component>
+   <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
+    <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="messagingfw/msgtestproduct/group"/>
+   </component>
+   <component id="sendas" name="Send As" purpose="optional">
+    <unit bldFile="messagingfw/sendas/group" mrp="messagingfw/sendas/group/messaging_sendas2.mrp"/>
+   </component>
+   <component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
+    <unit bldFile="messagingfw/msgurlhandler/group" mrp="messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+   </component>
+   <component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
+    <unit bldFile="messagingfw/wappushfw/group" mrp="messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+   </component>
+   <component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
+    <unit bldFile="messagingfw/suplsmshandler/group" mrp="messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+   </component>
+   <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="messagingfw/suplwappushhandler/group" mrp="messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+   </component>
+  </collection>
+  <collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
+   <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/metadatasrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,19 +77,30 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/metadatasrv/metadatasrv_plat/group"/>
-          </component>
-          <component name="metadatasrv_pub" filter="s60" long-name="Legacy Metadata Services Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/metadatasrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,18 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
-    <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
-      <component id="mediafetch" filter="s60" name="Media Fetch">
-        <unit bldFile="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="metadatasrv_plat/group"/>
-      </component>
-      <component id="metadatasrv_pub" filter="s60" name="Legacy Metadata Services Public Interfaces" class="api">
-        <unit bldFile="metadatasrv_pub/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="metadatasrv" 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="metadatasrv_pub/content_listing_framework_api/group"/>
+   </component>
+   <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
+    <meta rel="Api" href="metadatasrv_pub/media_fetch_api/media_fetch_api.metaxml"/>
+    <unit bldFile="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" href="metadatasrv_plat/media_fetch_implementation_api/media_fetch_implementation_api.metaxml"/>
+    <unit bldFile="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="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="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="mediamanagementutilities/mediafetch/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/mmappfw/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,74 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/mmappfw/mpx/commonframework/group"/>
@@ -142,9 +210,6 @@
           <component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1">
             <unit bldFile="/sf/mw/mmappfw/tsrc/group" filter="TA_MMAPPFW"/>
           </component>
-          <component name="mmappfw_plat" filter="s60" long-name="Multimedia App Framework Platform Interfaces" introduced="^1" class="api">
-            <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/group"/>
-          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/mw/mmappfw/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,80 +1,170 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="mmappfw" name="Multimedia App Framework" levels="fw utils if">
-    <collection id="mpx" name="Multimedia Player" level="fw">
-      <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
-        <unit bldFile="mpx/commonframework/group"/>
-      </component>
-      <component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
-        <unit bldFile="mpx/playbackframework/group"/>
-      </component>
-      <component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
-        <unit bldFile="mpx/collectionframework/group"/>
-      </component>
-      <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
-        <unit bldFile="mpx/viewframework/group"/>
-      </component>
-      <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
-      <!--  Move the export to another component or remove the #includes from this one -->
-        <unit bldFile="mpx/group"/>
-      </component>
-    </collection>
-    <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
-      <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-      	<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+ <package id="mmappfw" 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="mmappfw_plat/inc/mmappfwbldvariant.hrh"/>
+   </component>
+   <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
+    <meta rel="Api" href="mmappfw_plat/collection_helper_api/collection_helper_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/harvester_collection_mediator_api/harvester_collection_mediator_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/harvester_metadata_extractor_api/harvester_metadata_extractor_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/harvester_server_api/harvester_server_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/harvester_utility_api/harvester_utility_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/playlist_engine_api/playlist_engine_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mtp_keys_api/mtp_keys_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_collection_common_definition_api/mpx_collection_common_definition_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_collection_utility_api/mpx_collection_utility_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_common_api/mpx_common_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_common_definition_api/mpx_common_definition_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_playback_common_definition_api/mpx_playback_common_definition_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_playback_utility_api/mpx_playback_utility_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_base_view_plugins_api/mpx_base_view_plugins_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_view_utility_api/mpx_view_utility_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_albumart_utility_api/mpx_albumart_utility_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/media_player_settings_engine_api/media_player_settings_engine_api.metaxml"/>
+    <unit bldFile="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" href="mmappfw_plat/mpx_backstepping_utility_api/mpx_backstepping_utility_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
+    </meta>
+    <unit bldFile="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" href="mmappfw_plat/asx_parser_api/asx_parser_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="__WINDOWS_MEDIA"/>
+    </meta>
+    <unit bldFile="mmappfw_plat/asx_parser_api/group"/>
+   </component>
+   <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
+    <unit bldFile="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="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="mpx/commonframework/group"/>
+   </component>
+   <component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
+    <unit bldFile="mpx/playbackframework/group"/>
+   </component>
+   <component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
+    <unit bldFile="mpx/collectionframework/group"/>
+   </component>
+   <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
+    <unit bldFile="mpx/viewframework/group"/>
+   </component>
+   <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
+    <!--  Move the export to another component or remove the #includes from this one -->
+    <unit bldFile="mpx/group"/>
+   </component>
+  </collection>
+  <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
+   <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
+    <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
-        <unit bldFile="mmappcomponents/group"/>
-      </component>
-      <component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
-        <unit bldFile="mmappcomponents/collectionhelper/group"/>
-      </component>
-      <component id="playlistengine" filter="s60" name="Playlist Engine" introduced="^1">
-        <unit bldFile="mmappcomponents/playlistengine/group"/>
-      </component>
-      <component id="mpxharvester" filter="s60" name="Media Player Harvester" introduced="^1">
-        <unit bldFile="mmappcomponents/harvester/group"/>
-      </component>
-      <component id="mmappcommonui" filter="s60" name="Multimedia App Common UI" introduced="^1">
-        <unit bldFile="mmappcomponents/mmappcommonui/group"/>
-      </component>
-      <component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
-        <unit bldFile="mmappcomponents/mediaplayersettingsengine/group"/>
-      </component>
-      <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
-      	<meta rel="config">
-      		<defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
-      	</meta>
-      	<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-        <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
-      </component>
-      <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
-      	<meta rel="config">
-      		<defined condition="__WINDOWS_MEDIA"/>
-      	</meta>
-      	<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-        <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
-      </component>
-      <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
-        <unit bldFile="mmappcomponents/playbackhelper/group"/>
-      </component>
-      <component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
-        <unit bldFile="mmappcomponents/videoplaylistutility/group"/>
-      </component>
-      <component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
-        <unit bldFile="mmappcomponents/mmmtpdataprovider/group"/>
-      </component>
-    </collection>
-    <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
-      <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
-      <!--  Move the export to another component or remove the #includes from this one -->
-        <unit bldFile="group"/>
-      </component>
-      <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
-        <unit bldFile="tsrc/group" filter="TA_MMAPPFW"/>
-      </component>
-      <component id="mmappfw_plat" filter="s60" name="Multimedia App Framework Platform Interfaces" class="api" introduced="^1">
-        <unit bldFile="mmappfw_plat/group"/>
-      </component>
-    </collection>
-  </package>
+    <unit bldFile="mmappcomponents/group"/>
+   </component>
+   <component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
+    <unit bldFile="mmappcomponents/collectionhelper/group"/>
+   </component>
+   <component id="playlistengine" filter="s60" name="Playlist Engine" introduced="^1">
+    <unit bldFile="mmappcomponents/playlistengine/group"/>
+   </component>
+   <component id="mpxharvester" filter="s60" name="Media Player Harvester" introduced="^1">
+    <unit bldFile="mmappcomponents/harvester/group"/>
+   </component>
+   <component id="mmappcommonui" filter="s60" name="Multimedia App Common UI" introduced="^1">
+    <unit bldFile="mmappcomponents/mmappcommonui/group"/>
+   </component>
+   <component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
+    <unit bldFile="mmappcomponents/mediaplayersettingsengine/group"/>
+   </component>
+   <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
+    <meta rel="config">
+     <defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
+    </meta>
+    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+    <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+   </component>
+   <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
+    <meta rel="config">
+     <defined condition="__WINDOWS_MEDIA"/>
+    </meta>
+    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+    <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+   </component>
+   <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
+    <unit bldFile="mmappcomponents/playbackhelper/group"/>
+   </component>
+   <component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
+    <unit bldFile="mmappcomponents/videoplaylistutility/group"/>
+   </component>
+   <component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
+    <unit bldFile="mmappcomponents/mmmtpdataprovider/group"/>
+   </component>
+  </collection>
+  <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
+   <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
+    <!--  Move the export to another component or remove the #includes from this one -->
+    <unit bldFile="group"/>
+   </component>
+   <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
+    <unit bldFile="tsrc/group" filter="TA_MMAPPFW"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/mmmw/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,81 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/tsrc/group" filter="test,api_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="/sf/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
@@ -137,12 +212,6 @@
           <component name="mmmw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia Middleware Tests" purpose="development">
             <unit bldFile="/sf/mw/mmmw/tsrc/group"/>
           </component>
-          <component name="mmmw_api_test" filter="s60,test,api_test" long-name="Multimedia Middleware API Tests" purpose="development">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
-          </component>
-          <component name="mmmw_plat" filter="s60" long-name="Multimedia Middleware Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/mmmw/mmmw_plat/group"/>
-          </component>
           <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
           </component>

--- a/symbian3/mw/mmmw/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,75 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="mmmw" name="Multimedia Middleware" levels="plugin framework server generic specific">
-  	<collection id="mmfenh" name="MMF Enhancements" level="generic">
-      <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
-        <unit bldFile="mmfenh/advancedaudiocontroller/group"/>
-      </component>
-      <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
-        <unit bldFile="mmfenh/audiooutputcontrolutility/group"/>
-      </component>
-      <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
-        <unit bldFile="mmfenh/configurationcomponentsfactory/group"/>
-      </component>
-      <component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
-        <unit bldFile="mmfenh/enhancedaudioplayerutility/group"/>
-      </component>
-      <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
-        <unit bldFile="mmfenh/enhancedmediaclient/group"/>
-      </component>
-      <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
-        <unit bldFile="mmfenh/profilesettingsmonitor/group"/>
-      </component>
-      <component id="progressivedownload" filter="s60" name="Progressive Download">
-        <unit bldFile="mmfenh/progressivedownload/group"/>
-      </component>
-      <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
-        <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
-      </component>      
-    </collection>
-    <collection id="mm_fw" name="Multimedia Frameworks" level="framework">
-    	<!-- Id needs to be unique, mmfw already in use -->
-    	<!-- Placeholder for OpenAX AL and other stuff -->
-    </collection>
-    <collection id="mmserv" name="Multimedia Services" level="specific">
-      <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
-        <unit bldFile="mmserv/audioeffectsui/group"/>
-      </component>
-      <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
-        <unit bldFile="mmserv/callaudiocontrol/group"/>
-      </component>
-      <component id="metadatautility" filter="s60" name="Metadata Utility">
-        <unit bldFile="mmserv/metadatautility/group"/>
-      </component>
-      <component id="radioutility" filter="s60" name="Radio Utility">
-        <unit bldFile="mmserv/radioutility/group"/>
-      </component>
-      <component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
-        <unit bldFile="mmserv/thumbnailengine/group"/>
-      </component>
-      <component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
-        <unit bldFile="mmserv/tms/group"/>
-      </component>
-      <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
-        <unit bldFile="mmserv/voipaudioservices/group"/>
-      </component>
-      <component id="lib3gpextparser" filter="s60"  name="3GP Extension Metadata Parser Library">
-        <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
-      </component>
-    </collection>    
-    <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
-      <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
-        <unit bldFile="tsrc/group"/>
-      </component>
-      <component id="mmmw_api_test" filter="s60,test,api_test" name="Multimedia Middleware API Tests" purpose="development">
-        <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
-      </component>
-      <component id="mmmw_plat" filter="s60" name="Multimedia Middleware Platform Interfaces" class="api">
-        <unit bldFile="mmmw_plat/group"/>
-      </component>
-      <component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="mmmw" 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" href="mmmw_plat/multimedia_data_source_api/multimedia_data_source_api.metaxml"/>
+    <unit bldFile="mmmw_plat/multimedia_data_source_api/group"/>
+   </component>
+   <component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/progressive_download_api/progressive_download_api.metaxml"/>
+    <unit bldFile="mmmw_plat/progressive_download_api/group"/>
+   </component>
+   <component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/equalizer_ui_api/equalizer_ui_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/enhanced_media_client_api/enhanced_media_client_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/stream_control_custom_command_api/stream_control_custom_command_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/emc_buffer_source_api/emc_buffer_source_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/emc_file_source_api/emc_file_source_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/audio_metadata_reader_api/audio_metadata_reader_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/emc_progressive_download_source_api/emc_progressive_download_source_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/emc_volume_effect_api/emc_volume_effect_api.metaxml"/>
+    <unit bldFile="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="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" href="mmmw_plat/emc_descriptor_source_api/emc_descriptor_source_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/emc_drm_config_intfc_api/emc_drm_config_intfc_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/voip_audio_services_api/voip_audio_services_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/configuration_components_factory_api/configuration_components_factory_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/audio_output_control_utility_api/audio_output_control_utility_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/audio_output_control_utility_proxy_api/audio_output_control_utility_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/emc_audio_effects_api/emc_audio_effects_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/call_audio_control_api/call_audiocontrol_api.metaxml"/>
+    <unit bldFile="mmmw_plat/call_audio_control_api/group"/>
+   </component>
+   <component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/radio_utilities_api/radio_utilities_api.metaxml"/>
+    <unit bldFile="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" href="mmmw_plat/radio_preset_utilities_api/radio_preset_utilities_api.metaxml"/>
+    <unit bldFile="mmmw_plat/radio_preset_utilities_api/group"/>
+   </component>
+   <component id="radio_monitor_api" name="Radio Monitor API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/radio_monitor_api/radio_monitor_api.metaxml"/>
+    <unit bldFile="mmmw_plat/radio_monitor_api/group"/>
+   </component>
+   <component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
+    <meta rel="Api" href="mmmw_plat/thumbnail_engine_api/thumbnail_engine_api.metaxml"/>
+    <unit bldFile="mmmw_plat/thumbnail_engine_api/group"/>
+   </component>
+   <component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
+    <unit bldFile="mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+    <unit bldFile="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="mmfenh/advancedaudiocontroller/group"/>
+   </component>
+   <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
+    <unit bldFile="mmfenh/audiooutputcontrolutility/group"/>
+   </component>
+   <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+    <unit bldFile="mmfenh/configurationcomponentsfactory/group"/>
+   </component>
+   <component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
+    <unit bldFile="mmfenh/enhancedaudioplayerutility/group"/>
+   </component>
+   <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
+    <unit bldFile="mmfenh/enhancedmediaclient/group"/>
+   </component>
+   <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
+    <unit bldFile="mmfenh/profilesettingsmonitor/group"/>
+   </component>
+   <component id="progressivedownload" filter="s60" name="Progressive Download">
+    <unit bldFile="mmfenh/progressivedownload/group"/>
+   </component>
+   <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
+    <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
+   </component>
+  </collection>
+  <collection id="mm_fw" name="Multimedia Frameworks" level="framework">
+   <!-- Id needs to be unique, mmfw already in use -->
+   <!-- Placeholder for OpenAX AL and other stuff -->
+  </collection>
+  <collection id="mmserv" name="Multimedia Services" level="specific">
+   <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
+    <unit bldFile="mmserv/audioeffectsui/group"/>
+   </component>
+   <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
+    <unit bldFile="mmserv/callaudiocontrol/group"/>
+   </component>
+   <component id="metadatautility" filter="s60" name="Metadata Utility">
+    <unit bldFile="mmserv/metadatautility/group"/>
+   </component>
+   <component id="radioutility" filter="s60" name="Radio Utility">
+    <unit bldFile="mmserv/radioutility/group"/>
+   </component>
+   <component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+    <unit bldFile="mmserv/thumbnailengine/group"/>
+   </component>
+   <component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
+    <unit bldFile="mmserv/tms/group"/>
+   </component>
+   <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
+    <unit bldFile="mmserv/voipaudioservices/group"/>
+   </component>
+   <component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
+    <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+   </component>
+  </collection>
+  <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
+   <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/mmuifw/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/mmuifw/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -76,11 +76,58 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
-      <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
+          </component>
+          <component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/mmuifw/group"/>

--- a/symbian3/mw/mmuifw/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/mmuifw/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,68 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="mmuifw" name="Multimedia UI Framework" levels="mgr mdl util ui">
-    <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="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="group"/>
-      </component>
-    </collection>
-    <collection id="osncore" name="OS Neutral Library Core" level="util">
-    	<!-- collection is really a component. Move down a directory -->
-      <component id="osncore_build" filter="s60" name="OSN Core Build">
-        <unit bldFile="osncore/group"/>
-      </component>
-    </collection>
-    <collection id="alfwidgetutils" name="Accelerated LAF Widget Utils" level="ui">
-    	<!-- collection is really a component. Move down a directory -->
-      <component id="alfwidgetutils_build" filter="s60" name="ALF Widget Utils">
-        <unit bldFile="alfwidgetutils/group"/>
-      </component>
-    </collection>
-    <collection id="resourcepool" name="Resource Pool" level="util">
-    	<!-- collection is really a component. Move down a directory -->
-      <component id="alfresourcepool" filter="s60" name="ALF Resource Pool">
-        <unit bldFile="resourcepool/group"/>
-      </component>
-    </collection>
-    <collection id="widgetmodel" name="Widget Model" level="mdl">
-    	<!-- collection is really a component. Move down a directory -->
-      <component id="widgetmodel_build" filter="s60" name="Widget Model Build">
-        <unit bldFile="widgetmodel/group"/>
-      </component>
-    </collection>
-    <collection id="mulwidgets" name="MUL Widgets" level="ui">
-    	<!-- should spell out MUL in the collection name -->
-      <component id="mullogging" filter="s60" name="MUL Logging">
-        <unit bldFile="mulwidgets/mullogging/group"/>
-      </component>
-      <component id="muldatamodel" filter="s60" name="MUL Data Model">
-        <unit bldFile="mulwidgets/muldatamodel/group"/>
-      </component>
-      <component id="mulwidgets_common" filter="s60" name="MUL Common Utils">
-        <unit bldFile="mulwidgets/common/group"/>
-      </component>
-      <component id="gesturehelper" filter="s60" name="Gesture Helper">
-        <unit bldFile="mulwidgets/gesturehelper/group"/>
-      </component>
-      <component id="mulcoverflowwidget" filter="s60" name="MUL CoverFlow Widget">
-        <unit bldFile="mulwidgets/mulcoverflowwidget/group"/>
-      </component>
-      <component id="mulsliderwidget" filter="s60" name="MUL Slider Widget">
-        <unit bldFile="mulwidgets/mulsliderwidget/group"/>
-      </component>
-      <component id="alfviewwidget" filter="s60" name="ALF View Widget">
-        <unit bldFile="mulwidgets/alfviewwidget/group"/>
-      </component>
-      <component id="alfcontainerwidget" filter="s60" name="ALF Container Widget">
-        <unit bldFile="mulwidgets/alfcontainerwidget/group"/>
-      </component>
-      <component id="alfscrollbarwidget" filter="s60" name="ALF Scrollbar Widget">
-        <unit bldFile="mulwidgets/alfscrollbarwidget/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="mmuifw" 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" href="mmuifw_plat/alf_widgetfactory_api/alf_widgetfactory_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/alf_widgetfactory_api/group"/>
+   </component>
+   <component id="alf_widgetutils_api" name="ALF Widget Utils API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/alf_widgetutils_api/alf_widgetutils_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/alf_widgetutils_api/group"/>
+   </component>
+   <component id="alf_widgetmodel_api" name="ALF Widget Model API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/alf_widgetmodel_api/alf_widgetmodel_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/alf_widgetmodel_api/group"/>
+   </component>
+   <component id="osn_container_api" name="OSN Container API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/osn_container_api/osn_container_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/osn_container_api/group"/>
+   </component>
+   <component id="osn_global_api" name="OSN Global API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/osn_global_api/osn_global_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/osn_global_api/group"/>
+   </component>
+   <component id="osn_string_api" name="OSN String API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/osn_string_api/osn_string_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/osn_string_api/group"/>
+   </component>
+   <component id="alf_resourcepool_api" name="ALF Resource Pool API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/alf_resourcepool_api/alf_resourcepool_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/alf_resourcepool_api/group"/>
+   </component>
+   <component id="alf_containerwidget_api" name="ALF Container Widget API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/alf_containerwidget_api/alf_containerwidget_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/alf_containerwidget_api/group"/>
+   </component>
+   <component id="alf_viewwidget_api" name="ALF View Widget API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/alf_viewwidget_api/alf_viewwidget_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/alf_viewwidget_api/group"/>
+   </component>
+   <component id="alf_scrollbarwidget_api" name="ALF Scrollbar Widget API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/alf_scrollbarwidget_api/alf_scrollbarwidget_api.metaxml"/>
+    <unit bldFile="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" href="mmuifw_plat/alf_customlayoutmanagers_api/alf_customlayoutmanagers_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/alf_customlayoutmanagers_api/group"/>
+   </component>
+   <component id="gesturehelper_api" name="Gesture Helper API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/gesturehelper_api/gesturehelper_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/gesturehelper_api/group"/>
+   </component>
+   <component id="mul_coverflowwidget_api" name="MUL Coverflow Widget API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/mul_coverflowwidget_api/mul_coverflowwidget_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/mul_coverflowwidget_api/group"/>
+   </component>
+   <component id="mul_datamodel_api" name="MUL Data Model API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/mul_datamodel_api/mul_datamodel_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/mul_datamodel_api/group"/>
+   </component>
+   <component id="mul_sliderwidget_api" name="MUL Slider Widget API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/mul_sliderwidget_api/mul_sliderwidget_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/mul_sliderwidget_api/group"/>
+   </component>
+   <component id="mul_widget_api" name="MUL Widget API" class="api" filter="s60">
+    <meta rel="Api" href="mmuifw_plat/mul_widget_api/mul_widget_api.metaxml"/>
+    <unit bldFile="mmuifw_plat/mul_widget_api/group"/>
+   </component>
+  </collection>
+  <collection id="mmuifw_info" name="Multimedia UI Framework Info" level="ui">
+   <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="group"/>
+   </component>
+  </collection>
+  <collection id="osncore" name="OS Neutral Library Core" level="util">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="osncore_build" filter="s60" name="OSN Core Build">
+    <unit bldFile="osncore/group"/>
+   </component>
+  </collection>
+  <collection id="alfwidgetutils" name="Accelerated LAF Widget Utils" level="ui">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="alfwidgetutils_build" filter="s60" name="ALF Widget Utils">
+    <unit bldFile="alfwidgetutils/group"/>
+   </component>
+  </collection>
+  <collection id="resourcepool" name="Resource Pool" level="util">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="alfresourcepool" filter="s60" name="ALF Resource Pool">
+    <unit bldFile="resourcepool/group"/>
+   </component>
+  </collection>
+  <collection id="widgetmodel" name="Widget Model" level="mdl">
+   <!-- collection is really a component. Move down a directory -->
+   <component id="widgetmodel_build" filter="s60" name="Widget Model Build">
+    <unit bldFile="widgetmodel/group"/>
+   </component>
+  </collection>
+  <collection id="mulwidgets" name="MUL Widgets" level="ui">
+   <!-- should spell out MUL in the collection name -->
+   <component id="mullogging" filter="s60" name="MUL Logging">
+    <unit bldFile="mulwidgets/mullogging/group"/>
+   </component>
+   <component id="muldatamodel" filter="s60" name="MUL Data Model">
+    <unit bldFile="mulwidgets/muldatamodel/group"/>
+   </component>
+   <component id="mulwidgets_common" filter="s60" name="MUL Common Utils">
+    <unit bldFile="mulwidgets/common/group"/>
+   </component>
+   <component id="gesturehelper" filter="s60" name="Gesture Helper">
+    <unit bldFile="mulwidgets/gesturehelper/group"/>
+   </component>
+   <component id="mulcoverflowwidget" filter="s60" name="MUL CoverFlow Widget">
+    <unit bldFile="mulwidgets/mulcoverflowwidget/group"/>
+   </component>
+   <component id="mulsliderwidget" filter="s60" name="MUL Slider Widget">
+    <unit bldFile="mulwidgets/mulsliderwidget/group"/>
+   </component>
+   <component id="alfviewwidget" filter="s60" name="ALF View Widget">
+    <unit bldFile="mulwidgets/alfviewwidget/group"/>
+   </component>
+   <component id="alfcontainerwidget" filter="s60" name="ALF Container Widget">
+    <unit bldFile="mulwidgets/alfcontainerwidget/group"/>
+   </component>
+   <component id="alfscrollbarwidget" filter="s60" name="ALF Scrollbar Widget">
+    <unit bldFile="mulwidgets/alfscrollbarwidget/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/netprotocols/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/netprotocols/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,17 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
@@ -144,9 +155,6 @@
           </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="/sf/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="/sf/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
           </component>

--- a/symbian3/mw/netprotocols/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/netprotocols/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,79 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="netprotocols" name="High-level Internet Protocols" levels="plugin framework server generic specific">
-    <collection id="httpfilters" name="HTTP Filters" level="plugin">
-      <component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
-        <unit bldFile="httpfilters/httpfiltercommon/group"/>
-      </component>
-      <component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
-        <unit bldFile="httpfilters/cookie/group"/>
-      </component>
-      <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
-        <unit bldFile="httpfilters/deflatefilter/group"/>
-      </component>
-      <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
-        <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
-      </component>
-      <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
-        <unit bldFile="httpfilters/httpfilterauthentication/group"/>
-      </component>
-      <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
-        <unit bldFile="httpfilters/httpfilterconnhandler/group"/>
-      </component>
-      <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
-        <unit bldFile="httpfilters/httpfilteriop/group"/>
-      </component>
-      <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
-        <unit bldFile="httpfilters/httpfilterproxy/group"/>
-      </component>
-      <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
-        <unit bldFile="httpfilters/uaproffilter/group"/>
-      </component>
-    </collection>
-    <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
-      <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
-        <unit bldFile="applayerprotocols/httptransportfw/group" mrp="applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-      </component>
-      <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
-        <unit bldFile="applayerprotocols/httpexamples/group" mrp="applayerprotocols/httpexamples/group/http_examples.mrp"/>
-      </component>
-      <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
-        <unit bldFile="applayerprotocols/wappushsupport/Group" mrp="applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-      </component>
-      <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
-        <unit bldFile="applayerprotocols/wapbase/Group" mrp="applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-      </component>
-      <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
-        <unit bldFile="applayerprotocols/ftpengine/group" mrp="applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-      </component>
-      <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
-        <unit bldFile="applayerprotocols/telnetengine/group" mrp="applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-      </component>
-      <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
-        <unit bldFile="applayerprotocols/httpservice/group" mrp="applayerprotocols/httpservice/group/http_service.mrp"/>
-      </component>
-    </collection>
-    <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
-      <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
-        <unit bldFile="applayerpluginsandutils/uripermissionservices/group" mrp="applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-      </component>
-      <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
-        <unit bldFile="applayerpluginsandutils/bookmarksupport/group" mrp="applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-      </component>
-      <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
-        <unit bldFile="applayerpluginsandutils/httpprotocolplugins/group" mrp="applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-      </component>
-      <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
-        <unit bldFile="applayerpluginsandutils/httptransportplugins/group" mrp="applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-      </component>
-    </collection>
-    <collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
-      <component id="netprotocols_plat" filter="s60" name="High-level Internet Protocols Platform Interfaces" class="api">
-        <unit bldFile="netprotocols_plat/group"/>
-      </component>
-      <component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="netprotocols" 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" href="netprotocols_plat/cookie_manager_api/cookie_manager_api.metaxml"/>
+    <unit bldFile="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" href="netprotocols_plat/http_cache_mgr_api/http_cache_mgr_api.metaxml"/>
+    <unit bldFile="netprotocols_plat/http_cache_mgr_api/group"/>
+   </component>
+   <component id="http_filters_api" name="HTTP Filters API" class="api" filter="s60">
+    <meta rel="Api" href="netprotocols_plat/http_filters_api/http_filters_api.metaxml"/>
+    <unit bldFile="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="httpfilters/httpfiltercommon/group"/>
+   </component>
+   <component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
+    <unit bldFile="httpfilters/cookie/group"/>
+   </component>
+   <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
+    <unit bldFile="httpfilters/deflatefilter/group"/>
+   </component>
+   <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+    <unit bldFile="httpfilters/httpfilteracceptheader/group"/>
+   </component>
+   <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
+    <unit bldFile="httpfilters/httpfilterauthentication/group"/>
+   </component>
+   <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
+    <unit bldFile="httpfilters/httpfilterconnhandler/group"/>
+   </component>
+   <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
+    <unit bldFile="httpfilters/httpfilteriop/group"/>
+   </component>
+   <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
+    <unit bldFile="httpfilters/httpfilterproxy/group"/>
+   </component>
+   <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+    <unit bldFile="httpfilters/uaproffilter/group"/>
+   </component>
+  </collection>
+  <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
+   <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+    <unit bldFile="applayerprotocols/httptransportfw/group" mrp="applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+   </component>
+   <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+    <unit bldFile="applayerprotocols/httpexamples/group" mrp="applayerprotocols/httpexamples/group/http_examples.mrp"/>
+   </component>
+   <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+    <unit bldFile="applayerprotocols/wappushsupport/Group" mrp="applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+   </component>
+   <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+    <unit bldFile="applayerprotocols/wapbase/Group" mrp="applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+   </component>
+   <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+    <unit bldFile="applayerprotocols/ftpengine/group" mrp="applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+   </component>
+   <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+    <unit bldFile="applayerprotocols/telnetengine/group" mrp="applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+   </component>
+   <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+    <unit bldFile="applayerprotocols/httpservice/group" mrp="applayerprotocols/httpservice/group/http_service.mrp"/>
+   </component>
+  </collection>
+  <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
+   <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+    <unit bldFile="applayerpluginsandutils/uripermissionservices/group" mrp="applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+   </component>
+   <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+    <unit bldFile="applayerpluginsandutils/bookmarksupport/group" mrp="applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+   </component>
+   <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+    <unit bldFile="applayerpluginsandutils/httpprotocolplugins/group" mrp="applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+   </component>
+   <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+    <unit bldFile="applayerpluginsandutils/httptransportplugins/group" mrp="applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+   </component>
+  </collection>
+  <collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
+   <component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/opensrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/opensrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,11 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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">
@@ -107,11 +112,6 @@
             <unit bldFile="/sf/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="/sf/mw/opensrv/opensrv_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/opensrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/opensrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="opensrv" name="Open Services" levels="prt lib server eng">
-    <collection id="loudmouth" name="Loudmouth" level="prt">
-    	<!-- collection is really a component so it needs to be moved down a directory -->
-      <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
-        <unit bldFile="loudmouth/group"/>
-      </component>
-    </collection>
-    <collection id="libtelepathy" name="Telepathy Library" level="lib">
-    	<!-- collection is really a component so it needs to be moved down a directory -->
-      <component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
-        <unit bldFile="libtelepathy/group"/>
-      </component>
-    </collection>
-    <collection id="telepathygabble" name="Telepathy Gabble" level="eng">
-    	<!-- collection is really a component so it needs to be moved down a directory -->
-      <component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
-        <unit bldFile="telepathygabble/group"/>
-      </component>
-    </collection>
-    <collection id="isolationserver" name="Isolation Server" level="server">
-      <component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
-        <unit bldFile="isolationserver/messagequeue/group"/>
-      </component>
-      <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
-        <unit bldFile="isolationserver/isoserver/group"/>
-      </component>
-      <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
-      	<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-        <unit bldFile="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="opensrv_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="opensrv" 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="opensrv_plat/messagequeue_api/group"/>
+   </component>
+  </collection>
+  <collection id="loudmouth" name="Loudmouth" level="prt">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
+    <unit bldFile="loudmouth/group"/>
+   </component>
+  </collection>
+  <collection id="libtelepathy" name="Telepathy Library" level="lib">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
+    <unit bldFile="libtelepathy/group"/>
+   </component>
+  </collection>
+  <collection id="telepathygabble" name="Telepathy Gabble" level="eng">
+   <!-- collection is really a component so it needs to be moved down a directory -->
+   <component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
+    <unit bldFile="telepathygabble/group"/>
+   </component>
+  </collection>
+  <collection id="isolationserver" name="Isolation Server" level="server">
+   <component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
+    <unit bldFile="isolationserver/messagequeue/group"/>
+   </component>
+   <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
+    <unit bldFile="isolationserver/isoserver/group"/>
+   </component>
+   <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
+    <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
+    <unit bldFile="isolationserver/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/phonesrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/phonesrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,127 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/phonesrv/telutils/phoneparser/group"/>
@@ -194,20 +315,9 @@
           </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="/sf/mw/phonesrv/phonesrv_plat/group"/>
-          </component>
-          <component name="phonesrv_pub" filter="s60" long-name="Telephony and SIM Services Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_pub/group"/>
-          </component>
           <component name="phonesrv_test" filter="s60,test,api_test" long-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 bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group"/>
             <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
-            <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group"/>
           </component>
         </collection>
       </block>

--- a/symbian3/mw/phonesrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/phonesrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,138 +1,284 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
-    <collection id="telutils" name="Telephony Utils" level="generic">
-      <component id="phoneparser" filter="s60" name="Phone Parser">
-        <unit bldFile="telutils/phoneparser/group"/>
-      </component>
-      <component id="telephonyservice" filter="s60" name="Telephony Service">
-        <unit bldFile="telutils/telephonyservice/group"/>
-      </component>
-    </collection>
-    <collection id="cbs" name="Cellular Baseband Services" level="plugin">
-      <component id="cbsserver" filter="s60" name="CBS Server">
-        <unit bldFile="cbs/cbsserver/group"/>
-      </component>
-      <component id="cbsui" filter="s60" name="CBS UI">
-        <unit bldFile="cbs/cbsui/group"/>
-      </component>
-    </collection>
-    <collection id="cellular" name="Cellular" level="server">
-      <component id="telephonysettings" filter="s60" name="Telephony Settings">
-        <unit bldFile="cellular/telephonysettings/group"/>
-      </component>
-      <component id="sssettings" filter="s60" name="Supplementary Service Settings">
-        <unit bldFile="cellular/sssettings/group"/>
-      </component>
-      <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
-        <unit bldFile="cellular/psetnotesui/group"/>
-      </component>
-      <component id="servicerequest" filter="s60" name="Service Request">
-        <unit bldFile="cellular/servicerequest/group"/>
-      </component>
-      <component id="cellular_test" filter="s60,test,api_test" name="Cellular Tests" purpose="development">
-      	<!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
-        <unit unitID="tedo.PsetNotesUi.test" bldFile="cellular/PsetNotesUi/tsrc/public/basic/group"/>
-        <unit unitID="tedo.SSSettings.test" bldFile="cellular/SSSettings/tsrc/public/basic/group"/>
-        <unit unitID="tedo.telephonysettings.test" bldFile="cellular/telephonysettings/tsrc/public/basic/group"/>
-      </component>
-    </collection>
-    <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
-      <component id="callprovider" filter="s60" name="Call Provider">
-        <unit bldFile="convergedcallengine/callprovider/group"/>
-      </component>
-      <component id="cce" filter="s60" name="CCE">
-        <unit bldFile="convergedcallengine/cce/group"/>
-      </component>
-      <component id="spsettings" filter="s60" name="Service Provider Settings">
-        <unit bldFile="convergedcallengine/spsettings/group"/>
-      </component>
-      <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
-        <unit bldFile="convergedcallengine/cenrepdatabase/group"/>
-      </component>
-      <component id="serviceselector" filter="s60" name="Service Selector">
-        <unit bldFile="convergedcallengine/serviceselector/group"/>
-      </component>
-      <component id="csplugin" filter="s60" name="CS Plugin" class="plugin">
-      	<!--  should spell out CS in name -->
-        <unit bldFile="convergedcallengine/csplugin/group"/>
-      </component>
-      <component id="convergedcallengine_test" filter="s60,test,api_test" name="CCE Tests" purpose="development">
-      	<!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
-        <unit unitID="tedo.cce.test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
-        <unit unitID="tedo.spsettings.test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
-      </component>
-    </collection>
-    <collection id="engines" name="Telephony Engines" level="specific">
-      <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
-        <unit bldFile="engines/vmbxengine/group"/>
-      </component>
-    </collection>
-    <collection id="networkhandling" name="Network Handling" level="plugin">
-      <component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
-        <unit bldFile="networkhandling/networkhandlingengine/group"/>
-      </component>
-    </collection>
-    <collection id="phoneclientserver" name="Phone Client/Server" level="server">
-      <component id="enpolicy" filter="s60" name="Emergency Number Policy">
-        <unit bldFile="phoneclientserver/enpolicy/group"/>
-      </component>
-      <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
-        <unit bldFile="phoneclientserver/aiwdialdata/group"/>
-      </component>
-      <component id="dialutils" filter="s60" name="Dial Utils">
-        <unit bldFile="phoneclientserver/dialutils/group"/>
-      </component>
-      <component id="phoneclient" filter="s60" name="Phone Client">
-        <unit bldFile="phoneclientserver/phoneclient/group"/>
-      </component>
-      <component id="phoneserver" filter="s60" name="Phone Server">
-        <unit bldFile="phoneclientserver/phoneserver/group"/>
-      </component>
-      <component id="callui" filter="s60" name="Call UI">
-        <unit bldFile="phoneclientserver/callui/group"/>
-      </component>
-      <component id="phoneclientserver_test" filter="s60,test,api_test" name="Phone Client/Server Tests" purpose="development">
-      	<!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
-        <unit unitID="tedo.aiwdialdata.test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
-        <unit unitID="tedo.dialutils.test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
-        <unit unitID="tedo.phoneclient.test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
-      </component>
-    </collection>
-    <collection id="satengine" name="SIM Application Toolkit Engine" level="generic">
-      <component id="satserver" filter="s60" name="SAT Server">
-        <unit bldFile="satengine/satserver/group"/>
-      </component>
-    </collection>
-    <collection id="satui" name="SIM Application Toolkit UI" level="specific">
-      <component id="satapp" filter="s60" name="SAT Application">
-        <unit bldFile="satui/satapp/group"/>
-      </component>
-      <component id="satplugin" filter="s60" name="SAT Plugin" class="plugin">
-        <unit bldFile="satui/satplugin/group"/>
-      </component>
-    </collection>
-    <collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
-      <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
-        <unit bldFile="phonecmdhandler/phonecmdhnlr/group"/>
-      </component>
-    </collection>
-    <collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
-      <component id="phonesrv_plat" filter="s60" name="Telephony and SIM Services Platform Interfaces" class="api">
-        <unit bldFile="phonesrv_plat/group"/>
-      </component>
-      <component id="phonesrv_pub" filter="s60" name="Telephony and SIM Services Public Interfaces" class="api">
-        <unit bldFile="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="phonesrv_plat/call_information_api/tsrc/group"/>
-		<unit unitID="tedo.sat_client_api.test" bldFile="phonesrv_plat/sat_client_api/tsrc/group"/>
-        <unit unitID="tedo.sat_refresh_api.test" bldFile="phonesrv_plat/sat_refresh_api/tsrc/group"/>
-        <unit unitID="tedo.sat_service_api.test" bldFile="phonesrv_plat/sat_service_api/tsrc/group"/>
-        <unit unitID="tedo.telephony_mediator_api.test" bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/> 		
-		<unit unitID="tedo.call_remote_party_information_api.test" bldFile="phonesrv_plat/call_remote_party_information_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="phonesrv" 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" href="phonesrv_plat/string_parser_api/string_parser_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/cbs_mcn_client_api/cbs_mcn_client_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/converged_call_engine_api/converged_call_engine_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/aiw_dial_data_consumer_api/aiw_dial_data_consumer_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_ussd_api/phone_client_ussd_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_ussd_api/group"/>
+   </component>
+   <component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_refresh_api/sat_refresh_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+    <unit unitID="tedo.sat_refresh_api.test" bldFile="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" href="phonesrv_plat/network_handling_engine_api/network_handling_engine_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_emergency_call_api/phone_client_emergency_call_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/sat_configuration_api/sat_configuration_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_configuration_api/group"/>
+   </component>
+   <component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/dial_utils_api/dial_utils_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_image_handler_api/phone_client_image_handler_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_messenger_api/phone_client_messenger_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_messenger_api/group"/>
+   </component>
+   <component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_client_api/sat_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_client_api/group" filter="!test"/>
+    <unit unitID="tedo.sat_client_api.test" bldFile="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" href="phonesrv_plat/phone_client_api/phone_client_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/phone_client_api/group"/>
+   </component>
+   <component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/sat_service_api/sat_service_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/sat_service_api/group" filter="!test"/>
+    <unit unitID="tedo.sat_service_api.test" bldFile="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" href="phonesrv_plat/cbs_message_api/cbs_message_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_server_information_api/phone_client_server_information_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_ussd_internal_api/phone_client_ussd_internal_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_command_handler_api/phone_client_command_handler_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_notify_api/phone_client_notify_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_client_utility_api/phone_client_utility_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/telephony_network_information_api/telephony_network_information_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/secondary_display_sat_api/secondary_display_sat_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/callui_reconnect_query_api/callui_reconnect_query_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/service_provider_settings_api/service_provider_settings_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/converged_call_provider_api/converged_call_provider_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/incoming_call_monitor_api/incoming_call_monitor_api.metaxml"/>
+    <unit bldFile="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="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" href="phonesrv_plat/cenrep_database_api/cenrep_database_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/cenrep_database_api/group"/>
+   </component>
+   <component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/ss_settings_api/ss_settings_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_settings_observer_api/phone_settings_observer_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_settings_notes_ui_api/phone_settings_notes_ui_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/phone_settings_api/phone_settings_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/voice_mailbox_number_api/voice_mailbox_number_api.metaxml"/>
+    <unit bldFile="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" href="phonesrv_plat/voice_mailbox_settings_api/voice_mailbox_settings_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/voice_mailbox_settings_api/group"/>
+   </component>
+   <component id="call_information_api" name="Call Information API" class="api" filter="s60">
+    <meta rel="Api" href="phonesrv_plat/call_information_api/call_information_api.metaxml"/>
+    <unit bldFile="phonesrv_plat/call_information_api/group" filter="!test"/>
+    <unit unitID="tedo.call_information_api.test" bldFile="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="phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+    <unit unitID="tedo.call_remote_party_information_api.test" bldFile="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" href="phonesrv_plat/telephony_mediator_api/telephony_mediator_api.metaxml"/>
+    <unit bldFile="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="telutils/phoneparser/group"/>
+   </component>
+   <component id="telephonyservice" filter="s60" name="Telephony Service">
+    <unit bldFile="telutils/telephonyservice/group"/>
+   </component>
+  </collection>
+  <collection id="cbs" name="Cellular Baseband Services" level="plugin">
+   <component id="cbsserver" filter="s60" name="CBS Server">
+    <unit bldFile="cbs/cbsserver/group"/>
+   </component>
+   <component id="cbsui" filter="s60" name="CBS UI">
+    <unit bldFile="cbs/cbsui/group"/>
+   </component>
+  </collection>
+  <collection id="cellular" name="Cellular" level="server">
+   <component id="telephonysettings" filter="s60" name="Telephony Settings">
+    <unit bldFile="cellular/telephonysettings/group"/>
+   </component>
+   <component id="sssettings" filter="s60" name="Supplementary Service Settings">
+    <unit bldFile="cellular/sssettings/group"/>
+   </component>
+   <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
+    <unit bldFile="cellular/psetnotesui/group"/>
+   </component>
+   <component id="servicerequest" filter="s60" name="Service Request">
+    <unit bldFile="cellular/servicerequest/group"/>
+   </component>
+   <component id="cellular_test" filter="s60,test,api_test" name="Cellular Tests" purpose="development">
+    <!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
+    <unit unitID="tedo.PsetNotesUi.test" bldFile="cellular/PsetNotesUi/tsrc/public/basic/group"/>
+    <unit unitID="tedo.SSSettings.test" bldFile="cellular/SSSettings/tsrc/public/basic/group"/>
+    <unit unitID="tedo.telephonysettings.test" bldFile="cellular/telephonysettings/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
+   <component id="callprovider" filter="s60" name="Call Provider">
+    <unit bldFile="convergedcallengine/callprovider/group"/>
+   </component>
+   <component id="cce" filter="s60" name="CCE">
+    <unit bldFile="convergedcallengine/cce/group"/>
+   </component>
+   <component id="spsettings" filter="s60" name="Service Provider Settings">
+    <unit bldFile="convergedcallengine/spsettings/group"/>
+   </component>
+   <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
+    <unit bldFile="convergedcallengine/cenrepdatabase/group"/>
+   </component>
+   <component id="serviceselector" filter="s60" name="Service Selector">
+    <unit bldFile="convergedcallengine/serviceselector/group"/>
+   </component>
+   <component id="csplugin" filter="s60" name="CS Plugin" class="plugin">
+    <!--  should spell out CS in name -->
+    <unit bldFile="convergedcallengine/csplugin/group"/>
+   </component>
+   <component id="convergedcallengine_test" filter="s60,test,api_test" name="CCE Tests" purpose="development">
+    <!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
+    <unit unitID="tedo.cce.test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
+    <unit unitID="tedo.spsettings.test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="engines" name="Telephony Engines" level="specific">
+   <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
+    <unit bldFile="engines/vmbxengine/group"/>
+   </component>
+  </collection>
+  <collection id="networkhandling" name="Network Handling" level="plugin">
+   <component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
+    <unit bldFile="networkhandling/networkhandlingengine/group"/>
+   </component>
+  </collection>
+  <collection id="phoneclientserver" name="Phone Client/Server" level="server">
+   <component id="enpolicy" filter="s60" name="Emergency Number Policy">
+    <unit bldFile="phoneclientserver/enpolicy/group"/>
+   </component>
+   <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
+    <unit bldFile="phoneclientserver/aiwdialdata/group"/>
+   </component>
+   <component id="dialutils" filter="s60" name="Dial Utils">
+    <unit bldFile="phoneclientserver/dialutils/group"/>
+   </component>
+   <component id="phoneclient" filter="s60" name="Phone Client">
+    <unit bldFile="phoneclientserver/phoneclient/group"/>
+   </component>
+   <component id="phoneserver" filter="s60" name="Phone Server">
+    <unit bldFile="phoneclientserver/phoneserver/group"/>
+   </component>
+   <component id="callui" filter="s60" name="Call UI">
+    <unit bldFile="phoneclientserver/callui/group"/>
+   </component>
+   <component id="phoneclientserver_test" filter="s60,test,api_test" name="Phone Client/Server Tests" purpose="development">
+    <!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
+    <unit unitID="tedo.aiwdialdata.test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
+    <unit unitID="tedo.dialutils.test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
+    <unit unitID="tedo.phoneclient.test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="satengine" name="SIM Application Toolkit Engine" level="generic">
+   <component id="satserver" filter="s60" name="SAT Server">
+    <unit bldFile="satengine/satserver/group"/>
+   </component>
+  </collection>
+  <collection id="satui" name="SIM Application Toolkit UI" level="specific">
+   <component id="satapp" filter="s60" name="SAT Application">
+    <unit bldFile="satui/satapp/group"/>
+   </component>
+   <component id="satplugin" filter="s60" name="SAT Plugin" class="plugin">
+    <unit bldFile="satui/satplugin/group"/>
+   </component>
+  </collection>
+  <collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
+   <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
+    <unit bldFile="phonecmdhandler/phonecmdhnlr/group"/>
+   </component>
+  </collection>
+  <collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
+   <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.telephony_mediator_api.test" bldFile="phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/remoteconn/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/remoteconn/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -83,9 +83,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="/sf/mw/remoteconn/remoteconn_plat/group"/>
-          </component>
           <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
           </component>

--- a/symbian3/mw/remoteconn/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/remoteconn/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,61 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
-    <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
-      <component id="secon" filter="s60" name="Service Controllers">
-        <unit bldFile="connectivitymodules/secon/group"/>
-      </component>
-    </collection>
-    <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
-      <component id="remoteconn_plat" filter="s60" name="Remote Connectivity Platform Interfaces" class="api">
-        <unit bldFile="remoteconn_plat/group"/>
-      </component>
-      <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-      </component>
-    </collection>
-    <collection id="mtptransports" name="MTP Transports" level="plugin">
-      <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-      </component>
-      <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
-      </component>
-      <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
-      </component>
-    </collection>
-    <collection id="mtpfws" name="MTP Frameworks" level="framework">
-      <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
-        <unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
-      </component>
-    </collection>
-    <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
-      <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-      </component>
-     <component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
-      <unit bldFile="mtpdataproviders/mtpimagedp/group" mrp="mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-     </component>
-     <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
-      <unit bldFile="mtpdataproviders/mtppictbridgedp/group" mrp="mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-     </component>
-    </collection>
-    <collection id="backupandrestore" name="Backup and Restore" level="specific">
-      <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
-        <unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-      </component>
-     <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
-        <unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-      </component>
-    </collection>
-    <collection id="obex" name="OBEX" level="generic">
-      <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
-        <unit bldFile="obex/obexprotocol/group" mrp="obex/obexprotocol/group/obex.mrp"/>
-      </component>
-      <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
-        <unit bldFile="obex/obexextensionapi/group" mrp="obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
+  <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+   <component id="secon" filter="s60" name="Service Controllers">
+    <unit bldFile="connectivitymodules/secon/group"/>
+   </component>
+  </collection>
+  <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
+   <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+   </component>
+  </collection>
+  <collection id="mtptransports" name="MTP Transports" level="plugin">
+   <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+   </component>
+   <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+   </component>
+   <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtptransports/mtpcontroller/group" mrp="mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+   </component>
+  </collection>
+  <collection id="mtpfws" name="MTP Frameworks" level="framework">
+   <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+    <unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
+   </component>
+  </collection>
+  <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+   <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+   </component>
+   <component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtpimagedp/group" mrp="mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+   </component>
+   <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="mtpdataproviders/mtppictbridgedp/group" mrp="mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+   </component>
+  </collection>
+  <collection id="backupandrestore" name="Backup and Restore" level="specific">
+   <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+    <unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+   </component>
+   <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+    <unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+   </component>
+  </collection>
+  <collection id="obex" name="OBEX" level="generic">
+   <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+    <unit bldFile="obex/obexprotocol/group" mrp="obex/obexprotocol/group/obex.mrp"/>
+   </component>
+   <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+    <unit bldFile="obex/obexextensionapi/group" mrp="obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/remotemgmt/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/remotemgmt/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,82 +1,203 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
@@ -178,14 +299,6 @@
             <!--<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="/sf/mw/remotemgmt/remotemgmt_plat/group"/>
-          </component>
-          <component name="remotemgmt_pub" filter="s60" long-name="Remote Management Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/remotemgmt/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/remotemgmt/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,117 +1,266 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="remotemgmt" name="Remote Management" levels="plugin framework server generic specific">
-    <collection id="policymanagement" name="Policy Management" level="generic">
-      <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
-        <unit bldFile="policymanagement/pmdmadapter/group"/>
-      </component>
-      <component id="dmutilserver" filter="s60" name="DM Util Server">
-        <unit bldFile="policymanagement/dmutilserver/group"/>
-      </component>
-      <component id="policyengine" filter="s60" name="Policy Engine">
-        <unit bldFile="policymanagement/policyengine/group"/>
-      </component>
-      <component id="policymanagement_build" filter="s60" name="Policy Management Build">
-      	<!--  need to distribute exports, etc into the other components and remove this-->
-        <unit bldFile="policymanagement/group"/>
-      </component>
-    </collection>
-    <collection id="syncmlfw" name="SyncML Framework" level="server">
-      <component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
-      	<!--  need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
-        <unit bldFile="syncmlfw/group"/>
-      </component>
-    </collection>    
-    <collection id="terminalsecurity" name="Terminal Security" level="specific">
-      <component id="scp" filter="s60" name="Security Code Proxy">
-      	<!-- can only have one unit, need to have these #included from a single bld.inf -->
-        <unit bldFile="terminalsecurity/scp/scpclient/group"/>
-        <unit bldFile="terminalsecurity/scp/scpdatabase/group"/>
-        <unit bldFile="terminalsecurity/scp/scpserver/group"/>
-        <unit bldFile="terminalsecurity/scp/scppatternplugin/group"/>
-        <unit bldFile="terminalsecurity/scp/scphistoryplugin/group"/>
-        <unit bldFile="terminalsecurity/scp/scptimestampplugin/group"/>
-        <unit bldFile="terminalsecurity/scp/scpeventhandler/group"/>
-        <unit bldFile="terminalsecurity/scp/dmeventnotifier/group"/>
-      </component>
-      <component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
-        <unit bldFile="terminalsecurity/client/group"/>
-      </component>
-      <component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
-        <unit bldFile="terminalsecurity/server/group"/>
-      </component>
-      <component id="tcadapter" filter="s60" name="Terminal Control Adapter">
-        <unit bldFile="terminalsecurity/tcadapter/bld"/>
-      </component>
-      <component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
-      	<!--  need to distribute exports, etc into the other components and remove this-->
-        <unit bldFile="terminalsecurity/group"/>
-      </component>
-    </collection>
-    <collection id="omaprovisioning" name="OMA Provisioning" level="specific">
-      <component id="pnputil" filter="s60" name="PnP Util">
-        <unit bldFile="omaprovisioning/pnputil/group"/>
-      </component>
-      <component id="provisioning" filter="s60" name="Provisioning">
-        <unit bldFile="omaprovisioning/provisioning/group"/>
-      </component>
-    </collection>
-    <collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
-      <component id="diagframework" filter="s60" name="Diagnostics Framework">
-        <unit bldFile="devicediagnosticsfw/diagframework/group"/>
-      </component>
-      <component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
-        <unit bldFile="devicediagnosticsfw/diagpluginbase/group"/>
-      </component>
-      <component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
-     	<!--  can only have one unit, merge or split into two components -->
-        <unit bldFile="devicediagnosticsfw/diagresultsdb/client/group"/>
-        <unit bldFile="devicediagnosticsfw/diagresultsdb/server/group"/>
-      </component>
-      <component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
-      	<!--  need to distribute exports, etc into the other components and remove this-->
-        <unit bldFile="devicediagnosticsfw/group"/>
-      </component>
-    </collection>
-    <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
-      <component id="dcmoclient" filter="s60" name="DCMO Client">
-     	<unit bldFile="dcmofw/dcmoclient/group"/>
-      </component>
-      <component id="dcmoserver" filter="s60" name="DCMO Server">
-     	<unit bldFile="dcmofw/dcmoserver/group"/>
-      </component>
-      <component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
-     	<unit bldFile="dcmofw/dcmocustcmd/group"/>
-      </component>
-      <component id="dcmofw_build" filter="s60" name="DCMO Build">
-      	<!--  need to distribute exports, etc into the other components and remove this-->
-        <unit bldFile="dcmofw/group"/>
-      </component>
-    </collection>
-    <collection id="fotaapplication" name="FOTA Application" level="generic">
-      <component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
-    	<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-        <unit bldFile="fotaapplication/group"/>
-      </component>
-      <component id="fotaserver" filter="s60" name="FOTA Server">
-      	<meta rel="config">
-      		<defined condition="__SYNCML_DM_FOTA"/>
-      	</meta>
-		<!-- uncomment when #ifdefs are resolved -->
-        <!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-      </component>
-      <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
-		<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-        <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-      </component>
-    </collection>
-    <collection id="remotemgmt_info" name="Remote Management Info" level="specific">
-      <component id="remotemgmt_plat" filter="s60" name="Remote Management Platform Interfaces" class="api">
-        <unit bldFile="remotemgmt_plat/group"/>
-      </component>
-      <component id="remotemgmt_pub" filter="s60" name="Remote Management Public Interfaces" class="api">
-        <unit bldFile="remotemgmt_pub/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="remotemgmt" 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" href="remotemgmt_pub/synchronization_capability_api/synchronization_capability_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/common_agent_util_and_definitions_api/common_agent_util_and_definitions_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/policy_management_certificate_api/policy_management_certificate_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/oma_provisioning_adapter_api/oma_provisioning_adapter_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/device_management_parameter_api/device_management_parameter_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/data_synchronization_plugin_api/data_synchronization_plugin_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/sync_alert_handler_api/sync_alert_handler_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/sync_alert_handler_api/group"/>
+   </component>
+   <component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/syncml_notifier_api/syncml_notifier_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/syncml_notifier_api/group"/>
+   </component>
+   <component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/syncml_client_api/syncml_client_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/device_management_plugin_api/device_management_plugin_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/device_management_plugin_api/group"/>
+   </component>
+   <component id="dm_tree_apis" name="DM Tree APIs" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/dm_tree_apis/dm_tree_apis.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/terminal_security_device_lock_api/terminal_security_device_lock_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/policy_management_request_api/policy_management_request_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/ds_constant_definitions_api/ds_constant_definitions_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/ds_constant_definitions_api/group"/>
+   </component>
+   <component id="scp_server_api" name="SCP Server API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/scp_server_api/scp_server_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/data_synchronization_notification_api/data_synchronization_notification_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/oma_provisioning_engine_api/oma_provisioning_engine_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/oma_provisioning_engine_api/group"/>
+   </component>
+   <component id="dm_utils_api" name="DM Utils API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/dm_utils_api/dm_utils_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/dm_utils_api/group"/>
+   </component>
+   <component id="syncml_alert_api" name="SyncML Alert API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/syncml_alert_api/syncml_alert_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/obex_client_session_api/obex_client_session_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/setting_enforcement_info_api/setting_enforcement_info_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/dm_constant_definitions_api/dm_constant_definitions_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/oma_ds_extensions_api/oma_ds_extensions_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/oma_ds_extensions_api/group"/>
+   </component>
+   <component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/pnpms_utils_api/pnpms_utils_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/diagnostics_plugin_utility_api/diagnostics_plugin_utility_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/diagnostics_plugin_api/diagnostics_plugin_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/diagnostics_plugin_api/group"/>
+   </component>
+   <component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/diagnostics_framework_api/diagnostics_framework_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/diagnostics_framework_api/group"/>
+   </component>
+   <component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/diagnostics_results_api/diagnostics_results_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/diagnostics_plugin_pool_api/diagnostics_plugin_pool_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/adaptive_history_list_api/adaptive_history_list_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/adaptive_history_list_session_api/adaptive_history_list_session_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/fota_engine_api/fota_engine_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/update_package_storage_plugin_api/update_package_storage_plugin_api.metaxml"/>
+    <unit bldFile="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" href="remotemgmt_plat/syncml_notifier_roaming_api/syncml_notifier_roaming_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+   </component>
+   <component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
+    <meta rel="Api" href="remotemgmt_plat/sync_service_api/sync_service_api.metaxml"/>
+    <unit bldFile="remotemgmt_plat/sync_service_api/group"/>
+   </component>
+   <component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
+    <unit bldFile="remotemgmt_plat/dcmo_adapter_api/group"/>
+   </component>
+   <component id="dcmo_control_api" name="DCMO Control API" class="api" filter="s60">
+    <unit bldFile="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" href="remotemgmt_plat/ds_capability_mgmt_plugin_api/ds_capability_mgmt_plugin_api.metaxml"/>
+    <unit bldFile="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="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="policymanagement/pmdmadapter/group"/>
+   </component>
+   <component id="dmutilserver" filter="s60" name="DM Util Server">
+    <unit bldFile="policymanagement/dmutilserver/group"/>
+   </component>
+   <component id="policyengine" filter="s60" name="Policy Engine">
+    <unit bldFile="policymanagement/policyengine/group"/>
+   </component>
+   <component id="policymanagement_build" filter="s60" name="Policy Management Build">
+    <!--  need to distribute exports, etc into the other components and remove this-->
+    <unit bldFile="policymanagement/group"/>
+   </component>
+  </collection>
+  <collection id="syncmlfw" name="SyncML Framework" level="server">
+   <component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
+    <!--  need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+    <unit bldFile="syncmlfw/group"/>
+   </component>
+  </collection>
+  <collection id="terminalsecurity" name="Terminal Security" level="specific">
+   <component id="scp" filter="s60" name="Security Code Proxy">
+    <!-- can only have one unit, need to have these #included from a single bld.inf -->
+    <unit bldFile="terminalsecurity/scp/scpclient/group"/>
+    <unit bldFile="terminalsecurity/scp/scpdatabase/group"/>
+    <unit bldFile="terminalsecurity/scp/scpserver/group"/>
+    <unit bldFile="terminalsecurity/scp/scppatternplugin/group"/>
+    <unit bldFile="terminalsecurity/scp/scphistoryplugin/group"/>
+    <unit bldFile="terminalsecurity/scp/scptimestampplugin/group"/>
+    <unit bldFile="terminalsecurity/scp/scpeventhandler/group"/>
+    <unit bldFile="terminalsecurity/scp/dmeventnotifier/group"/>
+   </component>
+   <component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
+    <unit bldFile="terminalsecurity/client/group"/>
+   </component>
+   <component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
+    <unit bldFile="terminalsecurity/server/group"/>
+   </component>
+   <component id="tcadapter" filter="s60" name="Terminal Control Adapter">
+    <unit bldFile="terminalsecurity/tcadapter/bld"/>
+   </component>
+   <component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
+    <!--  need to distribute exports, etc into the other components and remove this-->
+    <unit bldFile="terminalsecurity/group"/>
+   </component>
+  </collection>
+  <collection id="omaprovisioning" name="OMA Provisioning" level="specific">
+   <component id="pnputil" filter="s60" name="PnP Util">
+    <unit bldFile="omaprovisioning/pnputil/group"/>
+   </component>
+   <component id="provisioning" filter="s60" name="Provisioning">
+    <unit bldFile="omaprovisioning/provisioning/group"/>
+   </component>
+  </collection>
+  <collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
+   <component id="diagframework" filter="s60" name="Diagnostics Framework">
+    <unit bldFile="devicediagnosticsfw/diagframework/group"/>
+   </component>
+   <component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
+    <unit bldFile="devicediagnosticsfw/diagpluginbase/group"/>
+   </component>
+   <component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
+    <!--  can only have one unit, merge or split into two components -->
+    <unit bldFile="devicediagnosticsfw/diagresultsdb/client/group"/>
+    <unit bldFile="devicediagnosticsfw/diagresultsdb/server/group"/>
+   </component>
+   <component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
+    <!--  need to distribute exports, etc into the other components and remove this-->
+    <unit bldFile="devicediagnosticsfw/group"/>
+   </component>
+  </collection>
+  <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
+   <component id="dcmoclient" filter="s60" name="DCMO Client">
+    <unit bldFile="dcmofw/dcmoclient/group"/>
+   </component>
+   <component id="dcmoserver" filter="s60" name="DCMO Server">
+    <unit bldFile="dcmofw/dcmoserver/group"/>
+   </component>
+   <component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
+    <unit bldFile="dcmofw/dcmocustcmd/group"/>
+   </component>
+   <component id="dcmofw_build" filter="s60" name="DCMO Build">
+    <!--  need to distribute exports, etc into the other components and remove this-->
+    <unit bldFile="dcmofw/group"/>
+   </component>
+  </collection>
+  <collection id="fotaapplication" name="FOTA Application" level="generic">
+   <component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
+    <!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+    <unit bldFile="fotaapplication/group"/>
+   </component>
+   <component id="fotaserver" filter="s60" name="FOTA Server">
+    <meta rel="config">
+     <defined condition="__SYNCML_DM_FOTA"/>
+    </meta>
+    <!-- uncomment when #ifdefs are resolved -->
+    <!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+   </component>
+   <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
+    <!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+    <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/remotestorage/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/remotestorage/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,11 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/mw/remotestorage/remotestoragefw/mountstore/group"/>
@@ -110,11 +115,6 @@
             <unit bldFile="/sf/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="/sf/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/remotestorage/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/remotestorage/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,49 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="remotestorage" name="Remote Storage" levels="framework if">
-    <collection id="remotestoragefw" name="Remote Storage Framework" level="framework">
-      <component id="mountstore" filter="s60" name="RSFW Mount Store">
-        <unit bldFile="remotestoragefw/mountstore/group"/>
-      </component>
-      <component id="rsfwnotifierplugins" filter="s60" name="RSFW Notifier Plugins" class="plugin">
-        <unit bldFile="remotestoragefw/rsfwnotifierplugins/group"/>
-      </component>
-      <component id="remotefileengine" filter="s60" name="Remote File Engine">
-        <unit bldFile="remotestoragefw/remotefileengine/group"/>
-      </component>
-      <component id="mountmanager" filter="s60" name="RSFW Mount Manager">
-        <unit bldFile="remotestoragefw/mountmanager/group"/>
-      </component>
-      <component id="webdavaccessplugin" filter="s60" name="WebDAV Access Plugin" class="plugin">
-        <unit bldFile="remotestoragefw/webdavaccessplugin/group"/>
-      </component>
-      <component id="remotefilesystemplugin" filter="s60" name="Remote Filesystem Plugin" class="plugin">
-        <unit bldFile="remotestoragefw/remotefilesystemplugin/group"/>
-      </component>
-      <component id="remotestoragegsplugin" filter="s60" name="RS GS Plugin" class="plugin">
-      	<meta rel="config">
-      		<defined condition="__REMOTE_STORAGE_FW"/>
-      	</meta>
-      	<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->      
-        <!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-      </component>
-      <component id="remotedriveconfigurationbiocontrol" filter="s60" name="Remote Drive Configuration BIO Control">
-      	<meta rel="config">
-      		<defined condition="__REMOTE_STORAGE_FW"/>
-      	</meta>
-      	<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->      
-      <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-      </component>
-      <component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
-			<!-- move exports to other components.
-				This is needed for #includes of configured component until congigiration is in place -->
-        <unit bldFile="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">
+ <package id="remotestorage" 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" href="rsfw_plat/rsfw_access_protocol_plugin_api/remote_storage_fw_mountman_api.metaxml"/>
         <unit bldFile="rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
       </component>
-    </collection>
-  </package>
+  </collection>
+  <collection id="remotestoragefw" name="Remote Storage Framework" level="framework">
+   <component id="mountstore" filter="s60" name="RSFW Mount Store">
+    <unit bldFile="remotestoragefw/mountstore/group"/>
+   </component>
+   <component id="rsfwnotifierplugins" filter="s60" name="RSFW Notifier Plugins" class="plugin">
+    <unit bldFile="remotestoragefw/rsfwnotifierplugins/group"/>
+   </component>
+   <component id="remotefileengine" filter="s60" name="Remote File Engine">
+    <unit bldFile="remotestoragefw/remotefileengine/group"/>
+   </component>
+   <component id="mountmanager" filter="s60" name="RSFW Mount Manager">
+    <unit bldFile="remotestoragefw/mountmanager/group"/>
+   </component>
+   <component id="webdavaccessplugin" filter="s60" name="WebDAV Access Plugin" class="plugin">
+    <unit bldFile="remotestoragefw/webdavaccessplugin/group"/>
+   </component>
+   <component id="remotefilesystemplugin" filter="s60" name="Remote Filesystem Plugin" class="plugin">
+    <unit bldFile="remotestoragefw/remotefilesystemplugin/group"/>
+   </component>
+   <component id="remotestoragegsplugin" filter="s60" name="RS GS Plugin" class="plugin">
+    <meta rel="config">
+     <defined condition="__REMOTE_STORAGE_FW"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+    <!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
+   </component>
+   <component id="remotedriveconfigurationbiocontrol" filter="s60" name="Remote Drive Configuration BIO Control">
+    <meta rel="config">
+     <defined condition="__REMOTE_STORAGE_FW"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+    <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
+   </component>
+   <component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
+    <!-- move exports to other components.
+				This is needed for #includes of configured component until congigiration is in place -->
+    <unit bldFile="remotestoragefw/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/securitysrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,62 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/securitysrv/secsrv_plat/cms_api/group"/>
+          </component>
+          <component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+          </component>
+          <component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+          </component>
+          <component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+          </component>
+          <component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+          </component>
+          <component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+          </component>
+          <component name="gba_api" long-name="GBA API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/gba_api/group"/>
+          </component>
+          <component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -194,9 +250,6 @@
           </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="/sf/mw/securitysrv/secsrv_plat/group"/>
-          </component>
           <component name="securitysrv_test" filter="s60,test,api_test" purpose="development" long-name="Security Services Test">
             <unit bldFile="/sf/mw/securitysrv/tsrc/group"/>
           </component>

--- a/symbian3/mw/securitysrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,132 +1,198 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="securitysrv" name="Security Services" levels="plugin framework server generic specific">
-    <collection id="cms" name="Certificate Management Service" level="server">
-    	<!-- collection is really a component. Need to move down a directory-->
-      <component id="cms_build" filter="s60" name="CMS" introduced="^3">
-        <unit bldFile="cms/group"/>
-      </component>
-    </collection>
-    <collection id="pkiutilities" name="PKI Utilities" level="plugin">
-      <component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
-        <unit bldFile="pkiutilities/x509certnameparser/group"/>
-      </component>
-      <component id="pkcs12" filter="s60" name="PKCS #12">
-        <unit bldFile="pkiutilities/pkcs12/group"/>
-      </component>
-      <component id="certmanui" filter="s60" name="Certificate Management UI">
-        <unit bldFile="pkiutilities/certmanui/group"/>
-      </component>
-      <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
-        <unit bldFile="pkiutilities/ctsecuritydialogs/group"/>
-      </component>
-      <component id="certsaver" filter="s60" name="Certificate Saver">
-        <unit bldFile="pkiutilities/certsaver/group"/>
-      </component>
-      <component id="secmodui" filter="s60" name="Security Module UI">
-        <unit bldFile="pkiutilities/secmodui/group"/>
-      </component>
-      <component id="devicetoken" filter="s60" name="Device Token">
-        <unit bldFile="pkiutilities/devicetoken/group"/>
-      </component>
-      <component id="certificates" filter="s60" name="Certificates">
-        <unit bldFile="pkiutilities/Certificates/group" filter="sf_build"/>
-      </component>
-      <component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
-      	<!-- need to split this into the above components -->
-        <unit bldFile="pkiutilities/group"/>
-      </component>
-     <component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
-       <unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-      </component>
-    </collection>
-    <collection id="wim" name="Wireless Identity Module " level="framework">
-    	<!-- collection is really a component. Need to move down a directory-->
-      <component id="wim_build" filter="s60" name="WIM Build">
-        <unit bldFile="wim/group"/>
-      </component>
-    </collection>
-    <collection id="remotelock" name="Remote Lock" level="generic">
-    	<!-- collection is really a component. Need to move down a directory-->
-      <component id="remotelock_build" filter="s60" name="Remote Lock Build">
-        <unit bldFile="remotelock/group"/>
-      </component>
-    </collection>
-    <collection id="securitydialogs" name="Security Dialogs" level="specific">
-      <component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
-        <unit bldFile="securitydialogs/keylockpolicyapi/group"/>
-      </component>
-      <component id="autolock" name="Autolock" filter="s60">
-        <unit bldFile="securitydialogs/autolock/group"/>
-      </component>
-      <component id="secui" filter="s60" name="Security UI">
-        <unit bldFile="securitydialogs/secui/group"/>
-      </component>
-      <component id="securitynotifier" filter="s60" name="Security Notifier">
-        <unit bldFile="securitydialogs/securitynotifier/group"/>
-      </component>
-      <component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
-        <unit bldFile="securitydialogs/lockclient/group"/>
-      </component>
-      <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
-        <unit bldFile="securitydialogs/lockapp/group"/>
-      </component>
-      <component id="simlockui" filter="s60" name="SIM Lock UI" introduced="^3">
-        <unit bldFile="securitydialogs/simlockui/group"/>
-      </component>
-    </collection>
-    <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
-    	<!-- collection is really a component. Need to move down a directory-->
-      <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
-        <unit bldFile="boottimeintegritycheck/group"/>
-      </component>
-    </collection>
-    <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
-      <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
-        <unit bldFile="gba/uicc/group"/>
-      </component>
-      <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
-        <unit bldFile="gba/gbaserver/group"/>
-      </component>
-      <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
-        <unit bldFile="gba/gbaapi/group"/>
-      </component>
-      <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
-        <unit bldFile="gba/gbafilter/group"/>
-      </component>
-      <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
-      	<!-- need to split this into the above components, or remove #includes and make this GBA ROM  -->
-        <unit bldFile="gba/group"/>
-      </component>
-    </collection>
-    <collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
-      <component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
-        <unit bldFile="devencdiskutils/DevEncCommonUtils/group"/>
-      </component>
-      <component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
-        <unit bldFile="devencdiskutils/DevEncRfsPlugin/group"/>
-      </component>
-      <component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
-        <unit bldFile="devencdiskutils/Pk5Recognizer/group"/>
-      </component>
-      <component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
-        <unit bldFile="devencdiskutils/DevEncStarter/group"/>
-      </component>
-      <component id="devencdiskutils" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
-      	<!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
-        <unit bldFile="devencdiskutils/group"/>
-      </component>
-    </collection>
-    <collection id="securitysrv_info" name="Security Services Info" level="specific">
-      <component id="secsrv_plat" name="Security Services Platform Interfaces" filter="s60" class="api">
-        <unit bldFile="secsrv_plat/group"/>
-      </component>
-      <component id="securitysrv_test" filter="s60,test,api_test" purpose="development" name="Security Services Test">
-        <unit bldFile="tsrc/group"/>
-      </component>
-      <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="securitysrv" 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" href="secsrv_plat/cms_api/cms_api.metaxml"/>
+    <unit bldFile="secsrv_plat/cms_api/group"/>
+   </component>
+   <component id="pkcs12_parser_api" name="PKCS12 Parser API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/pkcs12_parser_api/pkcs12_parser_api.metaxml"/>
+    <unit bldFile="secsrv_plat/pkcs12_parser_api/group"/>
+   </component>
+   <component id="java_utils_api" name="Java Utils API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/java_utils_api/java_utils_api.metaxml"/>
+    <unit bldFile="secsrv_plat/java_utils_api/group"/>
+   </component>
+   <component id="wim_cert_api" name="WIM Cert API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/wim_cert_api/wim_cert_api.metaxml"/>
+    <unit bldFile="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" href="secsrv_plat/device_key_store_encryption_plugin_api/device_key_store_encryption_plugin_api.metaxml"/>
+    <unit bldFile="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" href="secsrv_plat/x509certnameparser_api/x509certnameparser_api.metaxml"/>
+    <unit bldFile="secsrv_plat/x509certnameparser_api/group"/>
+   </component>
+   <component id="remote_lock_api" name="Remote Lock API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/remote_lock_api/remote_lock_api.metaxml"/>
+    <unit bldFile="secsrv_plat/remote_lock_api/group"/>
+   </component>
+   <component id="pkidialog_api" name="PKI Dialog API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/pkidialog_api/pkidialog_api.metaxml"/>
+    <unit bldFile="secsrv_plat/pkidialog_api/group"/>
+   </component>
+   <component id="provisioning_api" name="Provisioning API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/provisioning_api/provisioning_api.metaxml"/>
+    <unit bldFile="secsrv_plat/provisioning_api/group"/>
+   </component>
+   <component id="keyguard_configuration_api" name="Keyguard Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/keyguard_configuration_api/keyguard_configuration_api.metaxml"/>
+    <unit bldFile="secsrv_plat/keyguard_configuration_api/group"/>
+   </component>
+   <component id="keylock_policy_api" name="Keylock Policy API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/keylock_policy_api/keylock_policy_api.metaxml"/>
+    <unit bldFile="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" href="secsrv_plat/security_code_ui_api/security_code_ui_api.metaxml"/>
+    <unit bldFile="secsrv_plat/security_code_ui_api/group"/>
+   </component>
+   <component id="gba_api" name="GBA API" class="api" filter="s60">
+    <meta rel="Api" href="secsrv_plat/gba_api/gba_api.metaxml"/>
+    <unit bldFile="secsrv_plat/gba_api/group"/>
+   </component>
+   <component id="keyguard_access_api" name="Keyguard Access API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/keyguard_access_api/group"/>
+   </component>
+   <component id="devicelock_access_api" name="Device Lock Access API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/devicelock_access_api/group"/>
+   </component>
+   <component id="lockapp_server_api" name="Lock Application Server API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/lockapp_server_api/group"/>
+   </component>
+   <component id="devencadaptation_api" name="Device Encryption Adaptation API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/devencadaptation_api/group"/>
+   </component>
+   <component id="devenccommonutils_api" name="Device Encryption Common Utils API" class="api" filter="s60">
+    <unit bldFile="secsrv_plat/devenccommonutils_api/group"/>
+   </component>
+  </collection>
+  <collection id="cms" name="Certificate Management Service" level="server">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="cms_build" filter="s60" name="CMS" introduced="^3">
+    <unit bldFile="cms/group"/>
+   </component>
+  </collection>
+  <collection id="pkiutilities" name="PKI Utilities" level="plugin">
+   <component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
+    <unit bldFile="pkiutilities/x509certnameparser/group"/>
+   </component>
+   <component id="pkcs12" filter="s60" name="PKCS #12">
+    <unit bldFile="pkiutilities/pkcs12/group"/>
+   </component>
+   <component id="certmanui" filter="s60" name="Certificate Management UI">
+    <unit bldFile="pkiutilities/certmanui/group"/>
+   </component>
+   <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
+    <unit bldFile="pkiutilities/ctsecuritydialogs/group"/>
+   </component>
+   <component id="certsaver" filter="s60" name="Certificate Saver">
+    <unit bldFile="pkiutilities/certsaver/group"/>
+   </component>
+   <component id="secmodui" filter="s60" name="Security Module UI">
+    <unit bldFile="pkiutilities/secmodui/group"/>
+   </component>
+   <component id="devicetoken" filter="s60" name="Device Token">
+    <unit bldFile="pkiutilities/devicetoken/group"/>
+   </component>
+   <component id="certificates" filter="s60" name="Certificates">
+    <unit bldFile="pkiutilities/Certificates/group" filter="sf_build"/>
+   </component>
+   <component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
+    <!-- need to split this into the above components -->
+    <unit bldFile="pkiutilities/group"/>
+   </component>
+   <component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+    <unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+   </component>
+  </collection>
+  <collection id="wim" name="Wireless Identity Module " level="framework">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="wim_build" filter="s60" name="WIM Build">
+    <unit bldFile="wim/group"/>
+   </component>
+  </collection>
+  <collection id="remotelock" name="Remote Lock" level="generic">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="remotelock_build" filter="s60" name="Remote Lock Build">
+    <unit bldFile="remotelock/group"/>
+   </component>
+  </collection>
+  <collection id="securitydialogs" name="Security Dialogs" level="specific">
+   <component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
+    <unit bldFile="securitydialogs/keylockpolicyapi/group"/>
+   </component>
+   <component id="autolock" name="Autolock" filter="s60">
+    <unit bldFile="securitydialogs/autolock/group"/>
+   </component>
+   <component id="secui" filter="s60" name="Security UI">
+    <unit bldFile="securitydialogs/secui/group"/>
+   </component>
+   <component id="securitynotifier" filter="s60" name="Security Notifier">
+    <unit bldFile="securitydialogs/securitynotifier/group"/>
+   </component>
+   <component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
+    <unit bldFile="securitydialogs/lockclient/group"/>
+   </component>
+   <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
+    <unit bldFile="securitydialogs/lockapp/group"/>
+   </component>
+   <component id="simlockui" filter="s60" name="SIM Lock UI" introduced="^3">
+    <unit bldFile="securitydialogs/simlockui/group"/>
+   </component>
+  </collection>
+  <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
+   <!-- collection is really a component. Need to move down a directory-->
+   <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
+    <unit bldFile="boottimeintegritycheck/group"/>
+   </component>
+  </collection>
+  <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
+   <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
+    <unit bldFile="gba/uicc/group"/>
+   </component>
+   <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
+    <unit bldFile="gba/gbaserver/group"/>
+   </component>
+   <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
+    <unit bldFile="gba/gbaapi/group"/>
+   </component>
+   <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
+    <unit bldFile="gba/gbafilter/group"/>
+   </component>
+   <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
+    <!-- need to split this into the above components, or remove #includes and make this GBA ROM  -->
+    <unit bldFile="gba/group"/>
+   </component>
+  </collection>
+  <collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
+   <component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
+    <unit bldFile="devencdiskutils/DevEncCommonUtils/group"/>
+   </component>
+   <component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
+    <unit bldFile="devencdiskutils/DevEncRfsPlugin/group"/>
+   </component>
+   <component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
+    <unit bldFile="devencdiskutils/Pk5Recognizer/group"/>
+   </component>
+   <component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
+    <unit bldFile="devencdiskutils/DevEncStarter/group"/>
+   </component>
+   <component id="devencdiskutils" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+    <!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
+    <unit bldFile="devencdiskutils/group"/>
+   </component>
+  </collection>
+  <collection id="securitysrv_info" name="Security Services Info" level="specific">
+   <component id="securitysrv_test" filter="s60,test,api_test" purpose="development" name="Security Services Test">
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/serviceapifw/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/serviceapifw/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,36 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
@@ -97,14 +127,6 @@
             <unit bldFile="/sf/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="/sf/mw/serviceapifw/serviceapifw_plat/group"/>
-          </component>
-          <component name="serviceapifw_pub" filter="s60" long-name="Service API Framework Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/serviceapifw/serviceapifw_pub/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/serviceapifw/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/serviceapifw/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,33 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="serviceapifw" name="Service API Framework" levels="plugin framework server generic specific">
-    <collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
-      <component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
-        <unit bldFile="rtsecuritymanager/rtsecuritymanagerutil/group"/>
-      </component>
-      <component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
-        <unit bldFile="rtsecuritymanager/rtsecuritymanagerserver/group"/>
-      </component>
-      <component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
-        <unit bldFile="rtsecuritymanager/rtsecuritymanagerclient/group"/>
-      </component>
-      <component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
-		<!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
-        <unit bldFile="rtsecuritymanager/group"/>
-      </component>
-    </collection>
-    <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
-      <component id="lifwservicehandler" filter="s60" name="Service Handler">
-        <unit bldFile="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="serviceapifw_plat/group"/>
-      </component>
-      <component id="serviceapifw_pub" filter="s60" name="Service API Framework Public Interfaces" class="api">
-        <unit bldFile="serviceapifw_pub/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="serviceapifw" 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" href="serviceapifw_plat/rtsecuritymanager_common_api/rtsecuritymanager_common_api.metaxml"/>
+    <unit bldFile="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" href="serviceapifw_plat/rtsecuritymanager_utility_api/rtsecuritymanager_utility_api.metaxml"/>
+    <unit bldFile="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" href="serviceapifw_plat/rtsecuritymanager_client_api/rtsecuritymanager_client_api.metaxml"/>
+    <unit bldFile="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" href="serviceapifw_plat/liw_provider_utility_api/liw_provider_utility_api.metaxml"/>
+    <unit bldFile="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" href="serviceapifw_plat/liw_service_interface_base_api/liw_service_interface_base_api.metaxml"/>
+    <unit bldFile="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" href="serviceapifw_plat/liw_service_interface_menu_api/liw_service_interface_menu_api.metaxml"/>
+    <unit bldFile="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" href="serviceapifw_plat/liw_criteria_api/liw_criteria_api.metaxml"/>
+    <unit bldFile="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" href="serviceapifw_plat/liw_generic_parameter_api/liw_generic_parameter_api.metaxml"/>
+    <unit bldFile="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" href="serviceapifw_plat/liw_service_handler_api/liw_service_handler_api.metaxml"/>
+    <unit bldFile="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="rtsecuritymanager/rtsecuritymanagerutil/group"/>
+   </component>
+   <component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
+    <unit bldFile="rtsecuritymanager/rtsecuritymanagerserver/group"/>
+   </component>
+   <component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
+    <unit bldFile="rtsecuritymanager/rtsecuritymanagerclient/group"/>
+   </component>
+   <component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
+    <!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+    <unit bldFile="rtsecuritymanager/group"/>
+   </component>
+  </collection>
+  <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
+   <component id="lifwservicehandler" filter="s60" name="Service Handler">
+    <unit bldFile="languageinterworkingfw/servicehandler/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/shortlinkconn/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/shortlinkconn/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -78,6 +78,32 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/shortlinkconn/localconnectivityservice/locod/group"/>
@@ -113,11 +139,6 @@
             <unit bldFile="/sf/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="/sf/mw/shortlinkconn/shortlinkconn_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/shortlinkconn/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/shortlinkconn/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,46 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="shortlinkconn" name="Shortlink Connectivity" levels="framework server generic specific plugin">
-  	<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-    <collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
-		<component id="locod" name="Local Connectivity Daemon">
-			<unit bldFile="localconnectivityservice/locod/group"/>
-		</component>	
-		<component id="obexserviceman" name="OBEX Service Managar">
-			<unit bldFile="localconnectivityservice/obexserviceman/group"/>
-		</component>
-		<component id="obexsendservices" name="OBEX Send Services">
-			<unit bldFile="localconnectivityservice/obexsendservices/group"/>
-		</component>
-		<component id="obexreceiveservices" name="OBEX Receive Services">
-			<unit bldFile="localconnectivityservice/obexreceiveservices/group"/>
-		</component>
-		<component id="dun" name="Dial Up Networking">
-			<unit bldFile="localconnectivityservice/dun/group"/>
-		</component>
-		<component id="lccustomplugin" name="LC Custom Plugins" class="plugin">
-			<unit bldFile="localconnectivityservice/lccustomplugin/group"/>
-		</component>
-		<component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
-			<unit bldFile="localconnectivityservice/lcstylustap/group"/>
-		</component>
-		<component id="legacymodemplugin" name="Legacy Modem Plugin" class="plugin">
-			<unit bldFile="localconnectivityservice/legacymodemplugin/group"/>
-		</component>
-		<component id="modematplugin" name="Modem AT Plugin" class="plugin">
-			<unit bldFile="localconnectivityservice/modematplugin/group"/>
-		</component>
-		<component id="generichid" name="Generic HID">
-			<unit bldFile="localconnectivityservice/generichid/group"/>
-		</component>
-		<component id="headset" name="Headset">
-			<unit bldFile="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="shortlinkconn_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="shortlinkconn" 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" href="shortlinkconn_plat/obex_service_utils_api/obex_service_utils_api.metaxml"/>
+    <unit bldFile="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" href="shortlinkconn_plat/obex_service_plugin_api/obex_service_plugin_api.metaxml"/>
+    <unit bldFile="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" href="shortlinkconn_plat/dialup_connection_status_api/dialup_connection_status_api.metaxml"/>
+    <unit bldFile="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" href="shortlinkconn_plat/dun_secondary_display_notification_api/dun_secondary_display_notification_api.metaxml"/>
+    <unit bldFile="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" href="shortlinkconn_plat/obex_secondary_display_notification_api/obex_secondary_display_notification_api.metaxml"/>
+    <unit bldFile="shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+   </component>
+   <component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
+    <unit bldFile="shortlinkconn_plat/generic_hid_api/group"/>
+   </component>
+   <component id="locod_bearer_plugin_api" name="Locod Bearer Plugin API" class="api" filter="s60">
+    <unit bldFile="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="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="localconnectivityservice/locod/group"/>
+   </component>
+   <component id="obexserviceman" name="OBEX Service Managar">
+    <unit bldFile="localconnectivityservice/obexserviceman/group"/>
+   </component>
+   <component id="obexsendservices" name="OBEX Send Services">
+    <unit bldFile="localconnectivityservice/obexsendservices/group"/>
+   </component>
+   <component id="obexreceiveservices" name="OBEX Receive Services">
+    <unit bldFile="localconnectivityservice/obexreceiveservices/group"/>
+   </component>
+   <component id="dun" name="Dial Up Networking">
+    <unit bldFile="localconnectivityservice/dun/group"/>
+   </component>
+   <component id="lccustomplugin" name="LC Custom Plugins" class="plugin">
+    <unit bldFile="localconnectivityservice/lccustomplugin/group"/>
+   </component>
+   <component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
+    <unit bldFile="localconnectivityservice/lcstylustap/group"/>
+   </component>
+   <component id="legacymodemplugin" name="Legacy Modem Plugin" class="plugin">
+    <unit bldFile="localconnectivityservice/legacymodemplugin/group"/>
+   </component>
+   <component id="modematplugin" name="Modem AT Plugin" class="plugin">
+    <unit bldFile="localconnectivityservice/modematplugin/group"/>
+   </component>
+   <component id="generichid" name="Generic HID">
+    <unit bldFile="localconnectivityservice/generichid/group"/>
+   </component>
+   <component id="headset" name="Headset">
+    <unit bldFile="localconnectivityservice/headset/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/srvdiscovery/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/srvdiscovery/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,91 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/sf/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="/sf/mw/srvdiscovery/upnp/upnpstack_plat/group"/>
-          </component>
           <component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
             <unit bldFile="/sf/mw/srvdiscovery/upnp/upnpstack/group"/>
           </component>

--- a/symbian3/mw/srvdiscovery/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/srvdiscovery/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,23 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
-    <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
-      <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
-        <unit bldFile="servicediscoveryandcontrol/pnp/group" mrp="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="upnp/upnpstack_plat/group"/>
-      </component>
-      <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
-        <unit bldFile="upnp/upnpstack/group"/>
-      </component>
-    </collection>
-    <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
-      <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="srvdiscovery" 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" href="upnp/upnpstack_plat/upnp_device_api/upnp_device_api.metaxml"/>
+    <unit bldFile="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" href="upnp/upnpstack_plat/upnp_common_api/upnp_common_api.metaxml"/>
+    <unit bldFile="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" href="upnp/upnpstack_plat/upnp_utils_api/upnp_utils_api.metaxml"/>
+    <unit bldFile="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" href="upnp/upnpstack_plat/upnp_control_point_api/upnp_control_point_api.metaxml"/>
+    <unit bldFile="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" href="upnp/upnpstack_plat/upnp_httpserver_api/upnp_httpserver_api.metaxml"/>
+    <unit bldFile="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" href="upnp/upnpstack_plat/upnp_http_transfer_api/upnp_http_transfer_api.metaxml"/>
+    <unit bldFile="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="servicediscoveryandcontrol/pnp/group" mrp="servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
+   </component>
+  </collection>
+  <collection id="upnp" name="UPnP" level="server">
+   <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+    <unit bldFile="upnp/upnpstack/group"/>
+   </component>
+  </collection>
+  <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
+   <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/svgt/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/svgt/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,9 +77,12 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/mw/svgt/svgt_plat/nvg_api/group"/>
           </component>
         </collection>
         <collection name="svgtopt" long-name="SVG-T Engine" level="util">

--- a/symbian3/mw/svgt/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/svgt/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="svgt" 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="svgt_plat/group"/>
-      </component>
-    </collection>
-    <collection id="svgtopt" name="SVG-T Engine" level="util">
-      <component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
-      	<!-- component is at collection level. Needs to be moved down a directory -->
-        <unit bldFile="svgtopt/group"/>
-      </component>
-      <component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
-        <unit bldFile="svgtopt/svgtplugin/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="svgt" name="SVG Tiny" levels="util ui">
+  <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" href="svgt_plat/svgt_api/svgt_api.metaxml"/>
+    <unit bldFile="svgt_plat/svgt_api/group"/>
+   </component>
+   <component id="nvg_api" name="NVG API" introduced="9.2" class="api" filter="s60">
+    <meta rel="Api" href="svgt_plat/nvg_api/nvg_api.metaxml"/>
+    <unit bldFile="svgt_plat/nvg_api/group"/>
+   </component>
+  </collection>
+  <collection id="svgtopt" name="SVG-T Engine" level="util">
+   <component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
+    <!-- component is at collection level. Needs to be moved down a directory -->
+    <unit bldFile="svgtopt/group"/>
+   </component>
+   <component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
+    <unit bldFile="svgtopt/svgtplugin/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/uiaccelerator/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/uiaccelerator/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,9 +77,24 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
           </component>
         </collection>
         <collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">

--- a/symbian3/mw/uiaccelerator/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/uiaccelerator/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,19 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="uiaccelerator" 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="uiaccelerator_plat/group"/>
-      </component>
-    </collection>
-    <collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
-      <component id="hitchcock" filter="s60" name="Hitchcock">
-        <unit bldFile="uiacceltk/hitchcock/group"/>
-      </component>
-      <component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
-		<!-- move into the other component, or  remove the #include and make this UI Accelerator Toolkit ROM-->
-        <unit bldFile="uiacceltk/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="uiaccelerator" name="UI Accelerator" levels="plugin framework server ex if">
+  <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" href="uiaccelerator_plat/alf_core_toolkit_api/alf_core_toolkit_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_core_toolkit_api/group"/>
+   </component>
+   <component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_visual_api/alf_visual_api.metaxml"/>
+    <unit bldFile="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" href="uiaccelerator_plat/alf_extended_visual_api/alf_extended_visual_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_extended_visual_api/group"/>
+   </component>
+   <component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_extension_api/alf_extension_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_extension_api/group"/>
+   </component>
+   <component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
+    <meta rel="Api" href="uiaccelerator_plat/alf_tracing_api/alf_tracing_api.metaxml"/>
+    <unit bldFile="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" href="uiaccelerator_plat/alf_client_server_api/alf_client_server_api.metaxml"/>
+    <unit bldFile="uiaccelerator_plat/alf_client_server_api/group"/>
+   </component>
+  </collection>
+  <collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
+   <component id="hitchcock" filter="s60" name="Hitchcock">
+    <unit bldFile="uiacceltk/hitchcock/group"/>
+   </component>
+   <component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
+    <!-- move into the other component, or  remove the #include and make this UI Accelerator Toolkit ROM-->
+    <unit bldFile="uiacceltk/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/uiresources/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,34 +77,92 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
-        <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="/sf/mw/uiresources/uiresources_plat/group"/>
+        <!-- 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="/sf/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" filter="test,api_test,pictograph_api"/>
+          </component>
+          <component name="skins_api" long-name="Skins API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/tsrc/group" filter="test,api_test,skins_api"/>
+          </component>
+          <component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="test,api_test,font_definition_api"/>
+          </component>
+          <component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" filter="test,api_test,graphics_api"/>
+          </component>
+          <component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="test,api_test,layout_system_private_api"/>
+          </component>
+          <component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="test,api_test,layout_data_api"/>
+          </component>
+          <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="test,api_test,cdl_api"/>
+          </component>
+          <component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" filter="test,api_test,extended_skins_api"/>
           </component>
-          <component name="uiresources_pub" filter="s60" long-name="UI Resources Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/group"/>
+          <component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="test,api_test,extended_fonts_api"/>
+          </component>
+          <component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" filter="test,api_test,graphic_configuration_api"/>
+          </component>
+          <component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="test,api_test,skins_image_attributes_api"/>
+          </component>
+          <component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development">
             <unit bldFile="/sf/mw/uiresources/tsrc/group" filter="uiresources_api_all"/>
           </component>
-          <!-- are these custom filters needed? -->
-          <component name="uiresources_test_pat" filter="s60,test,api_test" long-name="UI Resources Platform API Tests" purpose="development">
-            <!-- can only have one unit. Need to #include from a common one -->
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="cdl_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="extended_fonts_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" filter="extended_skins_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" filter="graphic_configuration_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="layout_data_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="layout_system_private_api"/>
-          </component>
-          <component name="uiresources_test_pat" filter="s60,test,api_test" long-name="UI Resources Public API Tests" purpose="development">
-            <!-- can only have one unit. Need to #include from a common one -->
-            <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="skins_image_attributes_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="font_definition_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" filter="graphics_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" filter="pictograph_api"/>
-            <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/tsrc/group" filter="skins_api"/>
-          </component>
         </collection>
         <collection name="uigraphics" long-name="UI Graphics" level="generic">
           <component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">

--- a/symbian3/mw/uiresources/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,103 +1,183 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="uiresources" name="UI Resources" levels="compile plugin framework server generic data">
-    <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="uiresources_plat/group"/>
-      </component>
-      <component id="uiresources_pub" filter="s60" name="UI Resources Public Interfaces" class="api">
-        <unit bldFile="uiresources_pub/group"/>
-      </component>
-	  <component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
-	  	<unit bldFile="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="uiresources_plat/cdl_api/tsrc/group" filter="cdl_api" />
-		<unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group" filter="extended_fonts_api" />
-		<unit bldFile="uiresources_plat/extended_skins_api/tsrc/group" filter="extended_skins_api" />
-		<unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group" filter="graphic_configuration_api" />
-		<unit bldFile="uiresources_plat/layout_data_api/tsrc/group" filter="layout_data_api" />
-		<unit bldFile="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="uiresources_plat/skins_image_attributes_api/tsrc/group" filter="skins_image_attributes_api" />
-		<unit bldFile="uiresources_pub/font_definition_api/tsrc/group" filter="font_definition_api" />
-		<unit bldFile="uiresources_pub/graphics_api/tsrc/group" filter="graphics_api" />
-		<unit bldFile="uiresources_pub/pictograph_api/tsrc/group" filter="pictograph_api" />
-		<unit bldFile="uiresources_pub/skins_api/tsrc/group" filter="skins_api" />
-	 </component>      
-    </collection>
-    <collection id="uigraphics" name="UI Graphics" level="generic">
-      <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
-        <unit bldFile="uigraphics/bitmaps2/group"/>
-      </component>
-      <component id="icons" filter="s60" class="config" name="Icons">
-        <unit bldFile="uigraphics/icons/group"/>
-      </component>
-      <component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
-        <unit bldFile="uigraphics/variatedbitmaps/group"/>
-      </component>
-      <component id="aknicon" filter="s60" name="Avkon Icon Framework">
-        <unit bldFile="uigraphics/aknicon/group"/>
-      </component>
-      <component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
-        <unit bldFile="uigraphics/nvgrenderstage/group"/> 
-      </component>
-    </collection>
-    <collection id="layouts" name="Layouts" level="plugin">
-      <component id="cdl" filter="s60" name="Customization Definition Language">
-      	<!-- can only have one unit. Need to #include them or split into multiple components -->
-        <unit bldFile="layouts/cdl/cdlengine/group"/>
-        <unit bldFile="layouts/cdl/cdlserver/group"/>
-      </component>
-      <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
-        <unit bldFile="layouts/aknlayout2/group"/>
-      </component>
-    </collection>
-    <collection id="skins" name="Skins" level="data">
-      <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
-        <unit bldFile="skins/aknskincontent/group"/>
-      </component>
-      <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
-        <unit bldFile="skins/aknskins/group"/>
-      </component>
-    </collection>
-    <collection id="pictographs" name="Pictographs" level="data">
-      <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
-        <unit bldFile="pictographs/aknpictograph/group"/>
-      </component>
-    </collection>
-    <collection id="locales" name="Locales" level="framework">
-      <component id="locales_build" filter="s60" name="Locales Build">
-        <unit bldFile="locales/loce32"/>
-      </component>
-    </collection>
-    <collection id="uiconfig" name="UI Config" level="server">
-      <component id="s60config" filter="s60" name="S60 UI Config">
-        <unit bldFile="uiconfig/s60config/group"/>
-      </component>
-    </collection>
-    <collection id="fontsupport" name="Font Support" level="generic">
-      <component id="fontprovider" filter="s60" name="Font Provider">
-        <unit bldFile="fontsupport/fontprovider/group"/>
-      </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+ <package id="uiresources" 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" href="uiresources_pub/pictograph_api/pictograph_api.metaxml"/>
+    <unit bldFile="uiresources_pub/pictograph_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_pub/skins_api/skins_api.metaxml"/>
+    <unit bldFile="uiresources_pub/skins_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_pub/font_definition_api/font_definition_api.metaxml"/>
+    <unit bldFile="uiresources_pub/font_definition_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_pub/graphics_api/graphics_api.metaxml"/>
+    <unit bldFile="uiresources_pub/graphics_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_pub/scalable_icons_api/scalable_icons_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_pub/layout_id_definitions_api/layout_id_definitions_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
+    <unit bldFile="uiresources_plat/layout_system_private_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_plat/layout_data_api/layout_data_api.metaxml"/>
+    <unit bldFile="uiresources_plat/layout_data_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_plat/cdl_api/cdl_api.metaxml"/>
+    <unit bldFile="uiresources_plat/cdl_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_plat/extended_skins_api/extended_skins_api.metaxml"/>
+    <unit bldFile="uiresources_plat/extended_skins_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_plat/tfx_server_controller_plugin_api/tfx_server_controller_plugin_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_plat/extended_fonts_api/extended_fonts_api.metaxml"/>
+    <unit bldFile="uiresources_plat/extended_fonts_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_plat/graphic_configuration_api/graphic_configuration_api.metaxml"/>
+    <unit bldFile="uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_plat/mif_header_cdl_api/mif_header_cdl_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_plat/personalisation_and_skins_settings_api/personalisation_and_skins_settings_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_plat/tfx_effect_setup_plugin_api/tfx_effect_setup_plugin_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_plat/mifconv_definitions_api/mifconv_definitions_api.metaxml"/>
+    <unit bldFile="uiresources_plat/mifconv_definitions_api/group"/>
+   </component>
+   <component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
+    <meta rel="Api" href="uiresources_plat/wallpaper_configuration_api/wallpaper_configuration_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_plat/language_code_definitions_api/language_code_definitions_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_plat/skins_image_attributes_api/skins_image_attributes_api.metaxml"/>
+    <unit bldFile="uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+    <unit bldFile="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" href="uiresources_plat/private_user_area_code_definitions_api/private_user_area_code_definitions_api.metaxml"/>
+    <unit bldFile="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" href="uiresources_plat/tfx_server_plugin_ids_api/tfx_server_plugin_ids_api.metaxml"/>
+    <unit bldFile="uiresources_plat/tfx_server_plugin_ids_api/group"/>
+   </component>
+  </collection>
+  <collection id="uiresources_info" name="UI Resources Info" level="data">
+   <component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
+    <unit bldFile="tsrc/group" filter="uiresources_api_all"/>
+   </component>
+  </collection>
+  <collection id="uigraphics" name="UI Graphics" level="generic">
+   <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
+    <unit bldFile="uigraphics/bitmaps2/group"/>
+   </component>
+   <component id="icons" filter="s60" class="config" name="Icons">
+    <unit bldFile="uigraphics/icons/group"/>
+   </component>
+   <component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
+    <unit bldFile="uigraphics/variatedbitmaps/group"/>
+   </component>
+   <component id="aknicon" filter="s60" name="Avkon Icon Framework">
+    <unit bldFile="uigraphics/aknicon/group"/>
+   </component>
+   <component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+    <unit bldFile="uigraphics/nvgrenderstage/group"/>
+   </component>
+  </collection>
+  <collection id="layouts" name="Layouts" level="plugin">
+   <component id="cdl" filter="s60" name="Customization Definition Language">
+    <!-- can only have one unit. Need to #include them or split into multiple components -->
+    <unit bldFile="layouts/cdl/cdlengine/group"/>
+    <unit bldFile="layouts/cdl/cdlserver/group"/>
+   </component>
+   <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
+    <unit bldFile="layouts/aknlayout2/group"/>
+   </component>
+  </collection>
+  <collection id="skins" name="Skins" level="data">
+   <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
+    <unit bldFile="skins/aknskincontent/group"/>
+   </component>
+   <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
+    <unit bldFile="skins/aknskins/group"/>
+   </component>
+  </collection>
+  <collection id="pictographs" name="Pictographs" level="data">
+   <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
+    <unit bldFile="pictographs/aknpictograph/group"/>
+   </component>
+  </collection>
+  <collection id="locales" name="Locales" level="framework">
+   <component id="locales_build" filter="s60" name="Locales Build">
+    <unit bldFile="locales/loce32"/>
+   </component>
+  </collection>
+  <collection id="uiconfig" name="UI Config" level="server">
+   <component id="s60config" filter="s60" name="S60 UI Config">
+    <unit bldFile="uiconfig/s60config/group"/>
+   </component>
+  </collection>
+  <collection id="fontsupport" name="Font Support" level="generic">
+   <component id="fontprovider" filter="s60" name="Font Provider">
+    <unit bldFile="fontsupport/fontprovider/group"/>
+   </component>
+   <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
-      <component id="fontutils" filter="sf_build" name="Font Utils">
-        <unit bldFile="fontsupport/fontutils/FontUtils/group"/>
-      </component>
-    </collection>
-    <collection id="helpthemes" name="Help Themes" level="data">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
-        <unit bldFile="helpthemes/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
\ No newline at end of file
+   <component id="fontutils" filter="sf_build" name="Font Utils">
+    <unit bldFile="fontsupport/fontutils/FontUtils/group"/>
+   </component>
+  </collection>
+  <collection id="helpthemes" name="Help Themes" level="data">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
+    <unit bldFile="helpthemes/group"/>
+   </component>
+  </collection>
+ </package>
+</SystemDefinition>

--- a/symbian3/mw/uitools/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/uitools/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,19 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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">
@@ -120,14 +133,6 @@
             <unit bldFile="/sf/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="/sf/mw/uitools/uitools_plat/group"/>
-          </component>
-          <component name="uitools_pub" filter="s60" long-name="UI Tools Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/uitools/uitools_pub/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/uitools/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/uitools/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,56 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="uitools" name="UI Tools" levels="compile encode tool if">
-    <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
-    	<!-- collection is actually a component. Needs to be moved down a directory -->
-      <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
-        <unit bldFile="cdlcompilertoolkit/group"/>
-      </component>
-    </collection>
-    <collection id="cdlcompiler" name="CDL Compiler" level="compile">
-    	<!-- collection is actually a component. Needs to be moved down a directory -->
-      <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
-        <unit bldFile="cdlcompiler/group"/>
-      </component>
-    </collection>
-    <collection id="gfxtools" name="Graphics Tools" level="tool">
-      <component id="gditools" filter="s60" name="GDI Tools" target="desktop">
-        <unit bldFile="gfxtools/gditools/group"/>
-      </component>
-      <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
-        <unit bldFile="gfxtools/color/group"/>
-      </component>
-    </collection>
-    <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
-    	<!-- collection is actually a component. Needs to be moved down a directory -->
-      <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
-        <unit bldFile="../uitools/aknlayoutcompiler/group"/>
-      </component>
-    </collection>
-    <collection id="skincompiler" name="Skin Compiler" level="compile">
-      <component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
-        <unit bldFile="skincompiler/AknSkinDescCompiler/group"/>
-      </component>
-    </collection>
-    <collection id="reszip" name="Resource Zip" level="encode">
-    	<!-- collection is actually a component. Needs to be moved down a directory -->
-      <component id="reszip_build" filter="s60" name="Resource Zip Build">
-        <unit bldFile="reszip/group"/>
-      </component>
-    </collection>
-    <collection id="toollibraries" name="Tool Libraries" level="tool"/>
-    <collection id="svgtencoder" name="SVGT Encoder" level="encode">
-      <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
-        <unit bldFile="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="uitools_plat/group"/>
-      </component>
-      <component id="uitools_pub" filter="s60" name="UI Tools Public Interfaces" class="api">
-        <unit bldFile="uitools_pub/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="uitools" 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" href="uitools_pub/third_party_bitmap_palette_api/third_party_bitmap_palette_api.metaxml"/>
+    <unit bldFile="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" href="uitools_plat/cdl_api/cdl_api.metaxml"/>
+    <unit bldFile="uitools_plat/cdl_api/group"/>
+   </component>
+   <component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+    <meta rel="Api" href="uitools_plat/layout_system_private_api/layout_system_private_api.metaxml"/>
+    <unit bldFile="uitools_plat/layout_system_private_api/group"/>
+   </component>
+  </collection>
+  <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
+   <!-- collection is actually a component. Needs to be moved down a directory -->
+   <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
+    <unit bldFile="cdlcompilertoolkit/group"/>
+   </component>
+  </collection>
+  <collection id="cdlcompiler" name="CDL Compiler" level="compile">
+   <!-- collection is actually a component. Needs to be moved down a directory -->
+   <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
+    <unit bldFile="cdlcompiler/group"/>
+   </component>
+  </collection>
+  <collection id="gfxtools" name="Graphics Tools" level="tool">
+   <component id="gditools" filter="s60" name="GDI Tools" target="desktop">
+    <unit bldFile="gfxtools/gditools/group"/>
+   </component>
+   <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
+    <unit bldFile="gfxtools/color/group"/>
+   </component>
+  </collection>
+  <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
+   <!-- collection is actually a component. Needs to be moved down a directory -->
+   <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
+    <unit bldFile="../uitools/aknlayoutcompiler/group"/>
+   </component>
+  </collection>
+  <collection id="skincompiler" name="Skin Compiler" level="compile">
+   <component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
+    <unit bldFile="skincompiler/AknSkinDescCompiler/group"/>
+   </component>
+  </collection>
+  <collection id="reszip" name="Resource Zip" level="encode">
+   <!-- collection is actually a component. Needs to be moved down a directory -->
+   <component id="reszip_build" filter="s60" name="Resource Zip Build">
+    <unit bldFile="reszip/group"/>
+   </component>
+  </collection>
+  <collection id="toollibraries" name="Tool Libraries" level="tool"/>
+  <collection id="svgtencoder" name="SVGT Encoder" level="encode">
+   <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
+    <unit bldFile="svgtencoder/svgtenc/standalone/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/usbservices/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/usbservices/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,10 +77,39 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
+        <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="/sf/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+          </component>
+          <component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+          </component>
+        </collection>
         <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="/sf/mw/usbservices/usbservices_plat/group"/>
-          </component>
           <component name="usbservices_test" filter="s60,test,api_test" long-name="USB Services Tests">
             <unit bldFile="/sf/mw/usbservices/tsrc/group"/>
           </component>
@@ -142,9 +171,6 @@
           <component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
             <unit bldFile="/sf/mw/usbservices/usbuis/imageprintui/group"/>
           </component>
-          <component name="rndisui" filter="s60" long-name="Remote NDIS UI" introduced="^3">
-            <unit bldFile="/sf/mw/usbservices/usbuis/rndisui/group"/>
-          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/mw/usbservices/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/usbservices/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,74 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="usbservices" name="USB Services" levels="framework server generic specific plugin">
-    <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="usbservices_plat/group"/>
-      </component>
-      <component id="usbservices_test" filter="s60,test,api_test" name="USB Services Tests">
-        <unit bldFile="tsrc/group"/>
-      </component>
-    </collection>
-    <collection id="usbengines" name="USB Engines" level="generic">
-      <component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
-        <unit bldFile="usbengines/usbotgwatcher/group"/>
-      </component>
-      <component id="usbwatcher" filter="s60" name="USB Watcher">
-        <unit bldFile="usbengines/usbwatcher/group"/>
-      </component>
-      <component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
-        <unit bldFile="usbengines/usblocodplugin/group"/>
-      </component>
-      <component id="usbdevcon" filter="s60" name="USB Device Control">
-        <unit bldFile="usbengines/usbdevcon/group"/>
-      </component>
-      <component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
-        <unit bldFile="usbengines/usbremotepersonality/group"/>
-      </component>
-    </collection>
-    <collection id="usbclasses" name="USB Classes" level="framework">
-      <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
-        <unit bldFile="usbclasses/usbobexclasscontroller/group"/>
-      </component>
-      <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality"  class="plugin">
-        <unit bldFile="usbclasses/usbbasicpersonality/group"/>
-      </component>
-      <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
-        <unit bldFile="usbclasses/usbmscpersonality/group"/>
-      </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+ <package id="usbservices" 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" href="usbservices_plat/pictbridge_api/pictbridge_api.metaxml"/>
+    <unit bldFile="usbservices_plat/pictbridge_api/group"/>
+   </component>
+   <component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/ptp_responder_api/ptp_responder_api.metaxml"/>
+    <unit bldFile="usbservices_plat/ptp_responder_api/group"/>
+   </component>
+   <component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/ptp_transport_api/ptp_transport_api.metaxml"/>
+    <unit bldFile="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" href="usbservices_plat/usb_device_control_plugin_api/usb_device_control_plugin_api.metaxml"/>
+    <unit bldFile="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" href="usbservices_plat/usb_notifier_api/usb_notifier_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_notifier_api/group"/>
+   </component>
+   <component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_personality_api_header/usb_personality_api_header.metaxml"/>
+    <unit bldFile="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" href="usbservices_plat/usb_personality_plugin_api/usb_personality_plugin_api.metaxml"/>
+    <unit bldFile="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" href="usbservices_plat/usb_secondary_display_api/usb_secondary_display_api.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_secondary_display_api/group"/>
+   </component>
+   <component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
+    <meta rel="Api" href="usbservices_plat/usb_watcher_api/usb_watcher_api.metaxml"/>
+    <unit bldFile="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" href="usbservices_plat/usb_watcher_info_api_header/usb_watcher_info_api_header.metaxml"/>
+    <unit bldFile="usbservices_plat/usb_watcher_info_api_header/group"/>
+   </component>
+  </collection>
+  <collection id="usbservices_info" name="USB Services Info" level="plugin">
+   <component id="usbservices_test" filter="s60,test,api_test" name="USB Services Tests">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+  <collection id="usbengines" name="USB Engines" level="generic">
+   <component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
+    <unit bldFile="usbengines/usbotgwatcher/group"/>
+   </component>
+   <component id="usbwatcher" filter="s60" name="USB Watcher">
+    <unit bldFile="usbengines/usbwatcher/group"/>
+   </component>
+   <component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
+    <unit bldFile="usbengines/usblocodplugin/group"/>
+   </component>
+   <component id="usbdevcon" filter="s60" name="USB Device Control">
+    <unit bldFile="usbengines/usbdevcon/group"/>
+   </component>
+   <component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
+    <unit bldFile="usbengines/usbremotepersonality/group"/>
+   </component>
+  </collection>
+  <collection id="usbclasses" name="USB Classes" level="framework">
+   <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
+    <unit bldFile="usbclasses/usbobexclasscontroller/group"/>
+   </component>
+   <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
+    <unit bldFile="usbclasses/usbbasicpersonality/group"/>
+   </component>
+   <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
+    <unit bldFile="usbclasses/usbmscpersonality/group"/>
+   </component>
+   <!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
-      <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
-        <unit bldFile="usbclasses/pictbridgeengine/group"/>
-      </component>
-      <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
-        <unit bldFile="usbclasses/usbphoneasmodem/group"/>
-      </component>
-    </collection>
-    <collection id="usbuis" name="USB UIs" level="specific">
-      <component id="usbui" filter="s60" name="USB UI">
-        <unit bldFile="usbuis/usbui/group"/>
-      </component>
-      <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
-        <unit bldFile="usbuis/usbuinotif/group"/>
-      </component>
-      <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
-        <unit bldFile="usbuis/imageprintuiprovider/group"/>
-      </component>
-      <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
-        <unit bldFile="usbuis/imageprintui/group"/>
-      </component>
-      <component id="rndisui" filter="s60" name="Remote NDIS UI" introduced="^3">
-        <unit bldFile="usbuis/rndisui/group"/>
-      </component>
-    </collection>
-  </package>
+   <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
+    <unit bldFile="usbclasses/pictbridgeengine/group"/>
+   </component>
+   <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
+    <unit bldFile="usbclasses/usbphoneasmodem/group"/>
+   </component>
+  </collection>
+  <collection id="usbuis" name="USB UIs" level="specific">
+   <component id="usbui" filter="s60" name="USB UI">
+    <unit bldFile="usbuis/usbui/group"/>
+   </component>
+   <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
+    <unit bldFile="usbuis/usbuinotif/group"/>
+   </component>
+   <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
+    <unit bldFile="usbuis/imageprintuiprovider/group"/>
+   </component>
+   <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
+    <unit bldFile="usbuis/imageprintui/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/videoutils/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/videoutils/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,17 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+          </component>
+          <component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
+          </component>
+          <component name="videoplayer_constants_api" long-name="Videoplayer Constants API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/mw/videoutils/videoscheduler/schedulerclient/group"/>
@@ -94,9 +105,6 @@
           </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="/sf/mw/videoutils/videoutils_plat/group"/>
-          </component>
           <component name="videoutils_test" filter="s60,test,api_test" long-name="Video Utils Tests">
             <unit bldFile="/sf/mw/videoutils/tsrc/group"/>
           </component>

--- a/symbian3/mw/videoutils/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/videoutils/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,29 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="videoutils" name="Video Utils" levels="eng util if">
-    <collection id="videoscheduler" name="Video Scheduler" level="util">
-      <component id="schedulerclient" filter="s60" name="Video Scheduler Client">
-        <unit bldFile="videoscheduler/schedulerclient/group"/>
-      </component>
-      <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
-        <unit bldFile="videoscheduler/schedulerserver/group"/>
-      </component>
-    </collection>
-    <collection id="videoconnutility" name="Video Connection Utility" level="util">
-      <component id="connutilpsworker" filter="s60" name="Connection Utility Publish and Subscribe Worker">
-        <unit bldFile="videoconnutility/connutilpsworker/group"/>
-      </component>
-      <component id="video_connutility" filter="s60" name="Video Connection Utility">
-        <unit bldFile="videoconnutility/connutility/group"/>
-      </component>
-    </collection>
-    <collection id="videoutils_info" name="Video Utils Info" level="if">
-      <component id="videoutils_plat" filter="s60" name="Video Utils Platform Interfaces" class="api">
-        <unit bldFile="videoutils_plat/group"/>
-      </component>
-      <component id="videoutils_test" filter="s60,test,api_test" name="Video Utils Tests">
-        <unit bldFile="tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="videoutils" 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" href="videoutils_plat/videoscheduler_api/videoscheduler_api.metaxml"/>
+    <unit bldFile="videoutils_plat/videoscheduler_api/group"/>
+   </component>
+   <component id="videoconnutility_api" name="Video Connection Utility API" class="api" filter="s60">
+    <meta rel="Api" href="videoutils_plat/videoconnutility_api/videoconnutility_api.metaxml"/>
+    <unit bldFile="videoutils_plat/videoconnutility_api/group"/>
+   </component>
+   <component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
+    <meta rel="Api" href="videoutils_plat/videoplayer_constants_api/videoplayer_constants_api.metaxml"/>
+    <unit bldFile="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="videoscheduler/schedulerclient/group"/>
+   </component>
+   <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
+    <unit bldFile="videoscheduler/schedulerserver/group"/>
+   </component>
+  </collection>
+  <collection id="videoconnutility" name="Video Connection Utility" level="util">
+   <component id="connutilpsworker" filter="s60" name="Connection Utility Publish and Subscribe Worker">
+    <unit bldFile="videoconnutility/connutilpsworker/group"/>
+   </component>
+   <component id="video_connutility" filter="s60" name="Video Connection Utility">
+    <unit bldFile="videoconnutility/connutility/group"/>
+   </component>
+  </collection>
+  <collection id="videoutils_info" name="Video Utils Info" level="if">
+   <component id="videoutils_test" filter="s60,test,api_test" name="Video Utils Tests">
+    <unit bldFile="tsrc/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/vpnclient/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/vpnclient/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -78,6 +78,11 @@
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
@@ -197,9 +202,6 @@
             <!-- should split this up into the other components and remove this-->
             <unit bldFile="/sf/mw/vpnclient/group" filter="!oem_build"/>
           </component>
-          <component name="vpnc_plat" filter="s60" long-name="VPN Client Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/mw/vpnclient/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/vpnclient/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,132 +1,132 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="vpnclient" name="VPN Client" levels="engine ui api">
-  	<!-- is the !oem_build filter needed? -->
-    <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
-      <component id="vpnapi" filter="s60" name="VPN API">
-        <unit bldFile="vpnapiimpl/group" filter="!oem_build"/>
-      </component>
-    </collection>
-    <collection id="vpnengine" name="VPN Engine" level="engine">
-    	<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
-    		or maybe split the collection into more reasonable groups  -->
-      <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
-        <unit bldFile="vpnengine/eventmediatorapi/group" filter="!oem_build"/>
-      </component>
-      <component id="eventviewer" filter="s60" name="Event Viewer">
-        <unit bldFile="vpnengine/eventviewer/group" filter="!oem_build"/>
-      </component>
-      <component id="vpnins" filter="s60" name="VPN Installer">
-        <unit bldFile="vpnengine/vpnins/group" filter="!oem_build"/>
-      </component>
-      <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
-        <unit bldFile="vpnengine/ikepolparser/group" filter="!oem_build"/>
-      </component>
-      <component id="utlbase64" filter="s60" name="Base64 Utilities">
-        <unit bldFile="vpnengine/utlbase64/group" filter="!oem_build"/>
-      </component>
-      <component id="utlcrypto" filter="s60" name="Crypto Utilities">
-        <unit bldFile="vpnengine/utlcrypto/group" filter="!oem_build"/>
-      </component>
-      <component id="utlxml" filter="s60" name="XML Utilities">
-        <unit bldFile="vpnengine/utlxml/group" filter="!oem_build"/>
-      </component>
-      <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
-        <unit bldFile="vpnengine/utlpkcs10/group" filter="!oem_build"/>
-      </component>
-
-      <component id="pkiserviceapi" filter="s60" name="PKI Service API">
-        <unit bldFile="vpnengine/pkiserviceapi/group" filter="!oem_build"/>
-      </component>
-      <component id="ikecert" filter="s60" name="IKE Certificate Management">
-        <unit bldFile="vpnengine/ikecert/group" filter="!oem_build"/>
-      </component>
-      <component id="kmdapi" filter="s60" name="Key Management Daemon API">
-        <unit bldFile="vpnengine/kmdapi/group" filter="!oem_build"/>
-      </component>
-      <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
-        <unit bldFile="vpnengine/kmdserver/group" filter="!oem_build"/>
-      </component>
-      <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
-        <unit bldFile="vpnengine/ikeutils/group" filter="!oem_build"/>
-      </component>
-      <component id="ikev1lib" filter="s60" name="IKEv1 Library">
-        <unit bldFile="vpnengine/ikev1lib/group" filter="!oem_build"/>
-      </component>
-      <component id="ikev2lib" filter="s60" name="IKEv2 Library">
-        <unit bldFile="vpnengine/ikev2lib/group" filter="!oem_build"/>
-      </component>
-      <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
-        <unit bldFile="vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
-      </component>
-      <component id="sit" filter="s60" name="Socket Interaction Thread">
-        <unit bldFile="vpnengine/sit/group" filter="!oem_build"/>
-      </component>
-
-      <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
-        <unit bldFile="vpnengine/vpntcwrapper/group" filter="!oem_build"/>
-      </component>
-      <component id="eventmediator" filter="s60" name="Event Mediator">
-        <unit bldFile="vpnengine/eventmediator/group" filter="!oem_build"/>
-      </component>
-      <component id="pkiservice" filter="s60" name="PKI Service">
-        <unit bldFile="vpnengine/pkiservice/group" filter="!oem_build"/>
-      </component>
-      <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
-        <unit bldFile="vpnengine/vpnconnagt/group" filter="!oem_build"/>
-      </component>
-      <component id="vpnmanager" filter="s60" name="VPN Manager">
-        <unit bldFile="vpnengine/vpnmanager/group" filter="!oem_build"/>
-      </component>
-      <component id="vpncleaner" filter="s60" name="VPN Cleaner">
-        <unit bldFile="vpnengine/vpncleaner/group" filter="!oem_build"/>
-      </component>
-      
-      <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
-        <unit bldFile="vpnengine/utlpkcs12/group" filter="!oem_build"/>
-      </component>
-      <component id="dmadengine" filter="s60" name="DM Adapter Engine">
-        <unit bldFile="vpnengine/dmadengine/group" filter="!oem_build"/>
-      </component>
-      <component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
-        <unit bldFile="vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
-      </component>
-      <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
-        <unit bldFile="vpnengine/dmadpki/group" filter="!oem_build"/>
-      </component>
-      <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
-        <unit bldFile="vpnengine/ikesocket/group" filter="!oem_build"/>
-      </component>
-    </collection>
-    <collection id="vpnui" name="VPN UI" level="ui">
-      <component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
-        <unit bldFile="vpnui/vpnecomnotifier/group" filter="!oem_build"/>
-      </component>
-      <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
-        <unit bldFile="vpnui/vpndialogmanager/group" filter="!oem_build"/>
-      </component>
-      <component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin">
-        <unit bldFile="vpnui/vpnmanagementui/group" filter="!oem_build"/>
-      </component>
-      <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
-        <unit bldFile="vpnui/vpnpolins/group" filter="!oem_build"/>
-      </component>
-      <component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
-        <unit bldFile="vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
-      </component>
-    </collection>
-    <collection id="vpnclient_info" name="VPN Client Info" level="api">
-      <component id="vpnclient_help" filter="s60" name="VPN Client Help">
-        <unit bldFile="help/group" filter="!oem_build"/>
-      </component>
-      <component id="vpnclient_build" filter="s60" name="VPN Client Build">
-      	<!-- should split this up into the other components and remove this-->
-        <unit bldFile="group" filter="!oem_build"/>
-      </component>
-      <component id="vpnc_plat" filter="s60" class="api" name="VPN Client Platform Interfaces">
+ <package id="vpnclient" 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" href="vpnc_plat/vpnapi/vpn_api.metaxml"/>
         <unit bldFile="vpnc_plat/vpnapi/group" filter="!oem_build"/>
       </component>
-    </collection>
-  </package>
+  </collection>
+  <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
+   <component id="vpnapi" filter="s60" name="VPN API">
+    <unit bldFile="vpnapiimpl/group" filter="!oem_build"/>
+   </component>
+  </collection>
+  <collection id="vpnengine" name="VPN Engine" level="engine">
+   <!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
+    		or maybe split the collection into more reasonable groups  -->
+   <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
+    <unit bldFile="vpnengine/eventmediatorapi/group" filter="!oem_build"/>
+   </component>
+   <component id="eventviewer" filter="s60" name="Event Viewer">
+    <unit bldFile="vpnengine/eventviewer/group" filter="!oem_build"/>
+   </component>
+   <component id="vpnins" filter="s60" name="VPN Installer">
+    <unit bldFile="vpnengine/vpnins/group" filter="!oem_build"/>
+   </component>
+   <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
+    <unit bldFile="vpnengine/ikepolparser/group" filter="!oem_build"/>
+   </component>
+   <component id="utlbase64" filter="s60" name="Base64 Utilities">
+    <unit bldFile="vpnengine/utlbase64/group" filter="!oem_build"/>
+   </component>
+   <component id="utlcrypto" filter="s60" name="Crypto Utilities">
+    <unit bldFile="vpnengine/utlcrypto/group" filter="!oem_build"/>
+   </component>
+   <component id="utlxml" filter="s60" name="XML Utilities">
+    <unit bldFile="vpnengine/utlxml/group" filter="!oem_build"/>
+   </component>
+   <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
+    <unit bldFile="vpnengine/utlpkcs10/group" filter="!oem_build"/>
+   </component>
+   <component id="pkiserviceapi" filter="s60" name="PKI Service API">
+    <unit bldFile="vpnengine/pkiserviceapi/group" filter="!oem_build"/>
+   </component>
+   <component id="ikecert" filter="s60" name="IKE Certificate Management">
+    <unit bldFile="vpnengine/ikecert/group" filter="!oem_build"/>
+   </component>
+   <component id="kmdapi" filter="s60" name="Key Management Daemon API">
+    <unit bldFile="vpnengine/kmdapi/group" filter="!oem_build"/>
+   </component>
+   <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
+    <unit bldFile="vpnengine/kmdserver/group" filter="!oem_build"/>
+   </component>
+   <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
+    <unit bldFile="vpnengine/ikeutils/group" filter="!oem_build"/>
+   </component>
+   <component id="ikev1lib" filter="s60" name="IKEv1 Library">
+    <unit bldFile="vpnengine/ikev1lib/group" filter="!oem_build"/>
+   </component>
+   <component id="ikev2lib" filter="s60" name="IKEv2 Library">
+    <unit bldFile="vpnengine/ikev2lib/group" filter="!oem_build"/>
+   </component>
+   <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
+    <unit bldFile="vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
+   </component>
+   <component id="sit" filter="s60" name="Socket Interaction Thread">
+    <unit bldFile="vpnengine/sit/group" filter="!oem_build"/>
+   </component>
+   <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
+    <unit bldFile="vpnengine/vpntcwrapper/group" filter="!oem_build"/>
+   </component>
+   <component id="eventmediator" filter="s60" name="Event Mediator">
+    <unit bldFile="vpnengine/eventmediator/group" filter="!oem_build"/>
+   </component>
+   <component id="pkiservice" filter="s60" name="PKI Service">
+    <unit bldFile="vpnengine/pkiservice/group" filter="!oem_build"/>
+   </component>
+   <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
+    <unit bldFile="vpnengine/vpnconnagt/group" filter="!oem_build"/>
+   </component>
+   <component id="vpnmanager" filter="s60" name="VPN Manager">
+    <unit bldFile="vpnengine/vpnmanager/group" filter="!oem_build"/>
+   </component>
+   <component id="vpncleaner" filter="s60" name="VPN Cleaner">
+    <unit bldFile="vpnengine/vpncleaner/group" filter="!oem_build"/>
+   </component>
+   <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
+    <unit bldFile="vpnengine/utlpkcs12/group" filter="!oem_build"/>
+   </component>
+   <component id="dmadengine" filter="s60" name="DM Adapter Engine">
+    <unit bldFile="vpnengine/dmadengine/group" filter="!oem_build"/>
+   </component>
+   <component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
+    <unit bldFile="vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
+   </component>
+   <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
+    <unit bldFile="vpnengine/dmadpki/group" filter="!oem_build"/>
+   </component>
+   <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
+    <unit bldFile="vpnengine/ikesocket/group" filter="!oem_build"/>
+   </component>
+  </collection>
+  <collection id="vpnui" name="VPN UI" level="ui">
+   <component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
+    <unit bldFile="vpnui/vpnecomnotifier/group" filter="!oem_build"/>
+   </component>
+   <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
+    <unit bldFile="vpnui/vpndialogmanager/group" filter="!oem_build"/>
+   </component>
+   <component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin">
+    <unit bldFile="vpnui/vpnmanagementui/group" filter="!oem_build"/>
+   </component>
+   <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
+    <unit bldFile="vpnui/vpnpolins/group" filter="!oem_build"/>
+   </component>
+   <component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
+    <unit bldFile="vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
+   </component>
+  </collection>
+  <collection id="vpnclient_info" name="VPN Client Info" level="api">
+   <component id="vpnclient_help" filter="s60" name="VPN Client Help">
+    <unit bldFile="help/group" filter="!oem_build"/>
+   </component>
+   <component id="vpnclient_build" filter="s60" name="VPN Client Build">
+    <!-- should split this up into the other components and remove this-->
+    <unit bldFile="group" filter="!oem_build"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/web/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/web/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,13 +77,83 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-        <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="/sf/mw/web/web_plat/group"/>
+        <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/web/web_pub/browser_plugin_api/group"/>
+          </component>
+          <component name="settings_api" long-name="Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/mw/web/web_plat/connection_manager_api/group"/>
           </component>
-          <component name="web_pub" filter="s60" long-name="Web Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/group"/>
+          <component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/web/web_plat/feeds_engine_api/group"/>
+          </component>
+          <component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/launcher_api/group"/>
+          </component>
+          <component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/mw/web/web_plat/scriptable_plugin_api/group"/>
+          </component>
+          <component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/webutils_api/group"/>
+          </component>
+          <component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/mw/web/web_plat/stmgesturefw_api/group"/>
+          </component>
+        </collection>
+        <collection name="web_info" long-name="Web Info" level="specific">
           <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="/sf/mw/web/group"/>

--- a/symbian3/mw/web/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/web/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,197 +1,293 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="web" name="Web" levels="plugin utils server generic specific">
-    <collection id="web_info" name="Web Info" level="specific">
-      <component id="web_plat" filter="s60" name="Web Platform Interfaces" class="api">
-        <unit bldFile="web_plat/group"/>
-      </component>
-      <component id="web_pub" filter="s60" name="Web Public Interfaces" class="api">
-        <unit bldFile="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="group"/>
-      </component>
-    </collection>
-    <collection id="browserutilities" name="Browser Utilities" level="utils">
-      <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
-        <unit bldFile="browserutilities/browserdialogsprovider/group"/>
-      </component>
-      <component id="recenturlstore" filter="s60" name="Recent URL Store">
-        <unit bldFile="browserutilities/recenturlstore/group"/>
-      </component>
-      <component id="xmlparser" filter="s60" name="XML Interface">
-        <unit bldFile="browserutilities/xmlparser/group"/>
-      </component>
-      <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
-        <unit bldFile="browserutilities/cxmllibrary/group"/>
-      </component>
-      <component id="downloadmgr" filter="s60" name="Download Manager">
-        <unit bldFile="browserutilities/downloadmgr/group"/>
-      </component>
-      <component id="connectionmanager" filter="s60" name="Connection Manager">
-        <unit bldFile="browserutilities/connectionmanager/group"/>
-      </component>
-      <component id="browsertelservice" filter="s60" name="Browser Telephony Service">
-        <unit bldFile="browserutilities/browsertelservice/group"/>
-      </component>
-      <component id="favouritesengine" filter="s60" name="Favourites Engine">
-        <unit bldFile="browserutilities/favouritesengine/group"/>
-      </component>
-      <component id="feedsengine" filter="s60" name="Feeds Engine">
-        <unit bldFile="browserutilities/feedsengine/group"/>
-      </component>
-      <component id="multipartparser" filter="s60" name="Multipart Parser">
-      	<meta rel="config">
-      		<defined condition="BRDO_MULTIPART_PARSER_FF"/>
-      	</meta>
-      		<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-      	<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-      </component>
-      <component id="schemehandler" filter="s60" name="Scheme Handler">
-        <unit bldFile="browserutilities/schemehandler/group"/>
-      </component>
-      <component id="webutils" filter="s60" name="Web Utils">
-        <unit bldFile="browserutilities/webutils/group"/>
-      </component>
-      <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
-        <unit bldFile="browserutilities/aiwbrowserprovider/group"/>
-      </component>
-      <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
-      	<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-        <unit bldFile="browserutilities/group"/>
-      </component>
-    </collection>
-    <collection id="webengine" name="Web Engine" level="server">
-      <component id="osswebengine" filter="s60" name="OSS Web Engine">
-      	<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-        <unit bldFile="webengine/osswebengine/cache/group"/>
-        <unit bldFile="webengine/osswebengine/memorymanager/group"/>
-        <unit bldFile="webengine/osswebengine/npscript/group"/>
-        <unit bldFile="webengine/osswebengine/webkit/s60/group"/>
-        <unit bldFile="webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-      </component>
-      <component id="webkitutils" filter="s60" name="WebKit Utils">
-        <unit bldFile="webengine/webkitutils/group"/>
-      </component>
-      <component id="pagescaler" filter="s60" name="Page Scaler">
-        <unit bldFile="webengine/pagescaler/group"/>
-      </component>
-      <component id="webwidgetinstaller" filter="s60" name="Widget Installer">
-        <unit bldFile="webengine/widgetinstaller/group"/>
-      </component>
-      <component id="widgetregistry" filter="s60" name="Widget Registry">
-        <unit bldFile="webengine/widgetregistry/group"/>
-      </component>
-      <component id="wmlengine" filter="s60" name="WML Engine">
-        <unit bldFile="webengine/wmlengine/group"/>
-      </component>
-      <component id="device" filter="s60" name="Device">
-     		<!-- this needs a more meaningful name -->
-        <unit bldFile="webengine/device/group"/>
-      </component>
-      <component id="widgetengine" filter="s60" name="Widget Engine">
-        <unit bldFile="webengine/widgetengine/group"/>
-      </component>
-      <component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
-       <unit bldFile="webengine/memoryplugin/group"/>
-     </component>
-      <component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
-        <unit bldFile="webengine/widgetmemoryplugin/group"/>
-      </component>
-      <component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
-        <unit bldFile="webengine/widgetbackuprestore/group"/>
-      </component>
-      <component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
-        <unit bldFile="webengine/browserrecognizers/group"/>
-      </component>
-      <component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
-        <unit bldFile="webengine/wrtharvester/group"/>
-      </component>
-    </collection>
-    <collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
-      <component id="codeng" filter="s60" name="COD Engine">
-        <unit bldFile="codhandler/codeng/group"/>
-      </component>
-      <component id="codui" filter="s60" name="COD UI">
-        <unit bldFile="codhandler/codui/group"/>
-      </component>
-      <component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
-        <unit bldFile="codhandler/codrecog/group"/>
-      </component>
-      <component id="codviewer" filter="s60" name="COD Viewer">
-        <unit bldFile="codhandler/codviewer/group"/>
-      </component>
-      <component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
-        <unit bldFile="codhandler/ddrecog/group"/>
-      </component>
-      <component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
-        <unit bldFile="codhandler/ddviewer/group"/>
-      </component>
-      <component id="coddownload" filter="s60" name="COD Download">
-        <unit bldFile="codhandler/coddownload/group"/>
-      </component>
-      <component id="roapapp" filter="s60" name="ROAP Application">
-        <unit bldFile="codhandler/roapapp/group"/>
-      </component>
-      <component id="codhandler_build" filter="s60" name="COD Handler Build">
-      	<!-- Exports need to go into another component or make this self-contained.
+ <package id="web" 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" href="web_pub/browser_control_api/browser_control_api.metaxml"/>
+    <unit bldFile="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" href="web_pub/download_mgr_client_api/download_mgr_client_api.metaxml"/>
+    <unit bldFile="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" href="web_pub/download_mgr_ui_api/download_mgr_ui_api.metaxml"/>
+    <unit bldFile="web_pub/download_mgr_ui_api/group"/>
+   </component>
+   <component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/favourites_engine_api/favourites_engine_api.metaxml"/>
+    <unit bldFile="web_pub/favourites_engine_api/group"/>
+   </component>
+   <component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/browser_plugin_api/browser_plugin_api.metaxml"/>
+    <unit bldFile="web_pub/browser_plugin_api/group"/>
+   </component>
+   <component id="settings_api" name="Settings API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/settings_api/settings_api.metaxml"/>
+    <unit bldFile="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="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" href="web_plat/aiw_browser_provider_api/aiw_browser_provider_api.metaxml"/>
+    <unit bldFile="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" href="web_plat/browser_dialogs_provider_api/browser_dialogs_provider_api.metaxml"/>
+    <unit bldFile="web_plat/browser_dialogs_provider_api/group"/>
+   </component>
+   <component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/browser_platform_api/browser_platform_api.metaxml"/>
+    <unit bldFile="web_plat/browser_platform_api/group"/>
+   </component>
+   <component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/cod_handler_api/cod_handler_api.metaxml"/>
+    <unit bldFile="web_plat/cod_handler_api/group"/>
+   </component>
+   <component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/connection_manager_api/connection_manager_api.metaxml"/>
+    <unit bldFile="web_plat/connection_manager_api/group"/>
+   </component>
+   <component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/cxml_library_api/cxml_library_api.metaxml"/>
+    <unit bldFile="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" href="web_plat/download_mgr_client_api_extn/download_mgr_client_api_extn.metaxml"/>
+    <unit bldFile="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" href="web_plat/feeds_engine_api/feeds_engine_api.metaxml"/>
+    <unit bldFile="web_plat/feeds_engine_api/group"/>
+   </component>
+   <component id="launcher_api" name="Launcher API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/launcher_api/launcher_api.metaxml"/>
+    <unit bldFile="web_plat/launcher_api/group"/>
+   </component>
+   <component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/multipart_parser_api/multipart_parser_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+    </meta>
+    <unit bldFile="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" href="web_plat/recent_url_store_api/recent_url_store_api.metaxml"/>
+    <unit bldFile="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" href="web_plat/scheme_handler_plugin_api/scheme_handler_plugin_api.metaxml"/>
+    <unit bldFile="web_plat/scheme_handler_plugin_api/group"/>
+   </component>
+   <component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/scriptable_plugin_api/scriptable_plugin_api.metaxml"/>
+    <unit bldFile="web_plat/scriptable_plugin_api/group"/>
+   </component>
+   <component id="webutils_api" name="Web Utils API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/webutils_api/webutils_api.metaxml"/>
+    <unit bldFile="web_plat/webutils_api/group"/>
+   </component>
+   <component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/widget_registry_api/widget_registry_api.metaxml"/>
+    <unit bldFile="web_plat/widget_registry_api/group"/>
+   </component>
+   <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/xml_parser_api/xml_parser_api.metaxml"/>
+    <unit bldFile="web_plat/xml_parser_api/group"/>
+   </component>
+   <component id="stmgesturefw_api" name="State Machine Gesture Framework API " class="api" filter="s60">
+    <meta rel="Api" href="web_plat/stmgesturefw_api/stmgesturefw_api.metaxml"/>
+    <unit bldFile="web_plat/stmgesturefw_api/group"/>
+   </component>
+  </collection>
+  <collection id="web_info" name="Web Info" level="specific">
+   <component id="web_build" filter="s60" name="Web Build">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+  <collection id="browserutilities" name="Browser Utilities" level="utils">
+   <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
+    <unit bldFile="browserutilities/browserdialogsprovider/group"/>
+   </component>
+   <component id="recenturlstore" filter="s60" name="Recent URL Store">
+    <unit bldFile="browserutilities/recenturlstore/group"/>
+   </component>
+   <component id="xmlparser" filter="s60" name="XML Interface">
+    <unit bldFile="browserutilities/xmlparser/group"/>
+   </component>
+   <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
+    <unit bldFile="browserutilities/cxmllibrary/group"/>
+   </component>
+   <component id="downloadmgr" filter="s60" name="Download Manager">
+    <unit bldFile="browserutilities/downloadmgr/group"/>
+   </component>
+   <component id="connectionmanager" filter="s60" name="Connection Manager">
+    <unit bldFile="browserutilities/connectionmanager/group"/>
+   </component>
+   <component id="browsertelservice" filter="s60" name="Browser Telephony Service">
+    <unit bldFile="browserutilities/browsertelservice/group"/>
+   </component>
+   <component id="favouritesengine" filter="s60" name="Favourites Engine">
+    <unit bldFile="browserutilities/favouritesengine/group"/>
+   </component>
+   <component id="feedsengine" filter="s60" name="Feeds Engine">
+    <unit bldFile="browserutilities/feedsengine/group"/>
+   </component>
+   <component id="multipartparser" filter="s60" name="Multipart Parser">
+    <meta rel="config">
+     <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+    <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+   </component>
+   <component id="schemehandler" filter="s60" name="Scheme Handler">
+    <unit bldFile="browserutilities/schemehandler/group"/>
+   </component>
+   <component id="webutils" filter="s60" name="Web Utils">
+    <unit bldFile="browserutilities/webutils/group"/>
+   </component>
+   <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
+    <unit bldFile="browserutilities/aiwbrowserprovider/group"/>
+   </component>
+   <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+    <unit bldFile="browserutilities/group"/>
+   </component>
+  </collection>
+  <collection id="webengine" name="Web Engine" level="server">
+   <component id="osswebengine" filter="s60" name="OSS Web Engine">
+    <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+    <unit bldFile="webengine/osswebengine/cache/group"/>
+    <unit bldFile="webengine/osswebengine/memorymanager/group"/>
+    <unit bldFile="webengine/osswebengine/npscript/group"/>
+    <unit bldFile="webengine/osswebengine/webkit/s60/group"/>
+    <unit bldFile="webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+   </component>
+   <component id="webkitutils" filter="s60" name="WebKit Utils">
+    <unit bldFile="webengine/webkitutils/group"/>
+   </component>
+   <component id="pagescaler" filter="s60" name="Page Scaler">
+    <unit bldFile="webengine/pagescaler/group"/>
+   </component>
+   <component id="webwidgetinstaller" filter="s60" name="Widget Installer">
+    <unit bldFile="webengine/widgetinstaller/group"/>
+   </component>
+   <component id="widgetregistry" filter="s60" name="Widget Registry">
+    <unit bldFile="webengine/widgetregistry/group"/>
+   </component>
+   <component id="wmlengine" filter="s60" name="WML Engine">
+    <unit bldFile="webengine/wmlengine/group"/>
+   </component>
+   <component id="device" filter="s60" name="Device">
+    <!-- this needs a more meaningful name -->
+    <unit bldFile="webengine/device/group"/>
+   </component>
+   <component id="widgetengine" filter="s60" name="Widget Engine">
+    <unit bldFile="webengine/widgetengine/group"/>
+   </component>
+   <component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
+    <unit bldFile="webengine/memoryplugin/group"/>
+   </component>
+   <component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
+    <unit bldFile="webengine/widgetmemoryplugin/group"/>
+   </component>
+   <component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
+    <unit bldFile="webengine/widgetbackuprestore/group"/>
+   </component>
+   <component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
+    <unit bldFile="webengine/browserrecognizers/group"/>
+   </component>
+   <component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
+    <unit bldFile="webengine/wrtharvester/group"/>
+   </component>
+  </collection>
+  <collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
+   <component id="codeng" filter="s60" name="COD Engine">
+    <unit bldFile="codhandler/codeng/group"/>
+   </component>
+   <component id="codui" filter="s60" name="COD UI">
+    <unit bldFile="codhandler/codui/group"/>
+   </component>
+   <component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
+    <unit bldFile="codhandler/codrecog/group"/>
+   </component>
+   <component id="codviewer" filter="s60" name="COD Viewer">
+    <unit bldFile="codhandler/codviewer/group"/>
+   </component>
+   <component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
+    <unit bldFile="codhandler/ddrecog/group"/>
+   </component>
+   <component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
+    <unit bldFile="codhandler/ddviewer/group"/>
+   </component>
+   <component id="coddownload" filter="s60" name="COD Download">
+    <unit bldFile="codhandler/coddownload/group"/>
+   </component>
+   <component id="roapapp" filter="s60" name="ROAP Application">
+    <unit bldFile="codhandler/roapapp/group"/>
+   </component>
+   <component id="codhandler_build" filter="s60" name="COD Handler Build">
+    <!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
-        <unit bldFile="codhandler/group"/>
-      </component>
-    </collection>
-    <collection id="widgets" name="Web Widget Framework" level="generic">
-      	<meta rel="config">
-      		<defined condition="RD_BROWSER_WIDGETS"/>
-      	</meta>
-      	<!-- the following units can be uncommented when configuration is put in place -->
-      <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
-      	<meta rel="config">
-      		<defined condition="__WEB_WIDGETS"/>
-      	</meta>
-        <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-      </component>
-      <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
-      	<meta rel="config">
-      		<defined condition="__WEB_WIDGETS"/>
-      	</meta>
-        <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-      </component>
-      <component id="widgetlauncher" filter="s60" name="Widget Launcher">
-      	<meta rel="config">
-      		<defined condition="__WEB_WIDGETS"/>
-      	</meta>
-        <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-      </component>
-      <component id="widgetapp" filter="s60" name="Widget UI">
-      	<meta rel="config">
-      		<defined condition="__WEB_WIDGETS"/>
-      	</meta>
-        <!--<unit bldFile="widgets/widgetapp/group"/>-->
-      </component>
-      <component id="widgetsidchecker" filter="s60" name="Widget SID Checker" introduced="^3">
-      	<meta rel="config">
-      		<defined condition="APP_SID_CHECK_SUPPORT_FF"/>
-      	</meta>
-        <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-      </component>
-      <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
-      	<meta rel="config">
-      		<defined condition="RD_WIDGET_PREINSTALLER"/>
-      	</meta>
-        <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-      </component>
-      <component id="widgetstartup" filter="s60" name="Widget Startup">
-      	<meta rel="config">
-      		<defined condition="RD_WIDGET_PREINSTALLER"/>
-      	</meta>
-        <!--<unit bldFile="widgets/widgetstartup/group"/>-->
-      </component>
-      <component id="widgets_build" filter="s60" name="Widgets Build">
-      	<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+    <unit bldFile="codhandler/group"/>
+   </component>
+  </collection>
+  <collection id="widgets" name="Web Widget Framework" level="generic">
+   <meta rel="config">
+    <defined condition="RD_BROWSER_WIDGETS"/>
+   </meta>
+   <!-- the following units can be uncommented when configuration is put in place -->
+   <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
+    <meta rel="config">
+     <defined condition="__WEB_WIDGETS"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+   </component>
+   <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+    <meta rel="config">
+     <defined condition="__WEB_WIDGETS"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+   </component>
+   <component id="widgetlauncher" filter="s60" name="Widget Launcher">
+    <meta rel="config">
+     <defined condition="__WEB_WIDGETS"/>
+    </meta>
+    <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+   </component>
+   <component id="widgetapp" filter="s60" name="Widget UI">
+    <meta rel="config">
+     <defined condition="__WEB_WIDGETS"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetapp/group"/>-->
+   </component>
+   <component id="widgetsidchecker" filter="s60" name="Widget SID Checker" introduced="^3">
+    <meta rel="config">
+     <defined condition="APP_SID_CHECK_SUPPORT_FF"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
+   </component>
+   <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+    <meta rel="config">
+     <defined condition="RD_WIDGET_PREINSTALLER"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+   </component>
+   <component id="widgetstartup" filter="s60" name="Widget Startup">
+    <meta rel="config">
+     <defined condition="RD_WIDGET_PREINSTALLER"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetstartup/group"/>-->
+   </component>
+   <component id="widgets_build" filter="s60" name="Widgets Build">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
-        <unit bldFile="widgets/group"/>
-      </component>
-    </collection>
-  </package>
+    <unit bldFile="widgets/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/websrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/websrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,29 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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">
@@ -173,9 +196,6 @@
             <!-- need to include common .hrh in each unit -->
             <unit bldFile="/sf/mw/websrv/group"/>
           </component>
-          <component name="websrv_pub" filter="s60" long-name="Web Services Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/websrv/websrv_pub/group"/>
-          </component>
         </collection>
       </block>
     </layer>

--- a/symbian3/mw/websrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/websrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,105 +1,132 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="websrv" name="Web Services" levels="plugin framework server generic specific">
-    <collection id="webservices" name="Web Services Framework" level="generic">
-    	<!-- consider breaking this collection into more meaningful subsets -->
-      <component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
-        <unit bldFile="webservices/wsnotifierplugins/group"/>
-      </component>
-      <component id="wslogger" filter="s60" name="WS Logger">
-        <unit bldFile="webservices/wslogger/group"/>
-      </component>
-      <component id="wsxml" filter="s60" name="WS XML Extensions">
-        <unit bldFile="webservices/wsxml/group"/>
-      </component>
-      <component id="wsutils" filter="s60" name="WS Utils">
-        <unit bldFile="webservices/wsutils/group"/>
-      </component>
-      <component id="wsfragment" filter="s60" name="WS Fragment">
-        <unit bldFile="webservices/wsfragment/group"/>
-      </component>
-      <component id="wsdescription" filter="s60" name="WS Service Description">
-        <unit bldFile="webservices/wsdescription/group"/>
-      </component>
-      <component id="wsconnection" filter="s60" name="WS Service Connection">
-        <unit bldFile="webservices/wsconnection/group"/>
-      </component>
-      <component id="wsmessages" filter="s60" name="WS Messages">
-        <unit bldFile="webservices/wsmessages/group"/>
-      </component>
-      <component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
-        <unit bldFile="webservices/wscredentialmanager/group"/>
-      </component>
-      <component id="wsframework" filter="s60" name="WS Framework">
-        <unit bldFile="webservices/wsframework/group"/>
-      </component>
-      <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
-        <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
-      </component>
-      <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
-        <unit bldFile="webservices/wsconnectionagent/group"/>
-      </component>
-      <component id="wsprovider" filter="s60" name="WS Provider">
-        <unit bldFile="webservices/wsprovider/group"/>
-      </component>
-      <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
-        <unit bldFile="webservices/wshostletconnection/group"/>
-      </component>
-      <component id="wsmanager" filter="s60" name="WS Service Manager">
-        <unit bldFile="webservices/wsmanager/group"/>
-      </component>
-      <component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
-        <unit bldFile="webservices/wsidentitymanager/group"/>
-      </component>
-      <component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
-        <unit bldFile="webservices/idwsfplugin/group"/>
-      </component>
-      <component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
-        <unit bldFile="webservices/wsibasicplugin/group"/>
-      </component>
-      <component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
-        <unit bldFile="webservices/wsrestplugin/group"/>
-      </component>
-      <component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
-        <unit bldFile="webservices/idwsfsecuritymechanism/group"/>
-      </component>
-      <component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
-        <unit bldFile="webservices/wspasswordtransforms/group"/>
-      </component>
-      <component id="wscore" filter="s60" name="WS Core Service Manager">
-        <unit bldFile="webservices/wscore/group"/>
-      </component>
-      <component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
-        <unit bldFile="webservices/wslocaltransportplugin/group"/>
-      </component>
-      <component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
-        <unit bldFile="webservices/wshostlettransportplugin/group"/>
-      </component>
-      <component id="wsstar" filter="s60" name="WS Star">
-      	<!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
-        <unit bldFile="webservices/wsstar/wsstarpolicy/group"/>
-        <unit bldFile="webservices/wsstar/wsstarplugin/group"/>
-        <unit bldFile="webservices/wsstar/wsstarmessagehandlers/group"/>
-      </component>
-      <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
-        <unit bldFile="webservices/wsoviplugin/group"/>
-      </component>
-      <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
-        <unit bldFile="webservices/wsoviplugin/group"/>
-      </component>      
-      <component id="webservices_build" filter="s60" name="Web Services Build">
-      	<!-- need to split into self-contained components -->
-        <unit bldFile="webservices/group"/>
-      </component>
-    </collection>
-    <collection id="websrv_info" name="Web Services Info" level="specific">
-      <component id="websrv_bld" filter="s60" name="Web Services Build">
-      	<!-- need to include common .hrh in each unit -->
-        <unit bldFile="group"/>
-      </component>
-      <component id="websrv_pub" filter="s60" name="Web Services Public Interfaces" class="api">
-        <unit bldFile="websrv_pub/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="websrv" 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" href="websrv_pub/web_service_description_api/web_service_description_api.metaxml"/>
+    <unit bldFile="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" href="websrv_pub/web_service_connection_api/web_service_connection_api.metaxml"/>
+    <unit bldFile="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" href="websrv_pub/web_service_manager_api/web_service_manager_api.metaxml"/>
+    <unit bldFile="websrv_pub/web_service_manager_api/group"/>
+   </component>
+   <component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/hostlet_connection_api/hostlet_connection_api.metaxml"/>
+    <unit bldFile="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" href="websrv_pub/web_service_messaging_api/web_service_messaging_api.metaxml"/>
+    <unit bldFile="websrv_pub/web_service_messaging_api/group"/>
+   </component>
+   <component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/xml_extensions_api/xml_extensions_api.metaxml"/>
+    <unit bldFile="websrv_pub/xml_extensions_api/group"/>
+   </component>
+   <component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
+    <meta rel="Api" href="websrv_pub/xml_fragment_api/xml_fragment_api.metaxml"/>
+    <unit bldFile="websrv_pub/xml_fragment_api/group"/>
+   </component>
+  </collection>
+  <collection id="webservices" name="Web Services Framework" level="generic">
+   <!-- consider breaking this collection into more meaningful subsets -->
+   <component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
+    <unit bldFile="webservices/wsnotifierplugins/group"/>
+   </component>
+   <component id="wslogger" filter="s60" name="WS Logger">
+    <unit bldFile="webservices/wslogger/group"/>
+   </component>
+   <component id="wsxml" filter="s60" name="WS XML Extensions">
+    <unit bldFile="webservices/wsxml/group"/>
+   </component>
+   <component id="wsutils" filter="s60" name="WS Utils">
+    <unit bldFile="webservices/wsutils/group"/>
+   </component>
+   <component id="wsfragment" filter="s60" name="WS Fragment">
+    <unit bldFile="webservices/wsfragment/group"/>
+   </component>
+   <component id="wsdescription" filter="s60" name="WS Service Description">
+    <unit bldFile="webservices/wsdescription/group"/>
+   </component>
+   <component id="wsconnection" filter="s60" name="WS Service Connection">
+    <unit bldFile="webservices/wsconnection/group"/>
+   </component>
+   <component id="wsmessages" filter="s60" name="WS Messages">
+    <unit bldFile="webservices/wsmessages/group"/>
+   </component>
+   <component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
+    <unit bldFile="webservices/wscredentialmanager/group"/>
+   </component>
+   <component id="wsframework" filter="s60" name="WS Framework">
+    <unit bldFile="webservices/wsframework/group"/>
+   </component>
+   <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
+    <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
+   </component>
+   <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
+    <unit bldFile="webservices/wsconnectionagent/group"/>
+   </component>
+   <component id="wsprovider" filter="s60" name="WS Provider">
+    <unit bldFile="webservices/wsprovider/group"/>
+   </component>
+   <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
+    <unit bldFile="webservices/wshostletconnection/group"/>
+   </component>
+   <component id="wsmanager" filter="s60" name="WS Service Manager">
+    <unit bldFile="webservices/wsmanager/group"/>
+   </component>
+   <component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
+    <unit bldFile="webservices/wsidentitymanager/group"/>
+   </component>
+   <component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
+    <unit bldFile="webservices/idwsfplugin/group"/>
+   </component>
+   <component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
+    <unit bldFile="webservices/wsibasicplugin/group"/>
+   </component>
+   <component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
+    <unit bldFile="webservices/wsrestplugin/group"/>
+   </component>
+   <component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
+    <unit bldFile="webservices/idwsfsecuritymechanism/group"/>
+   </component>
+   <component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
+    <unit bldFile="webservices/wspasswordtransforms/group"/>
+   </component>
+   <component id="wscore" filter="s60" name="WS Core Service Manager">
+    <unit bldFile="webservices/wscore/group"/>
+   </component>
+   <component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
+    <unit bldFile="webservices/wslocaltransportplugin/group"/>
+   </component>
+   <component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
+    <unit bldFile="webservices/wshostlettransportplugin/group"/>
+   </component>
+   <component id="wsstar" filter="s60" name="WS Star">
+    <!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+    <unit bldFile="webservices/wsstar/wsstarpolicy/group"/>
+    <unit bldFile="webservices/wsstar/wsstarplugin/group"/>
+    <unit bldFile="webservices/wsstar/wsstarmessagehandlers/group"/>
+   </component>
+   <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+    <unit bldFile="webservices/wsoviplugin/group"/>
+   </component>
+   <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+    <unit bldFile="webservices/wsoviplugin/group"/>
+   </component>
+   <component id="webservices_build" filter="s60" name="Web Services Build">
+    <!-- need to split into self-contained components -->
+    <unit bldFile="webservices/group"/>
+   </component>
+  </collection>
+  <collection id="websrv_info" name="Web Services Info" level="specific">
+   <component id="websrv_bld" filter="s60" name="Web Services Build">
+    <!-- need to include common .hrh in each unit -->
+    <unit bldFile="group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/mw/wirelessacc/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/wirelessacc/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,20 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <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="/sf/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="/sf/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="/sf/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="/sf/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-->
@@ -119,11 +133,6 @@
             <unit bldFile="/sf/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="/sf/mw/wirelessacc/hsfw_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/mw/wirelessacc/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/wirelessacc/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,52 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="wirelessacc" name="Wireless Access" levels="framework generic ui">
-    <collection id="hotspotfw" name="HotSpot Framework" level="framework">
-      <component id="hsserver" filter="s60" name="HotSpot Server">
-      	<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-      </component>
-      <component id="hsclient" filter="s60" name="HotSpot Client">
-      	<!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
-      </component>
-      <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
-      	<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-        <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
-      </component>
-      <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
-      	<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-        <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
-      </component>
-      <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
-      	<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-        <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
-      </component>
-      <component id="hsbrowser" filter="s60" name="HotSpot Browser">
-      	<!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
-        <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
-      </component>
-      <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
-      	<!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
-        <unit bldFile="hotspotfw/group"/>
-      </component>
-    </collection>
-    <collection id="wlanutilities" name="WLAN Utilities" level="generic">
-      <component id="wlanplugin" filter="s60" name="WLAN Plugin" class="plugin">
-        <unit bldFile="wlanutilities/wlanplugin/group"/>
-      </component>
-      <component id="wlansettingsui" filter="s60" name="WLAN Settings UI">
-        <unit bldFile="wlanutilities/wlansettingsui/group"/>
-      </component>
-      <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
-        <unit bldFile="wlanutilities/wlansniffer/group"/>
-      </component>
-      <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
-        <unit bldFile="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="hsfw_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="wirelessacc" 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" href="hsfw_plat/hotspot_framework_client_api/hotspot_framework_client_api.metaxml"/>
+    <unit bldFile="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" href="hsfw_plat/internet_connectivity_test_service_api/internet_connectivity_test_service_api.metaxml"/>
+    <unit bldFile="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" href="hsfw_plat/internet_connectivity_test_service_settings_api/internet_connectivity_test_service_settings_api.metaxml"/>
+    <unit bldFile="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" href="hsfw_plat/hotspot_framework_client_plugin_api/hotspot_framework_client_plugin_api.metaxml"/>
+    <unit bldFile="hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="hotspotfw" name="HotSpot Framework" level="framework">
+   <component id="hsserver" filter="s60" name="HotSpot Server">
+    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+   </component>
+   <component id="hsclient" filter="s60" name="HotSpot Client">
+    <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+   </component>
+   <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+   </component>
+   <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+   </component>
+   <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+   </component>
+   <component id="hsbrowser" filter="s60" name="HotSpot Browser">
+    <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+    <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+   </component>
+   <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
+    <!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
+    <unit bldFile="hotspotfw/group"/>
+   </component>
+  </collection>
+  <collection id="wlanutilities" name="WLAN Utilities" level="generic">
+   <component id="wlanplugin" filter="s60" name="WLAN Plugin" class="plugin">
+    <unit bldFile="wlanutilities/wlanplugin/group"/>
+   </component>
+   <component id="wlansettingsui" filter="s60" name="WLAN Settings UI">
+    <unit bldFile="wlanutilities/wlansettingsui/group"/>
+   </component>
+   <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
+    <unit bldFile="wlanutilities/wlansniffer/group"/>
+   </component>
+   <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
+    <unit bldFile="wlanutilities/wlanindicatorplugin/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/bt/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/bt/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,17 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/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="/sf/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="/sf/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="/sf/os/bt/bluetooth/btstack" mrp="/sf/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
@@ -153,9 +164,6 @@
           </component>
         </collection>
         <collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-          <component name="bt_plat" filter="s60" class="api">
-            <unit bldFile="/sf/os/bt/bt_plat/group"/>
-          </component>
           <component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
             <unit mrp="/sf/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
           </component>

--- a/symbian3/os/bt/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/bt/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,88 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="bt" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="bluetooth" name="Bluetooth Core" level="framework">
-      <component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
-        <unit bldFile="bluetooth/btstack" mrp="bluetooth/btstack/bluetooth_stack.mrp"/>
-      </component>
-      <component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
-        <unit bldFile="bluetooth/btcomm" mrp="bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-      </component>
-      <component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
-        <unit bldFile="bluetooth/btsdp" mrp="bluetooth/btsdp/bluetooth_sdp.mrp"/>
-      </component>
-      <component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
-        <unit bldFile="bluetooth/btextnotifiers" mrp="bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-      </component>
-      <component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
-        <unit bldFile="bluetooth/gavdp/group" mrp="bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-      </component>
-      <component id="btexample" name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
-        <unit mrp="bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="bluetooth/btexample/test/group"/>
-      </component>
-      <component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
-        <unit bldFile="bluetooth/btlogger/group" mrp="bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-      </component>
-      <component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
-        <unit mrp="bluetooth/btdocs/bluetooth_documentation.mrp"/>
-      </component>
-    </collection>
-    <collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
-      <component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
-        <unit bldFile="bluetoothmgmt/btmgr" mrp="bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-      </component>
-      <component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
-        <unit bldFile="bluetoothmgmt/btconfig" mrp="bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-      </component>
-      <component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
-        <unit bldFile="bluetoothmgmt/btrom" mrp="bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-      </component>
-      <component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
-        <unit bldFile="bluetoothmgmt/bluetoothclientlib" mrp="bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-      </component>
-      <component id="btcommon" name="Bluetooth Build Utilities" purpose="optional" filter="test">
-        <unit mrp="bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="bluetoothmgmt/btcommon"/>
-      </component>
-    </collection>
-    <collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
-      <component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
-        <unit bldFile="bluetoothcommsprofiles/btpan/group" mrp="bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-      </component>
-    </collection>
-    <collection id="bthci" name="Host Controller Interface" level="server">
-      <component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
-        <unit bldFile="bthci/bthci2/group" mrp="bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-      </component>
-      <component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
-        <unit bldFile="bthci/hciextensioninterface" mrp="bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-      </component>
-      <component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
-        <unit bldFile="bthci/hci2implementations/group" mrp="bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-      </component>
-    </collection>
-    <collection id="irda" name="IrDA" level="plugin">
-      <component id="irdastack" name="IrDA Stack" purpose="optional">
-        <unit bldFile="irda/irdastack/group" mrp="irda/irdastack/group/infra-red_irda.mrp"/>
-      </component>
-    </collection>
-    <collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
-      <component id="bluetoothsvs" name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
-        <unit mrp="bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="bluetoothapitest/bluetoothsvs/group"/>
-      </component>
-    </collection>
-    <collection id="atext" name="AT Extensions" level="server">
-    	<!-- collection is really a component. Need to move down a directory -->
-      <component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
-        <unit bldFile="atext/group"/>
-      </component>
-    </collection>
-    <collection id="bt_info" name="Bluetooth Info" level="app-if">
-      <component id="bt_plat" filter="s60" class="api">
-        <unit bldFile="bt_plat/group"/>
-      </component>
-      <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-        <unit mrp="bt_info/bt_metadata/bt_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="bt" 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" href="bt_plat/bluetooth_audio_adaptation_api/bluetooth_audio_adaptation_api.metaxml"/>
+    <unit bldFile="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" href="bt_plat/bluetooth_power_management_api/bluetooth_power_management_api.metaxml"/>
+    <unit bldFile="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" href="bt_plat/at_command_handler_plugin_api/at_command_handler_plugin_api.metaxml"/>
+    <unit bldFile="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="bluetooth/btstack" mrp="bluetooth/btstack/bluetooth_stack.mrp"/>
+   </component>
+   <component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
+    <unit bldFile="bluetooth/btcomm" mrp="bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+   </component>
+   <component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
+    <unit bldFile="bluetooth/btsdp" mrp="bluetooth/btsdp/bluetooth_sdp.mrp"/>
+   </component>
+   <component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+    <unit bldFile="bluetooth/btextnotifiers" mrp="bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+   </component>
+   <component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+    <unit bldFile="bluetooth/gavdp/group" mrp="bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+   </component>
+   <component id="btexample" name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
+    <unit mrp="bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="bluetooth/btexample/test/group"/>
+   </component>
+   <component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+    <unit bldFile="bluetooth/btlogger/group" mrp="bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+   </component>
+   <component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
+    <unit mrp="bluetooth/btdocs/bluetooth_documentation.mrp"/>
+   </component>
+  </collection>
+  <collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
+   <component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
+    <unit bldFile="bluetoothmgmt/btmgr" mrp="bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+   </component>
+   <component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
+    <unit bldFile="bluetoothmgmt/btconfig" mrp="bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+   </component>
+   <component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
+    <unit bldFile="bluetoothmgmt/btrom" mrp="bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+   </component>
+   <component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+    <unit bldFile="bluetoothmgmt/bluetoothclientlib" mrp="bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+   </component>
+   <component id="btcommon" name="Bluetooth Build Utilities" purpose="optional" filter="test">
+    <unit mrp="bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="bluetoothmgmt/btcommon"/>
+   </component>
+  </collection>
+  <collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
+   <component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
+    <unit bldFile="bluetoothcommsprofiles/btpan/group" mrp="bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+   </component>
+  </collection>
+  <collection id="bthci" name="Host Controller Interface" level="server">
+   <component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+    <unit bldFile="bthci/bthci2/group" mrp="bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+   </component>
+   <component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+    <unit bldFile="bthci/hciextensioninterface" mrp="bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+   </component>
+   <component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
+    <unit bldFile="bthci/hci2implementations/group" mrp="bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+   </component>
+  </collection>
+  <collection id="irda" name="IrDA" level="plugin">
+   <component id="irdastack" name="IrDA Stack" purpose="optional">
+    <unit bldFile="irda/irdastack/group" mrp="irda/irdastack/group/infra-red_irda.mrp"/>
+   </component>
+  </collection>
+  <collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
+   <component id="bluetoothsvs" name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
+    <unit mrp="bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="bluetoothapitest/bluetoothsvs/group"/>
+   </component>
+  </collection>
+  <collection id="atext" name="AT Extensions" level="server">
+   <!-- collection is really a component. Need to move down a directory -->
+   <component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+    <unit bldFile="atext/group"/>
+   </component>
+  </collection>
+  <collection id="bt_info" name="Bluetooth Info" level="app-if">
+   <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+    <unit mrp="bt_info/bt_metadata/bt_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/cellularsrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/cellularsrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -87,11 +87,6 @@
             <unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/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="/sf/os/cellularsrv/fax/faxclientandserver/Group" mrp="/sf/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="/sf/os/cellularsrv/smsprotocols/smsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>

--- a/symbian3/os/cellularsrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/cellularsrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -11,11 +11,6 @@
         <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="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="fax/faxclientandserver/Group" mrp="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="smsprotocols/smsstack/group" mrp="smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>

--- a/symbian3/os/devicesrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/devicesrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,196 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+          </component>
+          <component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+          </component>
+          <component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
+            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+          </component>
+          <component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+          </component>
+          <component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+          </component>
+          <component name="sae_api" long-name="SAE API" filter="s60" class="api">
+            <unit bldFile="/sf/os/devicesrv/devicesrv_plat/sae_api/group"/>
+          </component>
+          <component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+          </component>
+          <component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
@@ -261,14 +451,6 @@
           </component>
         </collection>
         <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="/sf/os/devicesrv/devicesrv_plat/group"/>
-          </component>
-          <component name="devicesrv_pub" filter="s60" long-name="Device Services Public Interfaces" class="api">
-            <unit bldFile="/sf/os/devicesrv/devicesrv_pub/group"/>
-            <unit bldFile="/sf/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="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
           </component>

--- a/symbian3/os/devicesrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/devicesrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,203 +1,447 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="devicesrv" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="accessoryservices" name="Accessory Services" level="framework">
-      <component id="accessorymonitor" filter="s60" name="Accessory Monitor">
-        <unit bldFile="accessoryservices/accessorymonitor/group"/>
-      </component>
-      <component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
-        <unit bldFile="accessoryservices/accessoryremotecontrol/group"/>
-      </component>
-      <component id="accessoryserver" filter="s60" name="Accessory Server">
-        <unit bldFile="accessoryservices/accessoryserver/group"/>
-      </component>
-      <component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
-        <unit bldFile="accessoryservices/pluggeddisplay/group"/>
-      </component>
-      <component id="headsetstatusapi" filter="s60" name="Headset Status API">
-        <unit bldFile="accessoryservices/headsetstatusapi/group"/>
-      </component>
-      <component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
-        <unit bldFile="accessoryservices/tspclientmapper/group"/>
-      </component>
-      <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
-        <unit bldFile="accessoryservices/remotecontrolfw/group" mrp="accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-      </component>
-      <component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
-		<unit bldFile="accessoryservices/gid_pc_tool/group"/>
-      </component>
-    </collection>
-    <collection id="commonservices" name="Common Services" level="app-if">
-      <component id="commonengine" filter="s60" name="Common Engine">
-        <unit bldFile="commonservices/commonengine/group"/>
-      </component>
-      <component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
-        <unit bldFile="commonservices/commonengineresources/group"/>
-      </component>
-      <component id="platformenv" filter="s60" name="Platform Environment">
-        <unit bldFile="commonservices/platformenv/group"/>
-      </component>
-      <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
-        <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
-      </component>
-      <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
-        <unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
-      </component>
-    </collection>
-    <collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
-      <component id="commondsy" filter="s60" name="Common DSY" class="plugin">
-        <unit bldFile="dosservices/commondsy/group"/>
-      </component>
-      <component id="dosserver" filter="s60" name="Domestic OS Server">
-        <unit bldFile="dosservices/dosserver/group"/>
-      </component>
-    </collection>
-    <collection id="sensorservices" name="Sensor Services" level="framework">
-      <component id="sensorserver" filter="s60" name="Sensor Server">
-        <unit bldFile="sensorservices/sensorserver/group"/>
-      </component>
-      <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
-        <unit bldFile="sensorservices/orientationssy/group"/>
-      </component>
-      <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
-        <unit bldFile="sensorservices/tiltcompensationssy/group"/>
-      </component>
-      <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
-        <unit bldFile="sensorservices/sensordatacompensator/group"/>
-      </component>
-    </collection>
-    <collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
-      <component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
-        <unit bldFile="hwrmhaptics/hapticseffectdatagetterfw/group"/>
-      </component>
-      <component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
-        <unit bldFile="hwrmhaptics/hapticspluginservice/group"/>
-      </component>
-      <component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
-        <unit bldFile="hwrmhaptics/hapticspacketizer/group"/>
-      </component>
-      <component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
-        <unit bldFile="hwrmhaptics/hapticspluginmanager/group"/>
-      </component>
-      <component id="hapticsserver" filter="s60" name="Haptics Server">
-        <unit bldFile="hwrmhaptics/hapticsserver/group"/>
-      </component>
-      <component id="hapticsclient" filter="s60" name="Haptics Client">
-        <unit bldFile="hwrmhaptics/hapticsclient/group"/>
-      </component>
-      <component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
-        <!-- move these exports into the appropriate above components and delete this component-->
-        <unit bldFile="hwrmhaptics/group"/>
-      </component>
-    </collection>
-    <collection id="mediator" name="Mediator" level="app-if">
-    	<!--collection is really a component. Move it down a directory -->
-      <component id="mediator_build" filter="s60" name="Mediator Build">
-        <unit bldFile="mediator/group"/>
-      </component>
-    </collection>
-    <collection id="psmservices" name="Power Save Mode Services" level="app-if">
-      <component id="psmserver" filter="s60" name="PSM Server">
-        <unit bldFile="psmservices/psmserver/group"/>
-      </component>
-    </collection>
-    <collection id="resourcemgmt" name="Resource Management" level="hw-if">
-      <component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
-        <unit bldFile="resourcemgmt/hwrmfmtxwatcherplugin/group"/>
-      </component>
-      <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
-      	<meta rel="config">
-      		<defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
-      	</meta>
-      	<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+ <package id="devicesrv" 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" href="devicesrv_pub/platform_path_definitions_api/platform_path_definitions_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_pub/common_platform_security_definitions_api/common_platform_security_definitions_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_pub/feature_discovery_api/feature_discovery_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/feature_discovery_api/group"/>
+   </component>
+   <component id="platform_environment_api" name="Platform Environment API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/platform_environment_api/platform_environment_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/platform_environment_api/group"/>
+   </component>
+   <component id="sensor_channel_api" name="Sensor Channel API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/sensor_channel_api/sensor_channel_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/sensor_channel_api/group"/>
+   </component>
+   <component id="sensor_definitions_api" name="Sensor Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/sensor_definitions_api/sensor_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/sensor_definitions_api/group"/>
+   </component>
+   <component id="version_info_api" name="Version Info API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/version_info_api/version_info_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/version_info_api/group"/>
+   </component>
+   <component id="accessory_monitoring_api" name="Accessory Monitoring API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/accessory_monitoring_api/accessory_monitoring_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/accessory_monitoring_api/group"/>
+   </component>
+   <component id="haptics_api" name="Haptics API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/haptics_api/haptics_api.metaxml"/>
+    <unit bldFile="devicesrv_pub/haptics_api/group"/>
+   </component>
+   <component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_pub/sensor_data_compensator_api/sensor_data_compensator_api.metaxml"/>
+    <unit bldFile="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="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" href="devicesrv_plat/configuration_file_parser_api/configuration_file_parser_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/dos_extension_plugin_api/dos_extension_plugin_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/mediator_command_initiator_api/mediator_command_initiator_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_command_initiator_api/group"/>
+   </component>
+   <component id="syslangutil_api" name="SysLangUtil API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/syslangutil_api/syslangutil_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/syslangutil_api/group"/>
+   </component>
+   <component id="wakeup_alarm_api" name="Wakeup Alarm API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/wakeup_alarm_api/wakeup_alarm_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/disk_and_memory_level_keys_api/disk_and_memory_level_keys_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/mediator_plugin_api/mediator_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_plugin_api/group"/>
+   </component>
+   <component id="headset_status_api" name="Headset Status API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/headset_status_api/headset_status_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/system_startup_extension_plugin_api/system_startup_extension_plugin_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/sensor_plugin_api/sensor_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sensor_plugin_api/group"/>
+   </component>
+   <component id="accessory_api" name="Accessory API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_api/accessory_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_api/group"/>
+   </component>
+   <component id="display_language_definition_api" name="Display Language Definition API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/display_language_definition_api/display_language_definition_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/mediator_command_responder_api/mediator_command_responder_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/accessory_policy_definitions_api/accessory_policy_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_policy_definitions_api/group"/>
+   </component>
+   <component id="hw_settings_api" name="Hardware Settings API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/hw_settings_api/hw_settings_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/mediator_domain_definitions_api/mediator_domain_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_domain_definitions_api/group"/>
+   </component>
+   <component id="sensor_extension_api" name="Sensor Extension API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/sensor_extension_api/sensor_extension_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sensor_extension_api/group"/>
+   </component>
+   <component id="accessory_plugin_api" name="Accessory Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_plugin_api/accessory_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/accessory_plugin_api/group"/>
+   </component>
+   <component id="sae_api" name="SAE API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/sae_api/sae_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sae_api/group"/>
+   </component>
+   <component id="accessory_control_api" name="Accessory Control API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_control_api/accessory_control_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/mediator_static_registration_api/mediator_static_registration_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/accessory_key_event_handling_api/accessory_key_event_handling_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/mediator_notification_api/mediator_notification_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/accessory_policy_utility_api/accessory_policy_utility_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/common_dsy_plugin_api/common_dsy_plugin_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/remote_control_extension_api/remote_control_extension_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/sensor_channel_filter_api/sensor_channel_filter_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/sensor_channel_filter_api/group"/>
+   </component>
+   <component id="dos_extension_api" name="DOS Extension API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/dos_extension_api/dos_extension_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/accessory_audio_control_api/accessory_audio_control_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/mediator_event_consumer_api/mediator_event_consumer_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/mediator_event_consumer_api/group"/>
+   </component>
+   <component id="shared_data_api" name="Shared Data API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/shared_data_api/shared_data_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/shared_data_api/group"/>
+   </component>
+   <component id="accessory_settings_api" name="Accessory Settings API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/accessory_settings_api/accessory_settings_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/accessory_bluetooth_control_api/accessory_bluetooth_control_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/extended_version_info_api/extended_version_info_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/mediator_event_provider_api/mediator_event_provider_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/tv_out_config_api/tv_out_config_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/tv_out_config_api/group"/>
+   </component>
+   <component id="tspclientmapper_api" name="TSP Client Mapper API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/tspclientmapper_api/tspclientmapper_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/tspclientmapper_api/group"/>
+   </component>
+   <component id="powersave_api" name="Power Save API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/powersave_api/powersave_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/powersave_api/group"/>
+   </component>
+   <component id="powersave_definitions_api" name="Power Save Definitions API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/powersave_definitions_api/powersave_definitions_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/powersave_definitions_api/group"/>
+   </component>
+   <component id="powersave_plugin_api" name="Power Save Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/powersave_plugin_api/powersave_plugin_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/extended_version_info_plugin_api/extended_version_info_plugin_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/haptics_plugin_api/haptics_plugin_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/haptics_effect_data_getter_plugin_api/haptics_effect_data_getter_plugin_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/haptics_packetizer_plugin_api/haptics_packetizer_plugin_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+   </component>
+   <component id="tiltcompensation_api" name="Tilt Compensation API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/tiltcompensation_api/tilt_compensation_api.metaxml"/>
+    <unit bldFile="devicesrv_plat/tiltcompensation_api/group"/>
+   </component>
+   <component id="disk_notification_handler_api" name="Disk Notification Handler API" class="api" filter="s60">
+    <meta rel="Api" href="devicesrv_plat/disk_notification_handler_api/disk_notification_handler_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/accessory_policy_usb_audio_api/accessory_policy_usb_audio_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/accessory_policy_hdmi_audio_api/accessory_policy_hdmi_audio_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/sensor_data_compensator_plugin_api/sensor_data_compensator_plugin_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/ddc_access_api/ddc_access_api.metaxml"/>
+    <unit bldFile="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" href="devicesrv_plat/tv_out_behaviour_api/tv_out_behaviour_api.metaxml"/>
+    <unit bldFile="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="accessoryservices/accessorymonitor/group"/>
+   </component>
+   <component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
+    <unit bldFile="accessoryservices/accessoryremotecontrol/group"/>
+   </component>
+   <component id="accessoryserver" filter="s60" name="Accessory Server">
+    <unit bldFile="accessoryservices/accessoryserver/group"/>
+   </component>
+   <component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
+    <unit bldFile="accessoryservices/pluggeddisplay/group"/>
+   </component>
+   <component id="headsetstatusapi" filter="s60" name="Headset Status API">
+    <unit bldFile="accessoryservices/headsetstatusapi/group"/>
+   </component>
+   <component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
+    <unit bldFile="accessoryservices/tspclientmapper/group"/>
+   </component>
+   <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
+    <unit bldFile="accessoryservices/remotecontrolfw/group" mrp="accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+   </component>
+   <component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
+    <unit bldFile="accessoryservices/gid_pc_tool/group"/>
+   </component>
+  </collection>
+  <collection id="commonservices" name="Common Services" level="app-if">
+   <component id="commonengine" filter="s60" name="Common Engine">
+    <unit bldFile="commonservices/commonengine/group"/>
+   </component>
+   <component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
+    <unit bldFile="commonservices/commonengineresources/group"/>
+   </component>
+   <component id="platformenv" filter="s60" name="Platform Environment">
+    <unit bldFile="commonservices/platformenv/group"/>
+   </component>
+   <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+    <unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
+   </component>
+   <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+    <unit bldFile="commonservices/activitymanager/group" mrp="commonservices/activitymanager/group/activitymanager.mrp"/>
+   </component>
+  </collection>
+  <collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
+   <component id="commondsy" filter="s60" name="Common DSY" class="plugin">
+    <unit bldFile="dosservices/commondsy/group"/>
+   </component>
+   <component id="dosserver" filter="s60" name="Domestic OS Server">
+    <unit bldFile="dosservices/dosserver/group"/>
+   </component>
+  </collection>
+  <collection id="sensorservices" name="Sensor Services" level="framework">
+   <component id="sensorserver" filter="s60" name="Sensor Server">
+    <unit bldFile="sensorservices/sensorserver/group"/>
+   </component>
+   <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+    <unit bldFile="sensorservices/orientationssy/group"/>
+   </component>
+   <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+    <unit bldFile="sensorservices/tiltcompensationssy/group"/>
+   </component>
+   <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+    <unit bldFile="sensorservices/sensordatacompensator/group"/>
+   </component>
+  </collection>
+  <collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
+   <component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
+    <unit bldFile="hwrmhaptics/hapticseffectdatagetterfw/group"/>
+   </component>
+   <component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
+    <unit bldFile="hwrmhaptics/hapticspluginservice/group"/>
+   </component>
+   <component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
+    <unit bldFile="hwrmhaptics/hapticspacketizer/group"/>
+   </component>
+   <component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
+    <unit bldFile="hwrmhaptics/hapticspluginmanager/group"/>
+   </component>
+   <component id="hapticsserver" filter="s60" name="Haptics Server">
+    <unit bldFile="hwrmhaptics/hapticsserver/group"/>
+   </component>
+   <component id="hapticsclient" filter="s60" name="Haptics Client">
+    <unit bldFile="hwrmhaptics/hapticsclient/group"/>
+   </component>
+   <component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
+    <!-- move these exports into the appropriate above components and delete this component-->
+    <unit bldFile="hwrmhaptics/group"/>
+   </component>
+  </collection>
+  <collection id="mediator" name="Mediator" level="app-if">
+   <!--collection is really a component. Move it down a directory -->
+   <component id="mediator_build" filter="s60" name="Mediator Build">
+    <unit bldFile="mediator/group"/>
+   </component>
+  </collection>
+  <collection id="psmservices" name="Power Save Mode Services" level="app-if">
+   <component id="psmserver" filter="s60" name="PSM Server">
+    <unit bldFile="psmservices/psmserver/group"/>
+   </component>
+  </collection>
+  <collection id="resourcemgmt" name="Resource Management" level="hw-if">
+   <component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
+    <unit bldFile="resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+   </component>
+   <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
+    <meta rel="config">
+     <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
-        <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-      </component>
-      <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
-        <unit bldFile="resourcemgmt/vibractrl/group"/>
-      </component>
-      <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
-        <unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-      </component>
-      <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
-        <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
-      </component>
-      <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-         <!-- Move exports to a self-contained component.
+    <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+   </component>
+   <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+    <unit bldFile="resourcemgmt/vibractrl/group"/>
+   </component>
+   <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+    <unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+   </component>
+   <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+    <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+   </component>
+   <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
+    <!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
-        <unit bldFile="resourcemgmt/group"/>
-      </component>
-      <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-        <unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-      </component>
-    </collection>
-	<collection id="sysstatemgmt" name="System State Management" level="server">
-      <component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
-        <unit bldFile="sysstatemgmt/ssmmapperutility/group"/>
-      </component>
-      <component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
-        <unit bldFile="sysstatemgmt/ssmpolicyplugins/group"/>
-      </component>
-      <component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
-        <unit bldFile="sysstatemgmt/ssmutilityplugins/group"/>
-      </component>
-      <component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
-        <unit bldFile="sysstatemgmt/ssmcmdlists/group"/>
-      </component>
-      <component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
-        <unit bldFile="sysstatemgmt/ssmcustcmds/group"/>
-      </component>
-      <component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
-        <unit bldFile="sysstatemgmt/syslangutil/group"/>
-      </component>
-      <component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
-        <unit bldFile="sysstatemgmt/sysrestart/group"/>
-      </component>
-      <component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
-        <unit bldFile="sysstatemgmt/sysuiprovider/group"/>
-      </component>
-      <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-        <unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-      </component>
-      <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
-        <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-      </component>
-      <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="sysstatemgmt/systemstateplugins/group" mrp="sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-      </component>
-      <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-      </component>
-    </collection>
-    <collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
-      <component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
-        <unit bldFile="resourceinterfaces/fmtransmittercontrol/group" mrp="resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-      </component>
-    </collection>
-    <collection id="systemhealthmanagement" name="System Health Management" level="server">
-      <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
-        <unit bldFile="systemhealthmanagement/systemhealthmgr/group" mrp="systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-      </component>
-    </collection>
-    <collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
-      <component id="accessorieshaitest" name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="devicesrvapitest/accessorieshaitest/group"/>
-      </component>
-      <component id="hwrmhaitest" name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="devicesrvapitest/hwrmhaitest/group"/>
-      </component>
-    </collection>
-    <collection id="devicesrv_info" name="Device Services Info" level="app-if">
-      <component id="devicesrv_plat" filter="s60" name="Device Services Platform Interfaces" class="api">
-        <unit bldFile="devicesrv_plat/group"/>
-      </component>
-      <component id="devicesrv_pub" filter="s60" name="Device Services Public Interfaces" class="api">
-        <unit bldFile="devicesrv_pub/group"/>
-        <unit bldFile="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="devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+    <unit bldFile="resourcemgmt/group"/>
+   </component>
+   <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+    <unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+   </component>
+  </collection>
+  <collection id="sysstatemgmt" name="System State Management" level="server">
+   <component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmmapperutility/group"/>
+   </component>
+   <component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmpolicyplugins/group"/>
+   </component>
+   <component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmutilityplugins/group"/>
+   </component>
+   <component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmcmdlists/group"/>
+   </component>
+   <component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
+    <unit bldFile="sysstatemgmt/ssmcustcmds/group"/>
+   </component>
+   <component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
+    <unit bldFile="sysstatemgmt/syslangutil/group"/>
+   </component>
+   <component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
+    <unit bldFile="sysstatemgmt/sysrestart/group"/>
+   </component>
+   <component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
+    <unit bldFile="sysstatemgmt/sysuiprovider/group"/>
+   </component>
+   <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+    <unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+   </component>
+   <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+    <unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+   </component>
+   <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="sysstatemgmt/systemstateplugins/group" mrp="sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+   </component>
+   <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+   </component>
+  </collection>
+  <collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
+   <component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
+    <unit bldFile="resourceinterfaces/fmtransmittercontrol/group" mrp="resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+   </component>
+  </collection>
+  <collection id="systemhealthmanagement" name="System Health Management" level="server">
+   <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+    <unit bldFile="systemhealthmanagement/systemhealthmgr/group" mrp="systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+   </component>
+  </collection>
+  <collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
+   <component id="accessorieshaitest" name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="devicesrvapitest/accessorieshaitest/group"/>
+   </component>
+   <component id="hwrmhaitest" name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="devicesrvapitest/hwrmhaitest/group"/>
+   </component>
+  </collection>
+  <collection id="devicesrv_info" name="Device Services Info" level="app-if">
+   <component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/graphics/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/graphics/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -128,11 +128,12 @@
             <unit bldFile="/sf/os/graphics/graphicstest/uibench/group" mrp="/sf/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="/sf/os/graphics/graphics_plat/m3g_core_api/group"/>
-            <!-- cope with missing graphics_plat/group -->
           </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="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
           </component>

--- a/symbian3/os/graphics/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/graphics/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,158 +1,161 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-    <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
-      <component id="vgi" filter="s60" name="VGI">
-        <unit bldFile="graphicsaccelaration/vgi/group"/>
-      </component>
-    </collection>
-    <collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
-      <component id="m3gcore11" filter="s60" name="M3G Core 1.1">
-        <unit bldFile="m3g/m3gcore11/group"/>
-      </component>
-    </collection>
-    <collection id="graphicsresourceservices" name="Graphics Resource Services" level="engines">
-      <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsresourceservices/graphicsresource/group" mrp="graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
-      </component>
-      <component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsresourceservices/graphicsresourceadaptation/group" mrp="graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicsutils" name="Graphics Utils" level="engines">
-      <component id="commongraphicsheaders" name="Common Graphics Headers" introduced="^3" purpose="mandatory">
-        <unit bldFile="graphicsutils/commongraphicsheaders/group" mrp="graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
-      <!-- displayldd to be moved here -->
-      <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
-        <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicscomposition" name="Graphics Composition" level="engines">
-      <component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
-        <unit bldFile="graphicscomposition/openwfcinterface/group" mrp="graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
-      </component>
-      <component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
-        <unit bldFile="graphicscomposition/openwfcompositionengine/group" mrp="graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
-      </component>
-      <component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
-        <unit bldFile="graphicscomposition/openwfsupport/group" mrp="graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
-      </component>
-     <component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
-      <unit bldFile="graphicscomposition/surfaceupdate/group" mrp="graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
-     </component>
-    </collection>
-    <collection id="graphicstest" name="Graphics Test" level="app-if">
-      <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
-        <unit mrp="graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="graphicstest/graphicstestharness/group"/>
-      </component>
-      <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
-        <unit bldFile="graphicstest/uibench/group" mrp="graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphics_info" name="Graphics Info" level="app-if">
-      <component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
-        <unit bldFile="graphics_plat/m3g_core_api/group"/> <!-- cope with missing graphics_plat/group -->
-      </component>
-      <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
-        <unit mrp="graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-      </component>
-      <component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-      </component>
-    </collection>
-    <collection id="windowing" name="Windowing" level="app-if">
-     <component id="windowserver" name="Window Server" purpose="mandatory">
-      <unit bldFile="windowing/windowserver/group" mrp="windowing/windowserver/group/graphics_wserv.mrp"/>
-     </component>
-     <component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
-      <unit bldFile="windowing/windowserverplugins/group" mrp="windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
-     </component>
-    </collection>
-    <collection id="printingservices" name="Printing Services" level="app-if">
-      <component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
-        <unit bldFile="printingservices/printerdriversupport/group" mrp="printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-      </component>
-      <component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
-        <unit bldFile="printingservices/printerdrivers/group" mrp="printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-      </component>
-    </collection>
-    <collection id="fbs" name="Font and Bitmap Server" level="device-interface">
-      <component id="fontandbitmapserver" name="Font and Bitmap Server" purpose="mandatory">
-        <unit bldFile="fbs/fontandbitmapserver/group" mrp="fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-      </component>
-    </collection>
-    <collection id="opengles" name="OpenGLES" level="internal-adaptations">
-      <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
-        <unit bldFile="opengles/openglesinterface/group" mrp="opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-      </component>
-      <component id="opengles_stub" filter="sf_build" name="OpenGL ES Stub" purpose="optional" introduced="^2">
-        <unit bldFile="opengles/openglesinterface/group/opengles_stub"/>
-      </component>
-    </collection>
-    <collection id="openvg" name="OpenVG" level="internal-adaptations">
-      <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
-        <unit bldFile="openvg/openvginterface/group" mrp="openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-      </component>
-      <component id="openvg11" filter="s60" name="OpenVG 1.1">
-     	<!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
-        <unit bldFile="openvg/openvginterface/group/openvg11"/>
-      </component>
-      <component id="sfopenvg" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
-        <unit bldFile="openvg/openvgrefimplementation/sfopenvg/group"/>
-      </component>
-    </collection>
-    <collection id="egl" name="EGL" level="internal-adaptations">
-      <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
-        <unit bldFile="egl/eglinterface/group" mrp="egl/eglinterface/group/graphics_eglheaders.mrp"/>
-      </component>
-      <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
-        <unit bldFile="egl/eglswitch/group" mrp="egl/eglswitch/group/graphics_eglswitch.mrp"/>
-      </component>
-      <component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
-        <unit bldFile="egl/eglrefimpl/group" mrp="egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
-      </component>
-      <component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
-        <unit bldFile="egl/egltest/group" mrp="egl/egltest/group/graphics_egltest.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
-      <component id="gdi" name="GDI" purpose="mandatory">
-        <unit bldFile="graphicsdeviceinterface/gdi/group" mrp="graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-      </component>
-      <component id="bitgdi" name="BitGDI" purpose="mandatory">
-        <unit bldFile="graphicsdeviceinterface/bitgdi/group" mrp="graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-      </component>
-      <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
-        <unit bldFile="graphicsdeviceinterface/colourpalette/group" mrp="graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-      </component>
-      <component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
-        <unit bldFile="graphicsdeviceinterface/screendriver/group" mrp="graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-      </component>
-      <component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsdeviceinterface/directgdi/group" mrp="graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
-      </component>
-      <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsdeviceinterface/directgdiinterface/group" mrp="graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
-      </component>
-      <component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-        <unit bldFile="graphicsdeviceinterface/directgdiadaptation/group" mrp="graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
-      <component id="gdi_tools" name="GDI Tools" purpose="development" target="desktop">
-        <unit bldFile="graphicstools/gdi_tools/group" mrp="graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-      </component>
-    </collection>
-    <collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
-      <component id="graphicssvs" name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
-        <unit mrp="graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="graphicsapitest/graphicssvs/group"/>
-      </component>
-      <component id="screendriverhaitest" name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
-	<unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="graphicsapitest/screendriverhaitest/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+  <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+   <component id="vgi" filter="s60" name="VGI">
+    <unit bldFile="graphicsaccelaration/vgi/group"/>
+   </component>
+  </collection>
+  <collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
+   <component id="m3gcore11" filter="s60" name="M3G Core 1.1">
+    <unit bldFile="m3g/m3gcore11/group"/>
+   </component>
+  </collection>
+  <collection id="graphicsresourceservices" name="Graphics Resource Services" level="engines">
+   <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
+    <unit bldFile="graphicsresourceservices/graphicsresource/group" mrp="graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
+   </component>
+   <component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+    <unit bldFile="graphicsresourceservices/graphicsresourceadaptation/group" mrp="graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+   </component>
+  </collection>
+  <collection id="graphicsutils" name="Graphics Utils" level="engines">
+   <component id="commongraphicsheaders" name="Common Graphics Headers" introduced="^3" purpose="mandatory">
+    <unit bldFile="graphicsutils/commongraphicsheaders/group" mrp="graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
+   </component>
+  </collection>
+  <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+   <!-- displayldd to be moved here -->
+   <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
+    <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
+   </component>
+  </collection>
+  <collection id="graphicscomposition" name="Graphics Composition" level="engines">
+   <component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+    <unit bldFile="graphicscomposition/openwfcinterface/group" mrp="graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+   </component>
+   <component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
+    <unit bldFile="graphicscomposition/openwfcompositionengine/group" mrp="graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+   </component>
+   <component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
+    <unit bldFile="graphicscomposition/openwfsupport/group" mrp="graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+   </component>
+   <component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
+    <unit bldFile="graphicscomposition/surfaceupdate/group" mrp="graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+   </component>
+  </collection>
+  <collection id="graphicstest" name="Graphics Test" level="app-if">
+   <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
+    <unit mrp="graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="graphicstest/graphicstestharness/group"/>
+   </component>
+   <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
+    <unit bldFile="graphicstest/uibench/group" mrp="graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+   </component>
+  </collection>
+  <collection id="graphics_plat" name="Graphics Platform Interfaces" level="app-if">
+   <component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
+    <meta rel="Api" href="graphics_plat/m3g_core_api/m3g_core_api.metaxml"/>
+    <unit bldFile="graphics_plat/m3g_core_api/group"/>
+   </component>
+  </collection>
+  <collection id="graphics_info" name="Graphics Info" level="app-if">
+   <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
+    <unit mrp="graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+   </component>
+   <component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+   </component>
+  </collection>
+  <collection id="windowing" name="Windowing" level="app-if">
+   <component id="windowserver" name="Window Server" purpose="mandatory">
+    <unit bldFile="windowing/windowserver/group" mrp="windowing/windowserver/group/graphics_wserv.mrp"/>
+   </component>
+   <component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="windowing/windowserverplugins/group" mrp="windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+   </component>
+  </collection>
+  <collection id="printingservices" name="Printing Services" level="app-if">
+   <component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
+    <unit bldFile="printingservices/printerdriversupport/group" mrp="printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+   </component>
+   <component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
+    <unit bldFile="printingservices/printerdrivers/group" mrp="printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+   </component>
+  </collection>
+  <collection id="fbs" name="Font and Bitmap Server" level="device-interface">
+   <component id="fontandbitmapserver" name="Font and Bitmap Server" purpose="mandatory">
+    <unit bldFile="fbs/fontandbitmapserver/group" mrp="fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+   </component>
+  </collection>
+  <collection id="opengles" name="OpenGLES" level="internal-adaptations">
+   <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
+    <unit bldFile="opengles/openglesinterface/group" mrp="opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+   </component>
+   <component id="opengles_stub" filter="sf_build" name="OpenGL ES Stub" purpose="optional" introduced="^2">
+    <unit bldFile="opengles/openglesinterface/group/opengles_stub"/>
+   </component>
+  </collection>
+  <collection id="openvg" name="OpenVG" level="internal-adaptations">
+   <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
+    <unit bldFile="openvg/openvginterface/group" mrp="openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+   </component>
+   <component id="openvg11" filter="s60" name="OpenVG 1.1">
+    <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
+    <unit bldFile="openvg/openvginterface/group/openvg11"/>
+   </component>
+   <component id="sfopenvg" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+    <unit bldFile="openvg/openvgrefimplementation/sfopenvg/group"/>
+   </component>
+  </collection>
+  <collection id="egl" name="EGL" level="internal-adaptations">
+   <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
+    <unit bldFile="egl/eglinterface/group" mrp="egl/eglinterface/group/graphics_eglheaders.mrp"/>
+   </component>
+   <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
+    <unit bldFile="egl/eglswitch/group" mrp="egl/eglswitch/group/graphics_eglswitch.mrp"/>
+   </component>
+   <component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
+    <unit bldFile="egl/eglrefimpl/group" mrp="egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+   </component>
+   <component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
+    <unit bldFile="egl/egltest/group" mrp="egl/egltest/group/graphics_egltest.mrp"/>
+   </component>
+  </collection>
+  <collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
+   <component id="gdi" name="GDI" purpose="mandatory">
+    <unit bldFile="graphicsdeviceinterface/gdi/group" mrp="graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+   </component>
+   <component id="bitgdi" name="BitGDI" purpose="mandatory">
+    <unit bldFile="graphicsdeviceinterface/bitgdi/group" mrp="graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+   </component>
+   <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
+    <unit bldFile="graphicsdeviceinterface/colourpalette/group" mrp="graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+   </component>
+   <component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
+    <unit bldFile="graphicsdeviceinterface/screendriver/group" mrp="graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+   </component>
+   <component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+    <unit bldFile="graphicsdeviceinterface/directgdi/group" mrp="graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+   </component>
+   <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
+    <unit bldFile="graphicsdeviceinterface/directgdiinterface/group" mrp="graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
+   </component>
+   <component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+    <unit bldFile="graphicsdeviceinterface/directgdiadaptation/group" mrp="graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+   </component>
+  </collection>
+  <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
+   <component id="gdi_tools" name="GDI Tools" purpose="development" target="desktop">
+    <unit bldFile="graphicstools/gdi_tools/group" mrp="graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+   </component>
+  </collection>
+  <collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
+   <component id="graphicssvs" name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
+    <unit mrp="graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="graphicsapitest/graphicssvs/group"/>
+   </component>
+   <component id="screendriverhaitest" name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="graphicsapitest/screendriverhaitest/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/imagingext/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/imagingext/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,33 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+            <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group" filter="test,api_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="/sf/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="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+            <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
@@ -94,20 +121,6 @@
             <unit bldFile="/sf/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="/sf/os/imagingext/imagingext_plat/group"/>
-          </component>
-          <component name="imagingext_pub" filter="s60" long-name="Imaging Extensions Public Interfaces" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_pub/group"/>
-          </component>
-          <component name="imagingext_test" filter="s60,test,api_test" long-name="Imaging Extensions Platform API Tests" purpose="development">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
-          </component>
-          <component name="imagingext_test" filter="s60,test,api_test" long-name="Imaging Extensions Public API Tests" purpose="development">
-            <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>

--- a/symbian3/os/imagingext/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/imagingext/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
-      <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
-        <unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
-      </component>
-      <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
-      	<!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-        <unit bldFile="imageadaptationextensions/group"/>
-      </component>
-    </collection>
-    <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
-      <component id="exiflib" filter="s60" name="Exif Library">
-        <unit bldFile="imagingmodules/exiflib/group"/>
-      </component>
-      <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
-        <unit bldFile="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="imagingext_plat/group"/>
-      </component>
-      <component id="imagingext_pub" filter="s60" name="Imaging Extensions Public Interfaces" class="api">
-        <unit bldFile="imagingext_pub/group"/>
-      </component>
-      <component id="imagingext_test" filter="s60,test,api_test" name="Imaging Extensions Platform API Tests" purpose="development">
-        <unit bldFile="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="imagingext_pub/exif_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="imagingext" 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" href="imagingext_pub/exif_api/exif_api.metaxml"/>
+    <unit bldFile="imagingext_pub/exif_api/group" filter="!test"/>
+    <unit bldFile="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" href="imagingext_plat/jpeg2000_icl_plugin_api/jpeg2000_icl_plugin_api.metaxml"/>
+    <unit bldFile="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" href="imagingext_plat/extended_icl_jpeg_api/extended_icl_jpeg_api.metaxml"/>
+    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+    <unit bldFile="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" href="imagingext_plat/h324_annex_k_custom_api/h324_annex_k_custom_api.metaxml"/>
+    <unit bldFile="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" href="imagingext_plat/ecam_orientation_custom_api/ecam_orientation_custom_api.metaxml"/>
+    <unit bldFile="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" href="imagingext_plat/ecam_ui_orientation_override_custom_api/ecam_ui_orientation_override_custom_api.metaxml"/>
+    <unit bldFile="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" href="imagingext_plat/ecam_face_tracking_custom_api/ecam_face_tracking_custom_api.metaxml"/>
+    <unit bldFile="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="imageadaptationextensions/iclextjpegapi/group"/>
+   </component>
+   <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
+    <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
+    <unit bldFile="imageadaptationextensions/group"/>
+   </component>
+  </collection>
+  <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
+   <component id="exiflib" filter="s60" name="Exif Library">
+    <unit bldFile="imagingmodules/exiflib/group"/>
+   </component>
+   <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
+    <unit bldFile="imagingmodules/jp2kcodec/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/kernelhwsrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/kernelhwsrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -79,7 +79,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="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+            <unit bldFile="/sf/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
           </component>
         </collection>
         <collection name="bsptemplate" long-name="Board Support Package Template" level="hw-if">

--- a/symbian3/os/kernelhwsrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/kernelhwsrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -3,7 +3,7 @@
   <package id="kernelhwsrv" 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="brdbootldr/ubootldr/base_ubootldr.mrp"/>
+        <unit bldFile="brdbootldr/ubootldr" mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
       </component>
     </collection>
     <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">

--- a/symbian3/os/mm/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/mm/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,247 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/mm/mm_plat/eaacplusutil_api/group"/>
+          </component>
+          <component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/os/mm/devsoundextensions/drmaudioplayer/group"/>
@@ -175,12 +416,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="/sf/os/mm/mm_plat/group"/>
-          </component>
-          <component name="mm_pub" filter="s60" long-name="Multimedia Public Interfaces" class="api">
-            <unit bldFile="/sf/os/mm/mm_pub/group"/>
-          </component>
           <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
             <unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
           </component>

--- a/symbian3/os/mm/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/mm/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,243 +1,557 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
-    <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
-      <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
-        <unit bldFile="devsoundextensions/drmaudioplayer/group" />
-      </component>
-      <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
-        <unit bldFile="devsoundextensions/mmextfw/group" />
-      </component>
-      <component id="audiorouting" filter="s60" name="Audio Routing">
-        <unit bldFile="devsoundextensions/audiorouting/group" />
-      </component>
-      <component id="effects" filter="s60" name="Effects">
-        <unit bldFile="devsoundextensions/effects/group" />
-      </component>
-      <component id="effectspresets" filter="s60" name="Effects Presets">
-        <unit bldFile="devsoundextensions/effectspresets/group" />
-      </component>
-      <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-      	<!-- need to #include the lot from a single bld.inf
+ <package id="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" href="mm_pub/audio_effects_api/audio_effects_api.metaxml"/>
+    <unit bldFile="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" href="mm_pub/audio_effects_presets_api/audio_effects_presets_api.metaxml"/>
+    <unit bldFile="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" href="mm_pub/drm_audio_player_api/drm_audio_player_api.metaxml"/>
+    <unit bldFile="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" href="mm_pub/multimedia_extension_interfaces_api/multimedia_extension_interfaces_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/aac_decoder_config_api/aac_decoder_config_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/aac_decoder_config_msg_hdlr_api/aac_decoder_config_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/aac_decoder_config_proxy_api/aac_decoder_config_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/added_devsound_control_api/added_devsound_control_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/added_devsound_control_msg_hdlr_api/added_devsound_control_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/added_devsound_control_proxy_api/added_devsound_control_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/audio_effects_msg_hdlr_api/audio_effects_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/audio_effects_proxy_api/audio_effects_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/audio_policy_header_api/audio_policy_header_api.metaxml"/>
+    <unit bldFile="mm_plat/audio_policy_header_api/group"/>
+   </component>
+   <component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/audio_routing_api/audio_routing_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/audio_routing_msg_hdlr_api/audio_routing_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/audio_routing_proxy_api/audio_routing_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/custom_interface_builder_api/custom_interface_builder_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/custom_interface_message_handler_factory_api/custom_interface_message_handler_factory_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/custom_interface_proxy_factory_api/custom_interface_proxy_factory_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/custom_interface_utility_api/custom_interface_utility_api.metaxml"/>
+    <unit bldFile="mm_plat/custom_interface_utility_api/group"/>
+   </component>
+   <component id="devsound_adaptation_api" name="DevSound Adaptation API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/devsound_adaptation_api/devsound_adaptation_api.metaxml"/>
+    <unit bldFile="mm_plat/devsound_adaptation_api/group"/>
+   </component>
+   <component id="display_posting_api" name="Display Posting API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/display_posting_api/display_posting_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/eaac_plus_decoder_interface_api/eaac_plus_decoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/eaac_plus_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/eaac_plus_decoder_interface_proxy_api/eaac_plus_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/error_concealment_interface_api/error_concealment_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/error_concealment_interface_msg_hdlr_api/error_concealment_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/error_concealment_interface_proxy_api/error_concealment_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/fm_radio_adaptation_api/fm_radio_adaptation_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g711_decoder_interface_api/g711_decoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g711_decoder_interface_msg_hdlr_api/g711_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g711_decoder_interface_proxy_api/g711_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g711_encoder_interface_api/g711_encoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g711_encoder_interface_msg_hdlr_api/g711_encoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g711_encoder_interface_proxy_api/g711_encoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g729_decoder_interface_api/g729_decoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g729_decoder_interface_msg_hdlr_api/g729_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g729_decoder_interface_proxy_api/g729_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g729_encoder_interface_api/g729_encoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g729_encoder_interface_proxy_api/g729_encoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/g729_encoder_interface_msg_hdlr_api/g729_encoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/global_audio_settings_api/global_audio_settings_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/global_audio_settings_definition_api/global_audio_settings_definition_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ilbc_decoder_interface_api/ilbc_decoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ilbc_decoder_interface_msg_hdlr_api/ilbc_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ilbc_decoder_interface_proxy_api/ilbc_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ilbc_encoder_interface_api/ilbc_encoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ilbc_encoder_interface_msg_hdlr_api/ilbc_encoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ilbc_encoder_interface_proxy_api/ilbc_encoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/mdf_plugin_uids/mdf_plugin_uids.metaxml"/>
+    <unit bldFile="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" href="mm_plat/multimedia_fourcc_definitions_api/multimedia_fourcc_definitions_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/nokia_audio_policy_header_api/nokia_audio_policy_header_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/nokia_multimedia_fourcc_definitions_api/nokia_multimedia_fourcc_definitions_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ra8_decoder_interface_api/ra8_decoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ra8_decoder_interface_msg_hdlr_api/ra8_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/ra8_decoder_interface_proxy_api/ra8_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/rds_adaptation_api/rds_adaptation_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/restricted_audio_output_api/restricted_audio_output_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/restricted_audio_output_msg_hdlr_api/restricted_audio_output_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/restricted_audio_output_proxy_api/restricted_audio_output_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/sbc_encoder_interface_api/sbc_encoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/sbc_encoder_interface_msg_hdlr_api/sbc_encoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/sbc_encoder_interface_proxy_api/sbc_encoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/secure_output_mdf_custom_interface/secure_output_mdf_custom_interface.metaxml"/>
+    <unit bldFile="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" href="mm_plat/speech_encoder_config_api/speech_encoder_config_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/speech_encoder_config_msg_hdlr_api/speech_encoder_config_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/speech_encoder_config_proxy_api/speech_encoder_config_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/telephony_audio_routing_client_api/telephony_audio_routing_client_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/telephony_audio_routing_manager_api/telephony_audio_routing_manager_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/video_buffer_management_mdf_custom_interface/video_buffer_management_mdf_custom_interface.metaxml"/>
+    <unit bldFile="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" href="mm_plat/video_decoder_rotation_mdf_custom_interface/video_decoder_rotation_mdf_custom_interface.metaxml"/>
+    <unit bldFile="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" href="mm_plat/video_decoder_scaling_mdf_custom_interface/video_decoder_scaling_mdf_custom_interface.metaxml"/>
+    <unit bldFile="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" href="mm_plat/video_reclaim_extbuffers_ci/video_reclaim_extbuffers_ci.metaxml"/>
+    <unit bldFile="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" href="mm_plat/video_window_control_custom_interface/video_window_control_custom_interface.metaxml"/>
+    <unit bldFile="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" href="mm_plat/wma_decoder_interface_api/wma_decoder_interface_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/wma_decoder_interface_msg_hdlr_api/wma_decoder_interface_msg_hdlr_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/wma_decoder_interface_proxy_api/wma_decoder_interface_proxy_api.metaxml"/>
+    <unit bldFile="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" href="mm_plat/eaacplusutil_api/eaacplusutil_api.metaxml"/>
+    <unit bldFile="mm_plat/eaacplusutil_api/group"/>
+   </component>
+   <component id="frametable_api" name="Frametable API" class="api" filter="s60">
+    <meta rel="Api" href="mm_plat/frametable_api/frametable_api.metaxml"/>
+    <unit bldFile="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="devsoundextensions/drmaudioplayer/group"/>
+   </component>
+   <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
+    <unit bldFile="devsoundextensions/mmextfw/group"/>
+   </component>
+   <component id="audiorouting" filter="s60" name="Audio Routing">
+    <unit bldFile="devsoundextensions/audiorouting/group"/>
+   </component>
+   <component id="effects" filter="s60" name="Effects">
+    <unit bldFile="devsoundextensions/effects/group"/>
+   </component>
+   <component id="effectspresets" filter="s60" name="Effects Presets">
+    <unit bldFile="devsoundextensions/effectspresets/group"/>
+   </component>
+   <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
+    <!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
-	    <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
-		<unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-		<unit bldFile="devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
-      </component>
-      <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
-        <unit bldFile="devsoundextensions/telephonyaudiorouting/group" />
-      </component>
-      <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
-        <unit bldFile="devsoundextensions/mmfcustominterfaces/group" />
-      </component>
-      <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
-        <unit bldFile="devsoundextensions/addeddevsoundcontrol/group" />
-      </component>
-      <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
-        <unit bldFile="devsoundextensions/globalaudiosettings/group" />
-      </component>
-      <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
-        <unit bldFile="devsoundextensions/restrictedaudiooutput/group" />
-      </component>
-      <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
-        <unit bldFile="devsoundextensions/ciextnfactoryplugins/group" />
-      </component>
-    </collection>
-    <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
-      <component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
-        <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
-      </component>
-    </collection>
-    <collection id="audio" name="Audio Codecs" level="middleware">
-      <component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
-        <unit bldFile="audio/arm_cmmf_codecs/group"/>
-      </component>
-    </collection>
-    <collection id="video" name="Video Codecs" level="middleware">
-    	<!-- empty -->
-    </collection>
-    <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
-      <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
-        <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-      </component>
-      <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
-        <unit mrp="imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imagingandcamerafws/imagingunittest/group"/>
-      </component>
-      <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
-        <unit mrp="imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imagingandcamerafws/imaginginttest/group"/>
-      </component>
-      <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
-		<unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-      </component>
-      <component id="cameraunittest" name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
-        <unit mrp="imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="imagingandcamerafws/cameraunittest/group"/>
-      </component>
-    </collection>
-	<collection id="mmlibs" name="Multimedia Libraries" level="middleware">
-	  <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
-		<unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-	  </component>
-	 <component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
-		<unit bldFile="mmlibs/mmfw/group" mrp="mmlibs/mmfw/group/multimedia_mmf.mrp"/>
-	 </component>
-    </collection>
-    <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
-      <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="mmplugins/imagingplugins/group" mrp="mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
-      </component>
-      <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
-		<unit bldFile="mmplugins/cameraplugins/group" mrp="mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-      </component>
-      <component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
-        <unit bldFile="mmplugins/lib3gp/group" mrp="mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
-      </component>
-      <component id="lib3gpunittest" name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="mmplugins/lib3gpunittest/group"/>
-      </component>
-      <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="mmplugins/mmfwplugins/group" mrp="mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
-      </component>
-    </collection>
-    <collection id="mm_info" name="Multimedia Info" level="app-if">
-      <component id="mm_plat" filter="s60" name="Multimedia Platform Interfaces" class="api">
-        <unit bldFile="mm_plat/group"/>
-      </component>
-      <component id="mm_pub" filter="s60" name="Multimedia Public Interfaces" class="api">
-        <unit bldFile="mm_pub/group"/>
-      </component>
-      <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
-        <unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
-      </component>
-      <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
-        <unit bldFile="tsrc/group"/>
-      </component>
-      <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
-      </component>
-    </collection>
-    <collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
-      <component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
-        <unit bldFile="mmresourcemgmt/mmresctrl/group" mrp="mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-      </component>
-    </collection>
-    <collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
-      <component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
-        <unit bldFile="mmdevicefw/mdf/group" mrp="mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-      </component>
-      <component id="mdfunittest" name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
-        <unit mrp="mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="mmdevicefw/mdfunittest/group"/>
-      </component>
-      <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
-        <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
-      </component>
-    </collection>
-    <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
-      <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
-				<unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/> 
-      </component>
-    </collection>
-    <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
-      <component id="mmtestfw" name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
-        <unit mrp="mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="mmtestenv/mmtestfw/group"/>
-      </component>
-      <component id="mmtestfwunittest" name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
-        <unit mrp="mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="mmtestenv/mmtestfwunittest/group"/>
-      </component>
-      <component id="mmtestagent" name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
-        <unit mrp="mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="mmtestenv/mmtestagent/group"/>
-      </component>
-      <component id="mmtesttools" name="Multimedia Test Tools" purpose="development" filter="test">
-        <unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
-      </component>
-    </collection>
-    <collection id="omxil" name="OpenMAX IL" level="hw-if">
-      <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
-        <unit version="1" bldFile="omxil/omxilapi/group" mrp="omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
-	  </component>
-      <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
-        <unit version="1" bldFile="omxil/omxilcore/group" mrp="omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
-      </component>
-      <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
-        <unit version="1" bldFile="omxil/omxilcomponentcommon/group" mrp="omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
-      </component>
-      <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
-        <unit version="1" bldFile="omxil/omxilrefcomps/ref_components/group" mrp="omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
-      </component>
-      <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
-        <unit mrp="omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="omxil/omxilunittest/group"/>
-      </component>
-      <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
-        <unit mrp="omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="omxil/omxilcoreconftest/group"/>
-      </component>
-      <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
-        <unit bldFile="omxil/mmilapi/group" mrp="omxil/mmilapi/group/multimedia_il_api.mrp"/>
-      </component>
-    </collection>
-    <collection id="devsound" name="Sound Device" level="devices">
-      <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
-        <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
-      </component>
-      <component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
-        <unit bldFile="devsound/a3fdevsound/group" mrp="devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-      </component>
-      <component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
-        <unit bldFile="devsound/a3facf/group" mrp="devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-      </component>
-      <component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
-        <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
-      </component>
-      <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
-        <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
-      </component>
-      <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin">
-        <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-      </component>
-      <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
-        <unit bldFile="devsound/a3ftrace/group" mrp="devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-      </component>
-      <component id="a3fintegrationtest" name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="devsound/a3fintegrationtest/group"/>
-      </component>
-      <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
-        <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-      </component>
-    </collection>
-    <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-      <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
-        <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
-      </component>
-      <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
-        <unit bldFile="mmhais/a3facl/group" mrp="mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-      </component>
-      <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
-        <unit bldFile="mmhais/a3fdevsoundcustomisation/group" mrp="mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-      </component>
-      <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
-        <unit bldFile="mmhais/refacladapt/group" mrp="mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-      </component>
-      <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
-				<unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_videohai.mrp"/>				                      
-	  </component>
-      <component id="dvbhreceiverhai" name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
-        <unit bldFile="mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
-      </component>
-      <component id="dvbhunittest" name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="mmhais/dvbhunittest/hai/dvbh/group"/>
-      </component>
-    </collection>
-    <collection id="mmapitest" name="Multimedia API Tests" level="app-if">
-      <component id="mmsvs" name="Multimedia Verification Suite" introduced="^2" purpose="development">
-        <unit mrp="mmapitest/mmsvs/group/mmsvs.mrp"/>
-      </component>
-      <component id="devvideohaitest" name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="mmapitest/devvideohaitest/group"/>
-      </component>
-      <component id="devsoundhaitest" name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="mmapitest/devsoundhaitest/group"/>
-      </component>
-      <component id="devsoundexthaitest" name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="mmapitest/devsoundexthaitest/group"/>
-      </component>
-    </collection>
-  </package>
+    <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+    <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+    <unit bldFile="devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
+   </component>
+   <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
+    <unit bldFile="devsoundextensions/telephonyaudiorouting/group"/>
+   </component>
+   <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
+    <unit bldFile="devsoundextensions/mmfcustominterfaces/group"/>
+   </component>
+   <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
+    <unit bldFile="devsoundextensions/addeddevsoundcontrol/group"/>
+   </component>
+   <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
+    <unit bldFile="devsoundextensions/globalaudiosettings/group"/>
+   </component>
+   <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
+    <unit bldFile="devsoundextensions/restrictedaudiooutput/group"/>
+   </component>
+   <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
+    <unit bldFile="devsoundextensions/ciextnfactoryplugins/group"/>
+   </component>
+  </collection>
+  <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
+   <component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
+    <unit bldFile="mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+   </component>
+  </collection>
+  <collection id="audio" name="Audio Codecs" level="middleware">
+   <component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
+    <unit bldFile="audio/arm_cmmf_codecs/group"/>
+   </component>
+  </collection>
+  <collection id="video" name="Video Codecs" level="middleware">
+   <!-- empty -->
+  </collection>
+  <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+   <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+   </component>
+   <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+    <unit mrp="imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imagingandcamerafws/imagingunittest/group"/>
+   </component>
+   <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+    <unit mrp="imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imagingandcamerafws/imaginginttest/group"/>
+   </component>
+   <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
+    <unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+   </component>
+   <component id="cameraunittest" name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
+    <unit mrp="imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="imagingandcamerafws/cameraunittest/group"/>
+   </component>
+  </collection>
+  <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
+   <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+    <unit bldFile="mmlibs/mmutilitylib/group" mrp="mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+   </component>
+   <component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="mmlibs/mmfw/group" mrp="mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
+   <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="mmplugins/imagingplugins/group" mrp="mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+   </component>
+   <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="mmplugins/cameraplugins/group" mrp="mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+   </component>
+   <component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
+    <unit bldFile="mmplugins/lib3gp/group" mrp="mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+   </component>
+   <component id="lib3gpunittest" name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="mmplugins/lib3gpunittest/group"/>
+   </component>
+   <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="mmplugins/mmfwplugins/group" mrp="mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+   </component>
+  </collection>
+  <collection id="mm_info" name="Multimedia Info" level="app-if">
+   <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
+    <unit mrp="mm_info/mmdocs/multimedia_documentation.mrp"/>
+   </component>
+   <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
+    <unit bldFile="tsrc/group"/>
+   </component>
+   <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="mm_info/mm_metadata/mm_metadata.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
+   <component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
+    <unit bldFile="mmresourcemgmt/mmresctrl/group" mrp="mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
+   <component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
+    <unit bldFile="mmdevicefw/mdf/group" mrp="mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+   </component>
+   <component id="mdfunittest" name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
+    <unit mrp="mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="mmdevicefw/mdfunittest/group"/>
+   </component>
+   <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+   <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
+    <unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
+   <component id="mmtestfw" name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
+    <unit mrp="mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="mmtestenv/mmtestfw/group"/>
+   </component>
+   <component id="mmtestfwunittest" name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+    <unit mrp="mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="mmtestenv/mmtestfwunittest/group"/>
+   </component>
+   <component id="mmtestagent" name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
+    <unit mrp="mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="mmtestenv/mmtestagent/group"/>
+   </component>
+   <component id="mmtesttools" name="Multimedia Test Tools" purpose="development" filter="test">
+    <unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
+   </component>
+  </collection>
+  <collection id="omxil" name="OpenMAX IL" level="hw-if">
+   <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
+    <unit version="1" bldFile="omxil/omxilapi/group" mrp="omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
+   </component>
+   <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
+    <unit version="1" bldFile="omxil/omxilcore/group" mrp="omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
+   </component>
+   <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+    <unit version="1" bldFile="omxil/omxilcomponentcommon/group" mrp="omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
+   </component>
+   <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+    <unit version="1" bldFile="omxil/omxilrefcomps/ref_components/group" mrp="omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
+   </component>
+   <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
+    <unit mrp="omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="omxil/omxilunittest/group"/>
+   </component>
+   <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
+    <unit mrp="omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="omxil/omxilcoreconftest/group"/>
+   </component>
+   <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+    <unit bldFile="omxil/mmilapi/group" mrp="omxil/mmilapi/group/multimedia_il_api.mrp"/>
+   </component>
+  </collection>
+  <collection id="devsound" name="Sound Device" level="devices">
+   <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+   </component>
+   <component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
+    <unit bldFile="devsound/a3fdevsound/group" mrp="devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+   </component>
+   <component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+    <unit bldFile="devsound/a3facf/group" mrp="devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+   </component>
+   <component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+    <unit bldFile="devsound/devsoundpluginsupport/group" mrp="devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+   </component>
+   <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
+    <unit bldFile="devsound/devsoundrefplugin/group" mrp="devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
+   </component>
+   <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin">
+    <unit bldFile="devsound/sounddevbt/group" mrp="devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+   </component>
+   <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
+    <unit bldFile="devsound/a3ftrace/group" mrp="devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+   </component>
+   <component id="a3fintegrationtest" name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="devsound/a3fintegrationtest/group"/>
+   </component>
+   <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
+    <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+   </component>
+  </collection>
+  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+   <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
+    <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
+   </component>
+   <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
+    <unit bldFile="mmhais/a3facl/group" mrp="mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+   </component>
+   <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
+    <unit bldFile="mmhais/a3fdevsoundcustomisation/group" mrp="mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+   </component>
+   <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
+    <unit bldFile="mmhais/refacladapt/group" mrp="mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+   </component>
+   <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
+    <unit bldFile="mmhais/videohai/group" mrp="mmhais/videohai/group/multimedia_videohai.mrp"/>
+   </component>
+   <component id="dvbhreceiverhai" name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
+    <unit bldFile="mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+   </component>
+   <component id="dvbhunittest" name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="mmhais/dvbhunittest/hai/dvbh/group"/>
+   </component>
+  </collection>
+  <collection id="mmapitest" name="Multimedia API Tests" level="app-if">
+   <component id="mmsvs" name="Multimedia Verification Suite" introduced="^2" purpose="development">
+    <unit mrp="mmapitest/mmsvs/group/mmsvs.mrp"/>
+   </component>
+   <component id="devvideohaitest" name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="mmapitest/devvideohaitest/group"/>
+   </component>
+   <component id="devsoundhaitest" name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="mmapitest/devsoundhaitest/group"/>
+   </component>
+   <component id="devsoundexthaitest" name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="mmapitest/devsoundexthaitest/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/osrndtools/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/osrndtools/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -187,10 +187,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="/sf/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="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
           </component>

--- a/symbian3/os/osrndtools/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/osrndtools/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -42,19 +42,20 @@
     <unit bldFile="stif/suevent/group"/>
    </component>
    <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
-      	<meta rel="config">
-      		<defined condition="__S60_"/>
-      	</meta>
-      	<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-        <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+    <meta rel="config">
+     <defined condition="__S60_"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+    <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
    </component>
    <component id="stif_build" filter="s60" name="STIF Build" purpose="development">
-   	<!--  move exports into self-contained component. Remove this when configuration is in place-->
+    <!--  move exports into self-contained component. Remove this when configuration is in place-->
     <unit bldFile="stif/group"/>
    </component>
   </collection>
   <collection id="memspy" name="Memspy" level="trace">
     <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+    <meta rel="Api" href="memspy/memspy_plat/memspy_api/memspy_api.metaxml"/>
       <unit bldFile="memspy/memspy_plat/group"/>
     </component>
    <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
@@ -70,12 +71,13 @@
     <unit bldFile="memspy/console/group"/>
    </component>
    <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
-   	<!--  move exports into self-contained component.-->
+    <!--  move exports into self-contained component.-->
     <unit bldFile="memspy/group"/>
    </component>
   </collection>
   <collection id="hti" name="Harmonized Test Interface" level="trace">
     <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+    <meta rel="Api" href="hti/hti_plat/hti_api/hti_api.metaxml"/>
       <unit bldFile="hti/hti_plat/group"/>
     </component>
    <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
@@ -87,24 +89,21 @@
    <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
     <unit bldFile="hti/htiframework/group"/>
    </component>
-
    <component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
-   	<!-- need to #include these from a single unit or separate into component at the right directory level -->
-		<unit bldFile="hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
-		<unit bldFile="hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
-		<unit bldFile="hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
-		<unit bldFile="hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+    <!-- need to #include these from a single unit or separate into component at the right directory level -->
+    <unit bldFile="hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+    <unit bldFile="hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+    <unit bldFile="hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+    <unit bldFile="hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
    </component>
    <component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
-   	<!-- need to #include these from a single unit or separate into component at the right directory level -->
-		<unit bldFile="hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
-		<unit bldFile="hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
-		<unit bldFile="hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
-		<unit bldFile="hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
-		<unit bldFile="hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+    <!-- need to #include these from a single unit or separate into component at the right directory level -->
+    <unit bldFile="hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+    <unit bldFile="hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+    <unit bldFile="hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+    <unit bldFile="hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+    <unit bldFile="hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
    </component>
-
-
    <component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
     <unit bldFile="hti/htifilehlp/group"/>
    </component>
@@ -112,17 +111,14 @@
     <unit bldFile="hti/htiwatchdog/group"/>
    </component>
    <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
-   	<!--  move exports into self-contained component.-->
+    <!--  move exports into self-contained component.-->
     <unit bldFile="hti/group"/>
    </component>
   </collection>
-    <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
-      <component id="osrndtools_plat" filter="s60" name="OS R&amp;D tools Platform Interfaces" class="api" purpose="development">
-        <unit bldFile="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="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+  <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
+   <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/ossrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/ossrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,82 +1,356 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/os/ossrv/ossrv_pub/boost_apis/group"/>
+          </component>
+          <component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+          </component>
+          <component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/ossrv/ossrv_pub/exceptions/group"/>
+          </component>
+          <component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/gboxed/group"/>
+          </component>
+          <component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/ossrv/ossrv_pub/glib_basic_types/group"/>
+          </component>
+          <component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/ossrv/ossrv_pub/glib_hook_functions/group"/>
+          </component>
+          <component name="glib_internationalization" long-name="Glib  Internationalization API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
+          </component>
+          <component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/ossrv/ossrv_pub/glib_thread_pools/group"/>
+          </component>
+          <component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_threads/group"/>
+          </component>
+          <component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
+          </component>
+          <component name="gobject" long-name="GObject API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/gobject/group"/>
+          </component>
+          <component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/gparamspec/group"/>
+          </component>
+          <component name="gtype" long-name="GType API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/gtype/group"/>
+          </component>
+          <component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/gtypemodule/group"/>
+          </component>
+          <component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/gtypeplugin/group"/>
+          </component>
+          <component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/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="/sf/os/ossrv/ossrv_pub/memory/group"/>
+          </component>
+          <component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+          </component>
+          <component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/openc_headers/group"/>
+          </component>
+          <component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/openc_wrappers/group"/>
+          </component>
+          <component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+          </component>
+          <component name="stl" long-name="STL API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/stl/group"/>
+          </component>
+          <component name="thread_api" long-name="Thread API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/thread_api/group"/>
+          </component>
+          <component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/type_attributes/group"/>
+          </component>
+          <component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/typeinfo/group"/>
+          </component>
+          <component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+          </component>
+          <component name="dbus_api" long-name="Dbus API" filter="s60" class="api">
+            <unit bldFile="/sf/os/ossrv/ossrv_pub/dbus/group"/>
+          </component>
+          <component name="dbus-glib" long-name="Dbus-glib API" filter="s60" class="api">
+            <unit bldFile="/sf/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="/sf/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="/sf/os/ossrv/stdlibs/libz/group"/>
@@ -96,18 +370,23 @@
         <collection name="glib" long-name="GLib" level="utilities">
           <component name="glibbackend" filter="s60" long-name="GLib Backend">
             <unit bldFile="/sf/os/ossrv/glib/glibbackend/group"/>
+            <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
           </component>
           <component name="libglib" filter="s60" long-name="GLib Library">
             <unit bldFile="/sf/os/ossrv/glib/libglib/group"/>
+            <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
           </component>
           <component name="libgthread" filter="s60" long-name="Libg Thread">
             <unit bldFile="/sf/os/ossrv/glib/libgthread/group"/>
+            <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
           </component>
           <component name="libgmodule" filter="s60" long-name="Libg Module">
             <unit bldFile="/sf/os/ossrv/glib/libgmodule/group"/>
+            <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
           </component>
           <component name="libgobject" filter="s60" long-name="Libg Object">
             <unit bldFile="/sf/os/ossrv/glib/libgobject/group"/>
+            <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
           </component>
         </collection>
         <collection name="stdcpp" long-name="C++ Standard Library" level="translation">
@@ -124,7 +403,7 @@
             <unit bldFile="/sf/os/ossrv/ofdbus/dbus-glib/group"/>
           </component>
           <component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-            <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+            <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
             <unit bldFile="/sf/os/ossrv/ofdbus/group"/>
           </component>
@@ -195,13 +474,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="/sf/os/ossrv/rom"/>
-          </component>
-          <component name="ossrv_plat" filter="s60" long-name="Generic OS Services Platform Interfaces" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_plat/libutils/group"/>
-          </component>
-          <component name="ossrv_pub" filter="s60" long-name="Generic OS Services Public Interfaces" class="api">
-            <unit bldFile="/sf/os/ossrv/ossrv_pub/group"/>
+            <unit bldFile="/sf/os/ossrv/group"/>
           </component>
           <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>

--- a/symbian3/os/ossrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/ossrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,6 +1,367 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="ossrv" 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" href="ossrv_pub/boost_apis/boost_apis.metaxml"/>
+    <unit bldFile="ossrv_pub/boost_apis/group"/>
+   </component>
+   <component id="cpp_wrappers" name="Cpp wrappers" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/cpp_wrappers/cpp_wrappers.metaxml"/>
+    <unit bldFile="ossrv_pub/cpp_wrappers/group"/>
+   </component>
+   <component id="character_type_apis" name="Character Type APIs" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/character_type_apis/character_type_apis.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/compiler_specific_runtime_support/compiler_specific_runtime_support.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/configuration/configuration.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/crypto_authentication_codes_and_hash_functions_api/crypto_authentication_codes_and_hash_functions_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/crypto_auxillary_functions_api/crypto_auxillary_functions_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_auxillary_functions_api/group"/>
+   </component>
+   <component id="crypto_certificates_api" name="Crypto Certificates API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/crypto_certificates_api/crypto_certificates_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/crypto_inputoutput_and_data_encoding_api/crypto_inputoutput_and_data_encoding_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/crypto_public_key_cryptography_and_key_agreement_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/crypto_symmetric_ciphers_api/crypto_symmetric_ciphers_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/crypto_utility_functions_api/crypto_utility_functions_api.metaxml"/>
+    <unit bldFile="ossrv_pub/crypto_utility_functions_api/group"/>
+   </component>
+   <component id="cryptogaphy_related_api" name="Cryptogaphy Related API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/cryptogaphy_related_api/cryptogaphy_related_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/debug/debug.metaxml"/>
+    <unit bldFile="ossrv_pub/debug/group"/>
+   </component>
+   <component id="ossrv_exceptions_api" name="Generic OS Services Exceptions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/exceptions/exceptions.metaxml"/>
+    <unit bldFile="ossrv_pub/exceptions/group"/>
+   </component>
+   <component id="gboxed" name="GBoxed API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gboxed/gboxed.metaxml"/>
+    <unit bldFile="ossrv_pub/gboxed/group"/>
+   </component>
+   <component id="glib_arrays" name="Glib Arrays API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_arrays/glib_arrays.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_arrays/group"/>
+   </component>
+   <component id="glib_asynchronous_queues" name="Glib Asynchronous Queues API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_asynchronous_queues/glib_asynchronous_queues.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_asynchronous_queues/group"/>
+   </component>
+   <component id="glib_atomic_operations" name="Glib Atomic Operations API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_atomic_operations/glib_atomic_operations.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_automatic_string_completion/glib_automatic_string_completion.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_balanced_binary_trees/glib_balanced_binary_trees.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_basic_types/glib_basic_types.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_basic_types/group"/>
+   </component>
+   <component id="glib_caches" name="Glib Caches API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_caches/glib_caches.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_character_set_conversion/glib_character_set_conversion.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_character_set_conversion/group"/>
+   </component>
+   <component id="glib_closures" name="Glib Closures API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_closures/glib_closures.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_commandline_option_parser/glib_commandline_option_parser.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_commandline_option_parser/group"/>
+   </component>
+   <component id="glib_datasets" name="Glib Datasets API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_datasets/glib_datasets.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_date_and_time_functions/glib_date_and_time_functions.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_doubleended_queues/glib_doubleended_queues.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_doublylinked_lists/glib_doublylinked_lists.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_dynamic_loading_of_modules/glib_dynamic_loading_of_modules.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_enums_and_flags/glib_enums_and_flags.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_error_reporting/glib_error_reporting.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_error_reporting/group"/>
+   </component>
+   <component id="glib_file_utilities" name="Glib File Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_file_utilities/glib_file_utilities.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_file_utilities/group"/>
+   </component>
+   <component id="glib_generic_values" name="Glib Generic Values API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_generic_values/glib_generic_values.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_globstyle_pattern_matching/glib_globstyle_pattern_matching.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_hash_tables/glib_hash_tables.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_hash_tables/group"/>
+   </component>
+   <component id="glib_hook_functions" name="Glib Hook Functions API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_hook_functions/glib_hook_functions.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_hook_functions/group"/>
+   </component>
+   <component id="glib_internationalization" name="Glib  Internationalization API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_internationalization/glib_internationalization.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_internationalization/group"/>
+   </component>
+   <component id="glib_io_channels" name="Glib I/O Channels API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_io_channels/glib_io_channels.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_keyvalue_file_parser/glib_keyvalue_file_parser.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_lexical_scanner/glib_lexical_scanner.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_main_event_loop/glib_main_event_loop.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_memory_allocation/glib_memory_allocation.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_memory_allocation/group"/>
+   </component>
+   <component id="glib_memory_slices" name="Glib Memory Slices API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_memory_slices/glib_memory_slices.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_memory_slices/group"/>
+   </component>
+   <component id="glib_message_logging" name="Glib Message Logging API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_message_logging/glib_message_logging.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_miscellaneous_utility_functions/glib_miscellaneous_utility_functions.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_nary_trees/glib_nary_trees.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_parameters_and_values/glib_parameters_and_values.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_parameters_and_values/group"/>
+   </component>
+   <component id="glib_quarks" name="Glib Quarks API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_quarks/glib_quarks.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_quarks/group"/>
+   </component>
+   <component id="glib_random_numbers" name="Glib Random Numbers API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_random_numbers/glib_random_numbers.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_relations_and_tuples/glib_relations_and_tuples.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_shellrelated_utilities/glib_shellrelated_utilities.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_shellrelated_utilities/group"/>
+   </component>
+   <component id="glib_signals" name="Glib Signals API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_signals/glib_signals.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_simple_xml_subset_parser/glib_simple_xml_subset_parser.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_singlylinked_lists/glib_singlylinked_lists.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_singlylinked_lists/group"/>
+   </component>
+   <component id="glib_spawning_processes" name="Glib Spawning Processes API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_spawning_processes/glib_spawning_processes.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_spawning_processes/group"/>
+   </component>
+   <component id="glib_standard_macros" name="Glib Standard Macros API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_standard_macros/glib_standard_macros.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_string_utility_functions/glib_string_utility_functions.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_string_utility_functions/group"/>
+   </component>
+   <component id="glib_strings" name="Glib Strings API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_strings/glib_strings.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_strings/group"/>
+   </component>
+   <component id="glib_thread_pools" name="Glib Thread Pools API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_thread_pools/glib_thread_pools.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_thread_pools/group"/>
+   </component>
+   <component id="glib_threads" name="Glib Threads API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_threads/glib_threads.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_threads/group"/>
+   </component>
+   <component id="glib_timers" name="Glib Timers API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_timers/glib_timers.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_timers/group"/>
+   </component>
+   <component id="glib_unicode_manipulation" name="Glib Unicode Manipulation API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_unicode_manipulation/glib_unicode_manipulation.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_unicode_manipulation/group"/>
+   </component>
+   <component id="glib_value_arrays" name="Glib Value Arrays API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/glib_value_arrays/glib_value_arrays.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/glib_varargs_value_collection/glib_varargs_value_collection.metaxml"/>
+    <unit bldFile="ossrv_pub/glib_varargs_value_collection/group"/>
+   </component>
+   <component id="gobject" name="GObject API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gobject/gobject.metaxml"/>
+    <unit bldFile="ossrv_pub/gobject/group"/>
+   </component>
+   <component id="gparamspec" name="GParamSpec API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gparamspec/gparamspec.metaxml"/>
+    <unit bldFile="ossrv_pub/gparamspec/group"/>
+   </component>
+   <component id="gtype" name="GType API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gtype/gtype.metaxml"/>
+    <unit bldFile="ossrv_pub/gtype/group"/>
+   </component>
+   <component id="gtypemodule" name="GTypeModule API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gtypemodule/gtypemodule.metaxml"/>
+    <unit bldFile="ossrv_pub/gtypemodule/group"/>
+   </component>
+   <component id="gtypeplugin" name="GTypePlugin API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/gtypeplugin/gtypeplugin.metaxml"/>
+    <unit bldFile="ossrv_pub/gtypeplugin/group"/>
+   </component>
+   <component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/io_stream_api/io_stream_api.metaxml"/>
+    <unit bldFile="ossrv_pub/io_stream_api/group"/>
+   </component>
+   <component id="localization_function_api" name="Localization Function API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/localization_function_api/localization_function_api.metaxml"/>
+    <unit bldFile="ossrv_pub/localization_function_api/group"/>
+   </component>
+   <component id="math_operations_api" name="Math Operations API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/math_operations_api/math_operations_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/memory/memory.metaxml"/>
+    <unit bldFile="ossrv_pub/memory/group"/>
+   </component>
+   <component id="no_namespace_headers" name="No Namespace Headers" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/no_namespace_headers/no_namespace_headers.metaxml"/>
+    <unit bldFile="ossrv_pub/no_namespace_headers/group"/>
+   </component>
+   <component id="openc_headers" name="OpenC headers" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/openc_headers/openc_headers.metaxml"/>
+    <unit bldFile="ossrv_pub/openc_headers/group"/>
+   </component>
+   <component id="openc_wrappers" name="OpenC wrappers" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/openc_wrappers/openc_wrappers.metaxml"/>
+    <unit bldFile="ossrv_pub/openc_wrappers/group"/>
+   </component>
+   <component id="ssl_general_api" name="SSL General API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/ssl_general_api/ssl_general_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/ssl_protocol_methods_api/ssl_protocol_methods_api.metaxml"/>
+    <unit bldFile="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" href="ossrv_pub/standard_compressiondecompression_api/standard_compressiondecompression_api.metaxml"/>
+    <unit bldFile="ossrv_pub/standard_compressiondecompression_api/group"/>
+   </component>
+   <component id="stl" name="STL API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/stl/stl.metaxml"/>
+    <unit bldFile="ossrv_pub/stl/group"/>
+   </component>
+   <component id="thread_api" name="Thread API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/thread_api/thread_api.metaxml"/>
+    <unit bldFile="ossrv_pub/thread_api/group"/>
+   </component>
+   <component id="type_attributes" name="Type Attributes API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/type_attributes/type_attributes.metaxml"/>
+    <unit bldFile="ossrv_pub/type_attributes/group"/>
+   </component>
+   <component id="typeinfo" name="Type Info API" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/typeinfo/typeinfo.metaxml"/>
+    <unit bldFile="ossrv_pub/typeinfo/group"/>
+   </component>
+   <component id="utility_apis" name="Utility APIs" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/utility_apis/utility_apis.metaxml"/>
+    <unit bldFile="ossrv_pub/utility_apis/group"/>
+   </component>
+   <component id="wide_character_classapis" name="Wide character class/apis" class="api" filter="s60">
+    <meta rel="Api" href="ossrv_pub/wide_character_classapis/wide_character_classapis.metaxml"/>
+    <unit bldFile="ossrv_pub/wide_character_classapis/group"/>
+   </component>
+   <component id="dbus_api" name="Dbus API" class="api" filter="s60">
+    <unit bldFile="ossrv_pub/dbus/group"/>
+   </component>
+   <component id="dbus-glib" name="Dbus-glib API" class="api" filter="s60">
+    <unit bldFile="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="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="stdlibs/libz/group"/>
@@ -19,19 +380,24 @@
     </collection>
     <collection id="glib" name="GLib" level="utilities">
       <component id="glibbackend" filter="s60" name="GLib Backend">
-        <unit bldFile="glib/glibbackend/group"/>
+        <unit bldFile="glib/build/symbian/glibbackend/group"/>
+        <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
       </component>
       <component id="libglib" filter="s60" name="GLib Library">
-        <unit bldFile="glib/libglib/group"/>
+        <unit bldFile="glib/build/symbian/glib/group"/>
+        <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
       </component>
       <component id="libgthread" filter="s60" name="Libg Thread">
-        <unit bldFile="glib/libgthread/group"/>
+        <unit bldFile="glib/build/symbian/gthread/group"/>
+        <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
       </component>
       <component id="libgmodule" filter="s60" name="Libg Module">
-        <unit bldFile="glib/libgmodule/group"/>
+        <unit bldFile="glib/build/symbian/gmodule/group"/>
+        <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
       </component>
       <component id="libgobject" filter="s60" name="Libg Object">
-        <unit bldFile="glib/libgobject/group"/>
+        <unit bldFile="glib/build/symbian/gobject/group"/>
+        <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
       </component>
     </collection>
     <collection id="stdcpp" name="C++ Standard Library" level="translation">
@@ -48,7 +414,7 @@
         <unit bldFile="ofdbus/dbus-glib/group"/>
       </component>
       <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-            <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+            <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
         <unit bldFile="ofdbus/group"/>
       </component>
@@ -104,6 +470,9 @@
       <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
         <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
       </component>
+	  <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
+        <unit bldFile="genericopenlibs/liboil/group" mrp="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">
@@ -119,13 +488,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="rom"/>
-      </component>
-      <component id="ossrv_plat" filter="s60" name="Generic OS Services Platform Interfaces" class="api">
-        <unit bldFile="ossrv_plat/libutils/group"/>
-      </component>
-      <component id="ossrv_pub" filter="s60" name="Generic OS Services Public Interfaces" class="api">
-        <unit bldFile="ossrv_pub/group"/>
+        <unit bldFile="group"/>
       </component>
       <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>

--- a/symbian3/os/security/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/security/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -97,10 +97,12 @@
           <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
             <unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
           </component>
-          <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development" filter="test">
-            <!-- remove test filter once cafstreamingsupport is available -->
+          <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
             <unit bldFile="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/sf/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
           </component>
+          <component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="^3" purpose="optional">
+            <unit bldFile="/sf/os/security/contentmgmt/cafstreamingsupport/group" mrp="/sf/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">

--- a/symbian3/os/security/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/security/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -21,10 +21,12 @@
       <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
         <unit bldFile="contentmgmt/cafrecogniserconfig" mrp="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="contentmgmt/referencedrmagent/RefTestAgent/group" mrp="contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
       </component>
+      <component id="cafstreamingsupport" name="CAF Streaming Support" introduced="^3" purpose="optional">
+        <unit bldFile="contentmgmt/cafstreamingsupport/group" mrp="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">

--- a/symbian3/os/textandloc/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/textandloc/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,22 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
@@ -155,12 +171,6 @@
           </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="/sf/os/textandloc/textandloc_pub/group"/>
-          </component>
-          <component name="textandloc_plat" filter="s60" long-name="Text and Localisation Platform Interfaces" class="api">
-            <unit bldFile="/sf/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="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
           </component>

--- a/symbian3/os/textandloc/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/textandloc/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,93 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
-    <collection id="charconvfw" name="Character Conversion" level="encoding">
-      <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
-        <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-      </component>
-      <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
-        <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-      </component>
-      <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
-        <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-      </component>      
-    </collection>
-    <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
-      <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin">
-        <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-      </component>
-      <component id="fontstore" name="Font Store" purpose="mandatory">
-        <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
-      </component>
-     <component id="textrendering" name="Text Rendering" purpose="mandatory">
-     	<!-- placeholder for text code from GDI -->
-     </component>      
-      <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
-        <unit bldFile="fontservices/freetypefontrasteriser/group" mrp="fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-      </component>
-      <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
-        <unit bldFile="fontservices/referencefonts/group" mrp="fontservices/referencefonts/group/graphics_fonts.mrp"/>
-      </component>
-    </collection>
-    <collection id="textlayout" name="Text Layout" level="text">
-      <component id="texthandling" name="Text Handling" purpose="optional">
-        <unit bldFile="textrendering/texthandling/group" mrp="textrendering/texthandling/group/app-framework_etext.mrp"/>
-      </component>
-      <component id="textformatting" name="Text Formatting" purpose="optional">
-        <unit bldFile="textrendering/textformatting/group" mrp="textrendering/textformatting/group/app-framework_form.mrp"/>
-      </component>
-      <component id="word" name="Word" purpose="development" filter="test">
-        <unit mrp="textrendering/word/group/app-framework_word.mrp" bldFile="textrendering/word/group"/>
-      </component>
-    </collection>
-    <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
-    	<!-- components in this collection need to be moved to the right collection.
+ <package id="textandloc" 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" href="textandloc_plat/findutil_api/findutil_api.metaxml"/>
+    <unit bldFile="textandloc_plat/findutil_api/group"/>
+   </component>
+   <component id="japanese_language_utilities_api" name="Japanese Language Utilities API" class="api" filter="s60">
+    <meta rel="Api" href="textandloc_plat/japanese_language_utilities_api/japanese_language_utilities_api.metaxml"/>
+    <unit bldFile="textandloc_plat/japanese_language_utilities_api/group"/>
+   </component>
+   <component id="sortutil_api" name="Sorting Utility API" class="api" filter="s60">
+    <meta rel="Api" href="textandloc_plat/sortutil_api/sortutil_api.metaxml"/>
+    <unit bldFile="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" href="textandloc_pub/directory_localizer_api/directory_localizer_api.metaxml"/>
+    <unit bldFile="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="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+   </component>
+   <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+    <unit bldFile="charconvfw/charconvplugins/group" mrp="charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+   </component>
+   <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+    <unit bldFile="charconvfw/fatfilenameconversionplugins/group" mrp="charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+   </component>
+  </collection>
+  <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+   <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin">
+    <unit bldFile="fontservices/textshaperplugin/group" mrp="fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+   </component>
+   <component id="fontstore" name="Font Store" purpose="mandatory">
+    <unit bldFile="fontservices/fontstore/group" mrp="fontservices/fontstore/group/graphics_fntstore.mrp"/>
+   </component>
+   <component id="textrendering" name="Text Rendering" purpose="mandatory">
+    <!-- placeholder for text code from GDI -->
+   </component>
+   <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+    <unit bldFile="fontservices/freetypefontrasteriser/group" mrp="fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+   </component>
+   <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+    <unit bldFile="fontservices/referencefonts/group" mrp="fontservices/referencefonts/group/graphics_fonts.mrp"/>
+   </component>
+  </collection>
+  <collection id="textlayout" name="Text Layout" level="text">
+   <component id="texthandling" name="Text Handling" purpose="optional">
+    <unit bldFile="textrendering/texthandling/group" mrp="textrendering/texthandling/group/app-framework_etext.mrp"/>
+   </component>
+   <component id="textformatting" name="Text Formatting" purpose="optional">
+    <unit bldFile="textrendering/textformatting/group" mrp="textrendering/textformatting/group/app-framework_form.mrp"/>
+   </component>
+   <component id="word" name="Word" purpose="development" filter="test">
+    <unit mrp="textrendering/word/group/app-framework_word.mrp" bldFile="textrendering/word/group"/>
+   </component>
+  </collection>
+  <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+   <!-- components in this collection need to be moved to the right collection.
     		Either move into the units' directories, or create a new textandlocutils directory -->
-      <component id="numbergrouping" filter="s60" name="Number Grouping">
-        <unit bldFile="charconvfw/numbergrouping/group"/>
-      </component>
-      <component id="jplangutil" filter="s60" name="Japanese Language Utilities">
-        <unit bldFile="charconvfw/jplangutil/group"/>
-      </component>
-      <component id="sortutil" filter="s60" name="Sorting Utility">
-        <unit bldFile="charconvfw/sortutil/group"/>
-      </component>
-      <component id="inlinetext" filter="s60" name="Inline Text">
-        <unit bldFile="charconvfw/inlinetext/group"/>
-      </component>
-     <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
-     	<!-- placeholder for split from bafl -->
-     </component>
-      <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
-        <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-      </component>
-    </collection>
-    <collection id="localesupport" name="Locale Support" level="util">
-      <component id="reflocales" name="Reference Locales"  purpose="optional" class="plugin">
-        <unit bldFile="localisation/localesupport" mrp="localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-      </component>
-     <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
-     	<!-- placeholder for split from bafl -->
-     </component>
-    </collection>
-    <collection id="textandloctools" name="Text and Localisation Tools"  level="tools">
-      <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
-        <!-- placeholder for split from GDI Tools -->
-      </component>
-      <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
-        <unit bldFile="../graphics/graphicstools/bitmapfonttools/group" mrp="../graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-      </component>
-    </collection>    
-    <collection id="textandloc_info" name="Text and Localisation Info" level="text">
-      <component id="textandloc_pub" filter="s60" name="Text and Localisation Public Interfaces" class="api">
-        <unit bldFile="textandloc_pub/group"/>
-      </component>
-      <component id="textandloc_plat" filter="s60" name="Text and Localisation Platform Interfaces" class="api">
-        <unit bldFile="textandloc_plat/group"/>
-      </component>
-      <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+   <component id="numbergrouping" filter="s60" name="Number Grouping">
+    <unit bldFile="charconvfw/numbergrouping/group"/>
+   </component>
+   <component id="jplangutil" filter="s60" name="Japanese Language Utilities">
+    <unit bldFile="charconvfw/jplangutil/group"/>
+   </component>
+   <component id="sortutil" filter="s60" name="Sorting Utility">
+    <unit bldFile="charconvfw/sortutil/group"/>
+   </component>
+   <component id="inlinetext" filter="s60" name="Inline Text">
+    <unit bldFile="charconvfw/inlinetext/group"/>
+   </component>
+   <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+    <!-- placeholder for split from bafl -->
+   </component>
+   <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+    <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+   </component>
+  </collection>
+  <collection id="localesupport" name="Locale Support" level="util">
+   <component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
+    <unit bldFile="localisation/localesupport" mrp="localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+   </component>
+   <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+    <!-- placeholder for split from bafl -->
+   </component>
+  </collection>
+  <collection id="textandloctools" name="Text and Localisation Tools" level="tools">
+   <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+    <!-- placeholder for split from GDI Tools -->
+   </component>
+   <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+    <unit bldFile="../graphics/graphicstools/bitmapfonttools/group" mrp="../graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+   </component>
+  </collection>
+  <collection id="textandloc_info" name="Text and Localisation Info" level="text">
+   <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/usb/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/usb/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,11 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/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>
@@ -92,9 +97,6 @@
           </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="/sf/os/usb/usb_plat/group"/>
-          </component>
           <component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
             <unit mrp="/sf/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
           </component>

--- a/symbian3/os/usb/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/usb/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
-    <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
-      <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
-    </collection>
-    <collection id="usbmgmt" name="USB Management" level="server">
-      <component id="usbmgr" name="USB Manager" purpose="optional">
-        <unit version="2" bldFile="usbmgmt/usbmgr/group" mrp="usbmgmt/usbmgr/group/usb_manager.mrp"/>
-      </component>
-      <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
-        <unit version="2" mrp="usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="usbmgmt/usbmgrtest/group"/>
-      </component>
-      <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
-        <unit mrp="usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-      </component>
-    </collection>
-    <collection id="usb_info" name="USB Info" level="app-if">
-      <component id="usb_plat" filter="s60" name="USB Platform Interfaces" class="api">
-        <unit bldFile="usb_plat/group"/>
-      </component>
-      <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
-        <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="usb" 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="usb_plat/usb_audio_stream_plugin_api/group"/>
+   </component>
+  </collection>
+  <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
+   <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
+  </collection>
+  <collection id="usbmgmt" name="USB Management" level="server">
+   <component id="usbmgr" name="USB Manager" purpose="optional">
+    <unit version="2" bldFile="usbmgmt/usbmgr/group" mrp="usbmgmt/usbmgr/group/usb_manager.mrp"/>
+   </component>
+   <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
+    <unit version="2" mrp="usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="usbmgmt/usbmgrtest/group"/>
+   </component>
+   <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
+    <unit mrp="usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+   </component>
+  </collection>
+  <collection id="usb_info" name="USB Info" level="app-if">
+   <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+    <unit mrp="usb_info/usb_metadata/usb_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/wlan/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/wlan/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,58 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/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="/sf/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
@@ -104,12 +156,6 @@
           </component>
         </collection>
         <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="/sf/os/wlan/wlan_pub/group"/>
-          </component>
-          <component name="wlan_plat" filter="s60" long-name="WLAN Platform Interfaces" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/group"/>
-          </component>
           <component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
           </component>

--- a/symbian3/os/wlan/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/wlan/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,42 +1,104 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="wlan" name="WLAN" levels="hw low mid high tools test">
-    <collection id="wlan_bearer" name="WLAN Bearer" level="hw">
-      <component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
-        <unit bldFile="wlan_bearer/wlanpsmplugin/group"/>
-      </component>
-      <component id="wlanagent" filter="s60" name="WLAN Agent">
-        <unit bldFile="wlan_bearer/wlanagent/group"/>
-      </component>
-      <component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
-        <unit bldFile="wlan_bearer/wlandbif_cd/group"/>
-      </component>
-      <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
-      <component id="wlanengine" filter="s60" name="WLAN Engine">
-        <unit bldFile="wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-      </component>
-      <component id="wlanldd" filter="s60" name="WLAN LDD">
-        <unit bldFile="wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-      </component>
-      <component id="wlannwif" filter="s60" name="WLAN Network Interface">
-        <unit bldFile="wlan_bearer/wlannwif/group"/>
-      </component>
-    </collection>
-    <collection id="wlanapitest" name="WLAN API Tests" level="test">
-      <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
-        <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
-      </component>
-    </collection>
-    <collection id="wlan_info" name="WLAN Info" level="test">
-      <component id="wlan_pub" filter="s60" name="WLAN Public Interfaces" class="api">
-        <unit bldFile="wlan_pub/group"/>
-      </component>
-      <component id="wlan_plat" filter="s60" name="WLAN Platform Interfaces" class="api">
-        <unit bldFile="wlan_plat/group"/>
-      </component>
-      <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="wlan" 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" href="wlan_plat/wlan_dbif_api/wlan_dbif_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_dbif_api/group"/>
+   </component>
+   <component id="wlan_hal_api" name="WLAN HAL API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_hal_api/wlan_hal_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_hal_api/group"/>
+   </component>
+   <component id="wlan_management_api" name="WLAN Management API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_management_api/wlan_management_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_device_settings_api/wlan_device_settings_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_device_settings_api/group"/>
+   </component>
+   <component id="wlan_control_api" name="WLAN Control API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_control_api/wlan_control_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_hw_initialization_data_api/wlan_hw_initialization_data_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_power_save_plugin_api/wlan_power_save_plugin_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_info_api/wlan_info_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_agent_hotspot_plugin_api/wlan_agent_hotspot_plugin_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_osa_api/wlan_osa_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_osa_api/group"/>
+   </component>
+   <component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_spia_api/wlan_spia_api.metaxml"/>
+    <unit bldFile="wlan_plat/wlan_spia_api/group"/>
+   </component>
+   <component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
+    <meta rel="Api" href="wlan_plat/wlan_hpa_api/wlan_hpa_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_eapol_plugin_api/wlan_eapol_plugin_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_generic_plugin_api/wlan_generic_plugin_api.metaxml"/>
+    <unit bldFile="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" href="wlan_plat/wlan_aws_plugin_api/wlan_aws_plugin_api.metaxml"/>
+    <unit bldFile="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" href="wlan_pub/wlan_sdk_info_api/wlan_sdk_info_api.metaxml"/>
+    <unit bldFile="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="wlan_bearer/wlanpsmplugin/group"/>
+   </component>
+   <component id="wlanagent" filter="s60" name="WLAN Agent">
+    <unit bldFile="wlan_bearer/wlanagent/group"/>
+   </component>
+   <component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
+    <unit bldFile="wlan_bearer/wlandbif_cd/group"/>
+   </component>
+   <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+   <component id="wlanengine" filter="s60" name="WLAN Engine">
+    <unit bldFile="wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+   </component>
+   <component id="wlanldd" filter="s60" name="WLAN LDD">
+    <unit bldFile="wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+   </component>
+   <component id="wlannwif" filter="s60" name="WLAN Network Interface">
+    <unit bldFile="wlan_bearer/wlannwif/group"/>
+   </component>
+  </collection>
+  <collection id="wlanapitest" name="WLAN API Tests" level="test">
+   <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
+    <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
+   </component>
+  </collection>
+  <collection id="wlan_info" name="WLAN Info" level="test">
+   <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

--- a/symbian3/os/xmlsrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/xmlsrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,23 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <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="/sf/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="/sf/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
@@ -115,9 +132,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="/sf/os/xmlsrv/xmlsrv_plat/group"/>
-          </component>
           <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
           </component>

--- a/symbian3/os/xmlsrv/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/xmlsrv/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,50 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="xmlsrv" name="XML Services" levels="plugin server framework generic specific">
-    <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
-      <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
-        <unit bldFile="xmlsecurityengine/xmlseccertman/group"/>
-      </component>
-      <component id="xmlsec" filter="s60" name="XML Security">
-        <unit bldFile="xmlsecurityengine/xmlsec/group"/>
-      </component>
-      <component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
-        <unit bldFile="xmlsecurityengine/xmlseccrypto/group"/>
-      </component>
-      <component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
-        <unit bldFile="xmlsecurityengine/xmlsecwrapper/group"/>
-      </component>
-    </collection>
-    <collection id="xml" name="XML" level="generic">
-      <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
-        <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp"/>
-      </component>
-      <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
-        <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
-      </component>
-       <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
-     <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp" /> 
-      </component>
-      <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
-        <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
-      </component>
-      <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-      </component>
-      <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
-      </component>
-      <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
-        <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-      </component>
-    </collection>
-    <collection id="xmlsrv_info" name="XML Services Info" level="specific">
-      <component id="xmlsrv_plat" filter="s60" name="XML Services Platform Interfaces" class="api">
-        <unit bldFile="xmlsrv_plat/group"/>
-      </component>
-      <component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
+ <package id="xmlsrv" 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="xmlsrv_plat/group"/>
+   </component>
+   <component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
+    <meta rel="Api" href="xmlsrv_plat/xml_encryption_api/xml_encryption_api.metaxml"/>
+    <!-- <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" href="xmlsrv_plat/xml_signature_api/xml_signature_api.metaxml"/>
+    <!-- <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" href="xmlsrv_plat/xml_security_engine_utils_api/xml_security_engine_utils_api.metaxml"/>
+    <!-- <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="xmlsecurityengine/xmlseccertman/group"/>
+   </component>
+   <component id="xmlsec" filter="s60" name="XML Security">
+    <unit bldFile="xmlsecurityengine/xmlsec/group"/>
+   </component>
+   <component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
+    <unit bldFile="xmlsecurityengine/xmlseccrypto/group"/>
+   </component>
+   <component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
+    <unit bldFile="xmlsecurityengine/xmlsecwrapper/group"/>
+   </component>
+  </collection>
+  <collection id="xml" name="XML" level="generic">
+   <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
+    <unit bldFile="xml/xmlfw/group" mrp="xml/xmlfw/group/syslibs_xml.mrp"/>
+   </component>
+   <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
+    <unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+   </component>
+   <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+    <unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+   </component>
+   <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
+    <unit bldFile="xml/xmldomandxpath/group" mrp="xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+   </component>
+   <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="xml/xmlexpatparser/group" mrp="xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+   </component>
+   <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+    <unit bldFile="xml/xmllibxml2parser/group" mrp="xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+   </component>
+   <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+    <unit bldFile="xml/wbxmlparser/group" mrp="xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+   </component>
+  </collection>
+  <collection id="xmlsrv_info" name="XML Services Info" level="specific">
+   <component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+    <unit mrp="xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>

author	Bob Rosenberg <bob.rosenberg@nokia.com>
	Wed, 17 Mar 2010 14:41:09 +0000
branch	HighFidelityModel
changeset 141	27d9d356efbf
parent 140	1c8fca9ff3fb
child 142	21f2817659ec

symbian3/app/camera/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/camera/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/commonemail/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/commonemail/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/contacts/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/contacts/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/contentcontrol/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/contentcontrol/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/conversations/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/conversations/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/dictionary/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/dictionary/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/files/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/files/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/graphicsuis/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/graphicsuis/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/homescreen/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/homescreen/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/im/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/im/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/imgeditor/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/imgeditor/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/iptelephony/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/iptelephony/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/jrt/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/jrt/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/location/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/location/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/messaging/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/messaging/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/mmsharinguis/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/mmsharinguis/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/musicplayer/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/musicplayer/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/organizer/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/organizer/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/phone/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/phone/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/photos/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/photos/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/profile/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/profile/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/settingsuis/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/settingsuis/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/speechsrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/speechsrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/videoeditor/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/videoeditor/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/videoplayer/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/videoplayer/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/videotelephony/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/videotelephony/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/voicerec/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/app/voicerec/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/accesssec/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/accesssec/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/appinstall/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/appinstall/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/appsupport/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/appsupport/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/btservices/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/btservices/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/camerasrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/camerasrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/classicui/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/classicui/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/dlnasrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/dlnasrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/drm/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/drm/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/gsprofilesrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/gsprofilesrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/hapticsservices/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/hapticsservices/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/homescreensrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/homescreensrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/imghandling/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/imghandling/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/imsrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/imsrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/inputmethods/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/inputmethods/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/ipappprotocols/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/ipappprotocols/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/ipappsrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/ipappsrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/ipconnmgmt/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/ipconnmgmt/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/legacypresence/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/legacypresence/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/locationsrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/locationsrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/mds/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/mds/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/messagingmw/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/messagingmw/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/metadatasrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/metadatasrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/mmappfw/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/mmappfw/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/mmmw/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/mmmw/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/mmuifw/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/mmuifw/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/netprotocols/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/netprotocols/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/opensrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/opensrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/phonesrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/phonesrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/remoteconn/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/remoteconn/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/remotemgmt/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/remotemgmt/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/remotestorage/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/remotestorage/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/securitysrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/securitysrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/serviceapifw/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/serviceapifw/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/shortlinkconn/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/shortlinkconn/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/srvdiscovery/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/srvdiscovery/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/svgt/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/svgt/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/uiaccelerator/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/uiaccelerator/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/uiresources/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/uiresources/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/uitools/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/uitools/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/usbservices/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/usbservices/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/videoutils/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/videoutils/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/vpnclient/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/vpnclient/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/web/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/web/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/websrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/websrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/wirelessacc/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/mw/wirelessacc/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/bt/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/bt/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/cellularsrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/cellularsrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/devicesrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/devicesrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/graphics/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/graphics/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/imagingext/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/imagingext/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/kernelhwsrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/kernelhwsrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/mm/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/mm/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/osrndtools/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/osrndtools/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/ossrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/ossrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/security/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/security/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/textandloc/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/textandloc/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/usb/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/usb/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/wlan/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/wlan/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/xmlsrv/package_definition.xml		file \| annotate \| diff \| comparison \| revisions
symbian3/os/xmlsrv/package_definition_3.0.xml		file \| annotate \| diff \| comparison \| revisions