--- a/package_definition.xml	Fri Aug 20 11:39:56 2010 +0300
+++ b/package_definition.xml	Fri Sep 03 17:01:40 2010 +0300
@@ -1,6 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
   <package id="appinstall" name="Application Installation" levels="tool framework generic api">
+  <collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
+   <component id="iaupdate_api" name="IA Update API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/iaupdate_api/iaupdate_api.metaxml"/>
+    <unit bldFile="appinstall_plat/iaupdate_api/group"/>
+   </component>
+   <component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/task_plugin_api/task_plugin_api.metaxml"/>
+    <unit bldFile="appinstall_plat/task_plugin_api/group"/>
+   </component>
+   <component id="sw_installer_common_ui_api" name="SW Installer Common UI API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_common_ui_api/sw_installer_common_ui_api.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_common_ui_api/group"/>
+   </component>
+   <component id="sw_installer_launcher_api" name="SW Installer Launcher API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_launcher_api/sw_installer_launcher_api.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_launcher_api/group"/>
+   </component>
+   <component id="task_management_api" name="Task Management API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/task_management_api/task_management_api.metaxml"/>
+    <unit bldFile="appinstall_plat/task_management_api/group"/>
+   </component>
+   <component id="sw_installer_ui_plugin_api" name="SW Installer UI Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_ui_plugin_api/sw_installer_ui_plugin_api.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_ui_plugin_api/group"/>
+   </component>
+   <component id="sw_installer_cr_keys" name="SW Installer CR Keys" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_cr_keys/sw_installer_cr_keys.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_cr_keys/group"/>
+   </component>
+   <component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_plat/sw_installer_ps_keys/sw_installer_ps_keys.metaxml"/>
+    <unit bldFile="appinstall_plat/sw_installer_ps_keys/group"/>
+   </component>
+   <component id="sifui_api" name="STIF UI API" class="api" filter="s60">
+    <unit bldFile="appinstall_plat/sifui_api/group"/>
+   </component>
+  </collection>
+  <collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
+   <component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
+    <meta rel="Api" href="appinstall_pub/startup_list_management_api/startup_list_management_api.metaxml"/>
+    <unit bldFile="appinstall_pub/startup_list_management_api/group"/>
+   </component>
+  </collection>
+    <collection id="ncdengine" name="Nokia Content Discover" level="framework">
+      <component id="ncdengine_build" filter="s60" name="NCD Engine" introduced="^1">
+        <unit bldFile="ncdengine/group"/>
+      </component>
+      <component id="ncdengine_qt_build" filter="s60" name="NCD Qt Engine">
+        <unit bldFile="ncdengine/engine"  qt:proFile="engine.pro"/>
+      </component>
+    </collection>
+    <collection id="appinstaller" name="Application Installer" level="generic">
+      <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+        <unit bldFile="appinstaller/appinstui/group"/>
+      </component>
+      <component id="appinstui_qt" filter="s60" name="Application Installer Qt UI" introduced="^2">
+        <unit bldFile="appinstaller/appinstui" qt:proFile="appinstui.pro"/>
+      </component>
+    </collection>
+    <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+    	<!-- the collection is really a component. Move down a directory.-->
+      <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">
+    	<!-- Should reorganise into actual components -->
+      <component id="iad" name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+        <unit bldFile="iaupdate" qt:proFile="iaupdate.pro"/>
+      </component>
+      <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+      	<meta rel="config">
+      		<defined condition="FF_IAUPDATE"/>
+      	</meta>  
+        <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"/>
@@ -44,5 +121,13 @@
         <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_test" filter="s60,test,api_test" 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>