diff -r 1c8fca9ff3fb -r 27d9d356efbf symbian3/mw/btservices/package_definition.xml
--- 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>