--- 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>