--- a/symbian3/app/contentcontrol/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/contentcontrol/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,24 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="contentcontrol" name="Content Control Daemons" levels="plugin app">
-    <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
-	   	<!-- Component at wrong rank, should move down a directory --> 
-      <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
-        <unit bldFile="dsdcmoadapter/group"/>
-      </component>
-    </collection>
-    <collection id="omads" name="OMA Data Sync" level="app">
-      <component id="omadsappui" filter="s60" name="OMA DS Application UI">
-        <unit bldFile="omads/omadsappui/group"/>
-      </component>
-      <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
-        <unit bldFile="omads/omadsextensions/group"/>
-      </component>
-    </collection>
-    <collection id="contentcontrol_info" name="Content Control Daemons Info" level="app">
-      <component id="contentctrl_plat" filter="s60" class="api" name="Content Control Daemons Platforn Interfaces">
-        <unit bldFile="contentctrl_plat/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="contentcontrol" name="Content Control Daemons" levels="plugin app">
+  <collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+   <component id="oma_ds_presync_plugin_api" name="OMA DS PreSync Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="contentctrl_plat/oma_ds_presync_plugin_api/oma_ds_presync_plugin_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+   </component>
+   <component id="ds_agenda_handler_plugin_api" name="DS Agenda Handler Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="contentctrl_plat/ds_agenda_handler_plugin_api/ds_agenda_handler_plugin_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
+   </component>
+   <component id="ds_folder_util_api" name="DS Folder Util API" class="api" filter="s60">
+    <meta rel="Api" href="contentctrl_plat/ds_folder_util_api/ds_folder_util_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_folder_util_api/group"/>
+   </component>
+   <component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60">
+    <meta rel="Api" href="contentctrl_plat/adapter_customization_api/adapter_customization_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/adapter_customization_api/group"/>
+   </component>
+   <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60">
+    <meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
+    <unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
+   </component>
+  </collection>
+  <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+   <!-- Component at wrong rank, should move down a directory -->
+   <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+    <unit bldFile="dsdcmoadapter/group"/>
+   </component>
+  </collection>
+  <collection id="omads" name="OMA Data Sync" level="app">
+   <component id="omadsappui" filter="s60" name="OMA DS Application UI">
+    <unit bldFile="omads/omadsappui/group"/>
+   </component>
+   <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+    <unit bldFile="omads/omadsextensions/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>