--- a/3k/mw/uitools/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/mw/uitools/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,61 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="uitools" long-name="UI Tools" tech_domain="to" level="specific" levels="compile encode tool">
     <collection name="gfxtools" long-name="Graphics Tools" level="tool">
-     <component name="gditools" long-name="GDI Tools" origin-model="Foundation">
+     <component name="gditools" long-name="GDI Tools" origin-model="foundation">
       <unit bldFile="/sf/mw/uitools/gfxtools/gditools/group"/>
      </component>
-     <component name="Color" origin-model="Foundation">
+     <component name="color" origin-model="foundation">
       <unit bldFile="/sf/mw/uitools/gfxtools/color/group"/>
      </component>
     </collection>
     <collection name="reszip" long-name="Reszip" level="encode">
-     <component name="reszip.exe=binary" origin-model="Foundation">
+     <component name="reszip_build" origin-model="foundation">
       <unit bldFile="/sf/mw/uitools/reszip/group"/>
      </component>
     </collection>
     <collection name="toollibraries" long-name="Tool Libraries" level="tool">
-     <component name="Arabica" origin-model="Foundation"/>
-     <component name="XercesC" long-name="Xerces C" origin-model="Foundation"/>
-     <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build" origin-model="Foundation">
+     <component name="arabica" origin-model="foundation"/>
+     <component name="xercesc" long-name="Xerces C" origin-model="foundation"/>
+     <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build" origin-model="foundation">
       <!-- <unit bldFile="mw/uitools/toollibraries/group"/> -->
      </component>
     </collection>
     <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-     <component name="svgtenc" long-name="SVGT Enc" origin-model="Foundation">
+     <component name="svgtenc" long-name="SVGT Enc" origin-model="foundation">
       <unit bldFile="/sf/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
      </component>
-     <component unofficial="yes" name="svgtencoder_build" long-name="SVGT Encoder Build" origin-model="Foundation">
+     <component unofficial="yes" name="svgtencoder_build" long-name="SVGT Encoder Build" origin-model="foundation">
       <unit bldFile="/sf/mw/uitools/svgtencoder/group"/>
      </component>
     </collection>
     <collection name="uitools_info" long-name="UI Tools Info" level="tool">
-     <component unofficial="yes" name="aknlayoutcompiler" origin-model="Foundation">
-      <unit bldFile="/sf/mw/uitools/aknlayoutcompiler/group"/>
-     </component>
-     <component unofficial="yes" name="cdlcompiler" origin-model="Foundation">
-      <unit bldFile="/sf/mw/uitools/cdlcompiler/group"/>
-     </component>
-     <component unofficial="yes" name="uitools_build" long-name="UI Tools Build" origin-model="Foundation">
-      <unit bldFile="/sf/mw/uitools/group"/>
-     </component>
-     <component unofficial="yes" name="cdlcompilertoolkit" origin-model="Foundation">
-      <unit bldFile="/sf/mw/uitools/cdlcompilertoolkit/group"/>
+     <component unofficial="yes" name="uitools_plat" long-name="UI Tools Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/uitools/uitools_plat/group"/>
      </component>
-    </collection>
-    <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="tool">
-     <component unofficial="yes" name="layout_system_private_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/uitools/uitools_plat/layout_system_private_api/group"/>
+     <component unofficial="yes" name="uitools_pub" long-name="UI Tools Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="/sf/mw/uitools/uitools_pub/group"/>
      </component>
-     <component unofficial="yes" name="cdl_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/uitools/uitools_plat/cdl_api/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="tool">
-     <component unofficial="yes" name="third_party_bitmap_palette_api" origin-model="Foundation">
-      <unit bldFile="/sf/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+     <component unofficial="yes" name="uitools_build" long-name="UI Tools Build" origin-model="foundation">
+      <unit bldFile="/sf/mw/uitools/group"/>
      </component>
     </collection>
    </block>