diff -r 1c8fca9ff3fb -r 27d9d356efbf symbian3/mw/uitools/package_definition.xml
--- a/symbian3/mw/uitools/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/uitools/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,19 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+        <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
+          <component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+          </component>
+        </collection>
+        <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
+          <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uitools/uitools_plat/cdl_api/group"/>
+          </component>
+          <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/uitools/uitools_plat/layout_system_private_api/group"/>
+          </component>
+        </collection>
         <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
           <!-- collection is actually a component. Needs to be moved down a directory -->
           <component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
@@ -120,14 +133,6 @@
             <unit bldFile="/sf/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
           </component>
         </collection>
-        <collection name="uitools_info" long-name="UI Tools Info" level="if">
-          <component name="uitools_plat" filter="s60" long-name="UI Tools Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/uitools/uitools_plat/group"/>
-          </component>
-          <component name="uitools_pub" filter="s60" long-name="UI Tools Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/uitools/uitools_pub/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>