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