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