diff -r c18f9fa7f42e -r 640d30f4fb64 package_definition.xml
--- a/package_definition.xml	Fri Oct 08 11:42:51 2010 +0300
+++ b/package_definition.xml	Fri Oct 15 12:24:46 2010 +0300
@@ -17,7 +17,33 @@
     <unit base="contacts_plat/presence_cache_api"/>
    </component>
   </collection>
+  <collection id="presencecache" name="Presence Cache" level="support">
+   <component id="presencecachesymbian" filter="s60" name="Presence Cache Symbian" introduced="^4">
+    <unit bldFile="presencecache/presencecachesymbian" qt:proFile="presencecachesymbian.pro"/>
+   </component>
+   <component id="presencecacheqt" filter="s60" name="Presence Cache Qt" introduced="^4">
+    <unit bldFile="presencecache/presencecacheqt" qt:proFile="presencecacheqt.pro"/>
+   </component>
+  </collection>
+  <collection id="phonebookengines" name="Phonebook Engines" level="engine">
+   <component id="qtcontactsmobility" filter="s60" name="Qt Contacts Mobility" class="plugin" introduced="^4">
+	<!-- need to move to this actual dir rather than including something from another collection -->
+    <!-- <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/> -->
+   </component>
+   <component id="cntactions" filter="s60" name="Contacts Actions" introduced="^4">
+    <unit bldFile="phonebookengines/cntactions" qt:proFile="cntactions.pro"/>
+   </component>
+   <component id="cntsimutility" filter="s60" name="Contacts SIM Utility" introduced="^4">
+    <unit bldFile="phonebookengines/cntsimutility" qt:proFile="cntsimutility.pro"/>
+   </component>
+   <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
+      <unit bldFile="phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
+   </component>
+  </collection>
   <collection id="phonebookui" name="Phonebook UI" level="ui">
+   <component id="cntlistmodel" filter="s60" name="Contact List Model" introduced="^4">
+    <!--unit bldFile="phonebookengines/cntlistmodel" qt:proFile="cntlistmodel.pro"/> -->
+   </component>
    <component id="cnthistorymodel" filter="s60" name="Contacts History Model" introduced="^4">
     <!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
    </component>
@@ -35,30 +61,6 @@
     <unit bldFile="phonebookui" qt:proFile="phonebookui.pro"/>
    </component>
   </collection>
-  <collection id="phonebookengines" name="Phonebook Engines" level="engine">
-   <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
-    <unit bldFile="phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
-   </component>
-   <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
-    <unit bldFile="phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
-   </component>
-   <component id="qtcontactsmobility" filter="s60" name="Qt Contacts Mobility" class="plugin" introduced="^4">
-	<!-- need to move to this actual dir rather than including something from another collection -->
-    <!-- <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/> -->
-   </component>
-   <component id="cntlistmodel" filter="s60" name="Contact List Model" introduced="^4">
-    <unit bldFile="phonebookengines/cntlistmodel" qt:proFile="cntlistmodel.pro"/>
-   </component>
-   <component id="cntactions" filter="s60" name="Contacts Actions" introduced="^4">
-    <unit bldFile="phonebookengines/cntactions" qt:proFile="cntactions.pro"/>
-   </component>
-   <component id="cntsimutility" filter="s60" name="Contacts SIM Utility" introduced="^4">
-    <unit bldFile="phonebookengines/cntsimutility" qt:proFile="cntsimutility.pro"/>
-   </component>
-   <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
-      <unit bldFile="phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
-   </component>
-  </collection>
   <collection id="pimprotocols" name="PIM Protocols" level="services">
    <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin" filter="s60">
     <unit bldFile="pimprotocols/phonebooksync/group" mrp="pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
@@ -67,19 +69,16 @@
     <unit bldFile="pimprotocols/pbap/group" mrp="pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
    </component>
   </collection>
-  <collection id="presencecache" name="Presence Cache" level="support">
-   <component id="presencecachesymbian" filter="s60" name="Presence Cache Symbian" introduced="^4">
-    <unit bldFile="presencecache/presencecachesymbian" qt:proFile="presencecachesymbian.pro"/>
-   </component>
-   <component id="presencecacheqt" filter="s60" name="Presence Cache Qt" introduced="^4">
-    <unit bldFile="presencecache/presencecacheqt" qt:proFile="presencecacheqt.pro"/>
-   </component>
-  </collection>
   <collection id="contactwidgethsplugin" name="Contact Widget Homescreen Plugin" level="plugin">
 	<!-- collection is really a component, move down a directory -->
    <component id="contactwidgethsplugin_build" name="Contact Widget Homescreen Plugin Build" introduced="^4" filter="s60">
       <unit bldFile="contactwidgethsplugin" qt:proFile="contactwidgethsplugin.pro"/>
    </component>
   </collection>
+  <collection id="contacts_test" name="Contacts Unit Tests" level="support">
+   <component id="contacts_test_build" filter="s60,test,qt_unit_test" name="Contacts Unit Tests Build" purpose="development" introduced="^4">
+   		<unit bldFile="tsrc" qt:proFile="tsrc.pro"/> 
+		</component>
+	</collection>        
  </package>
 </SystemDefinition>