--- a/CompilerCompatibility/mw/imghandling/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/mw/imghandling/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,23 +54,29 @@
 <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="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">
-      <unit bldFile="/sf/mw/imghandling/imagehandlinglib/group"/>
-     </component>
-    </collection>
-    <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
-     <component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
-      <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>
-    </collection>
-   </block>
+<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"/>
+</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">
+<unit bldFile="/sf/mw/imghandling/imagehandlinglib/group"/>
+</component>
+</collection>
+<collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="util">
+<component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager">
+<unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file