diff -r 7333d7932ef7 -r 8b7f4e561641 package_definition.xml
--- a/package_definition.xml	Tue Aug 31 15:21:33 2010 +0300
+++ b/package_definition.xml	Wed Sep 01 12:22:02 2010 +0100
@@ -1,6 +1,41 @@
 <?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="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="ncdengine" name="Nokia Content Discover" level="framework">
+      <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="iaupdateapi_stub" name="IA Update API Stub" level="api">
+      <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">
+      <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"/>
@@ -8,21 +43,6 @@
       <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="swcomponentregistry" name="Software Component Registry" introduced="^4" purpose="mandatory">
-        <unit bldFile="installationservices/swcomponentregistry/group" mrp="installationservices/swcomponentregistry/group/security_softwarecomponentregistry.mrp"/>
-      </component>
-      <component id="swinstallationfw" name="Software Installation Framework" introduced="^4" purpose="optional">
-        <unit bldFile="installationservices/swinstallationfw/group" mrp="installationservices/swinstallationfw/group/security_softwareinstallframework.mrp"/>
-      </component>
-      <component id="swtransactionservices" name="Software Transaction Services" introduced="^4" purpose="optional">
-        <unit bldFile="installationservices/swtransactionservices/group" mrp="installationservices/swtransactionservices/group/security_softwaretransactionservices.mrp"/>
-      </component>
-      <component id="refswinstallationplugin" name="Reference Software Installation Plugin" introduced="^4" purpose="development" class="plugin">
-        <unit bldFile="installationservices/refswinstallationplugin/group" mrp="installationservices/refswinstallationplugin/group/security_sifrefplugin.mrp"/>
-      </component>
-      <component id="refsoftwareappmgr" name="Reference Software Application Manager" introduced="^4" purpose="development">
-        <unit bldFile="installationservices/refsoftwareappmgr/group" mrp="installationservices/refsoftwareappmgr/group/security_referenceapplicationmanager.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>
@@ -44,5 +64,23 @@
         <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"/>
+        <!-- <unit bldFile="appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
+        <!-- <unit bldFile="appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
+      </component>
+      <component id="appinstall_plat" filter="s60" name="Application Installation Platform Interfaces" class="api">
+        <unit bldFile="appinstall_plat/group"/>
+        <unit bldFile="appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
+        <!-- <unit bldFile="appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
+      </component>
+      <component id="appinstall_test" filter="s60" 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>