--- a/symbian3/mw/imghandling/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,18 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
+        <collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
+          <component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+          </component>
+          <component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+          </component>
+          <component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
+          </component>
+        </collection>
         <collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
           <!-- collection is really a component, need to move down a directory -->
           <component name="ihl" filter="s60" long-name="IHL">
@@ -91,14 +103,6 @@
             <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
           </component>
         </collection>
-        <collection name="imghandling_info" long-name="Image Handling Info" level="if">
-          <component name="imagehandling_plat" filter="s60" long-name="Image Handling Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/group"/>
-          </component>
-          <component name="imagehandling_api_test" filter="s60,test,api_test" long-name="Image Handling Platform API Test" purpose="development">
-            <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>