--- a/symbian4/app/contacts/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -8,8 +8,8 @@
    </component>
   </collection>
   <collection id="phonebookui" name="Phonebook UI" level="ui">
-   <component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
-    <!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
+   <component id="cnthistorymodel" filter="s60" name="Contacts History Model" introduced="^4">
+    <!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
    </component>
    <component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
     <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
@@ -25,33 +25,31 @@
     <unit bldFile="phonebookui" qt:proFile="phonebookui.pro"/>
    </component>
   </collection>
-  <collection id="qtcontactsmobility" name="Qt Contacts Mobility" level="support">
-   <component id="qtcontactsmobility_build" filter="s60" name="Qt Contacts Mobility Build" class="plugin" introduced="^4">
-	<!-- not really a component, move down a dir? Break up into compnents? -->
-    <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.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="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
-    <unit bldFile="phonebookengines/contactsmodel" qt:proFile="contactsmodel.pro"/>
+    <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
    </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="cntlistmodel" filter="s60" name="Contacts List Model" introduced="^4">
-    <unit bldFile="phonebookengines/cntlistmodel" qt:proFile="cntlistmodel.pro"/>
+   <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="cntactions" introduced="^4">
-    <unit bldFile="phonebookengines/cntactions" qt:proFile="cntactions.pro"/>
+   <component id="mobcntmodel" filter="s60" name="Mobile Contacts Model" introduced="^4">
+    <unit bldFile="phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
+   </component>
+   <component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
+    <unit bldFile="phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
    </component>
    <component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
     <unit bldFile="phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
    </component>
-   <component id="cndsimutility" filter="s60" name="Contacts SIM Utility" introduced="^4">
-    <unit bldFile="phonebookengines/cntsimutility" qt:proFile="cntsimutility.pro"/>
+   <component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
+    <unit bldFile="phonebookengines/simutility" qt:proFile="simutility.pro"/>
    </component>
    <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
       <unit bldFile="phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>