--- a/symbian4/app/contacts/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="contacts" name="Contacts Apps" levels="engine support services ui">
+ <package id="contacts" name="Contacts Apps" levels="engine support services plugin ui">
   <collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
    <component id="qt_mobility_contacts_api" name="Qt Mobility Contacts API" class="api" filter="s60" introduced="^4">
     <meta rel="Api" href="contacts_plat/qt_mobility_contacts_api/qt_mobility_contacts_api.metaxml"/>
@@ -25,19 +25,21 @@
     <unit bldFile="phonebookui" qt:proFile="phonebookui.pro"/>
    </component>
   </collection>
+  <collection id="phonebookengines_old" name="Old Phonebook Engines" level="engine">
+   <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+        <unit version="2" bldFile="phonebookengines_old/contactsmodel/groupsql" mrp="phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+   </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 version="2" bldFile="phonebookengines_old/contactsmodel/groupsql" mrp="phonebookengines_old/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="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"/>
+    <!-- <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"/>
@@ -71,6 +73,12 @@
     <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">
+      <unit bldFile="contactwidgethsplugin" qt:proFile="contactwidgethsplugin.pro"/>
+   </component>
+  </collection>
   <collection id="contacts_info" name="Contacts Apps Info" level="ui">
    <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
     <unit mrp="contacts_info/contacts_metadata/contacts_metadata.mrp"/>