--- a/symbian3/os/imagingext/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/imagingext/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,33 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+        <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
+          <component name="exif_api" long-name="Exif API" filter="s60" class="api">
+            <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+            <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group" filter="test,api_test"/>
+          </component>
+        </collection>
+        <collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
+          <component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+          </component>
+          <component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
+            <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+            <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
+            <unit bldFile="/sf/os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+          </component>
+          <component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
+            <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+          </component>
+          <component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
+            <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+          </component>
+          <component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
+            <unit bldFile="/sf/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+          </component>
+        </collection>
         <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
           <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
             <unit bldFile="/sf/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
@@ -94,20 +121,6 @@
             <unit bldFile="/sf/os/imagingext/imagingmodules/jp2kcodec/group"/>
           </component>
         </collection>
-        <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
-          <component name="imagingext_plat" filter="s60" long-name="Imaging Extensions Platform Interfaces" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/group"/>
-          </component>
-          <component name="imagingext_pub" filter="s60" long-name="Imaging Extensions Public Interfaces" class="api">
-            <unit bldFile="/sf/os/imagingext/imagingext_pub/group"/>
-          </component>
-          <component name="imagingext_test" filter="s60,test,api_test" long-name="Imaging Extensions Platform API Tests" purpose="development">
-            <unit bldFile="/sf/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
-          </component>
-          <component name="imagingext_test" filter="s60,test,api_test" long-name="Imaging Extensions Public API Tests" purpose="development">
-            <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>