--- a/symbian3/mw/mmuifw/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/mmuifw/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -6,34 +6,31 @@
         <unit bldFile="mmuifw_plat/group"/>
       </component>
       <component id="mmuifw_build" filter="s60" name="Multimedia UI Framework Build">
+       	<!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
         <unit bldFile="group"/>
-       	<!-- can this be distributed into the other components? -->
       </component>
     </collection>
     <collection id="osncore" name="OS Neutral Library Core" level="util">
+    	<!-- collection is really a component. Move down a directory -->
       <component id="osncore_build" filter="s60" name="OSN Core Build">
         <unit bldFile="osncore/group"/>
       </component>
     </collection>
     <collection id="alfwidgetutils" name="Accelerated LAF Widget Utils" level="ui">
+    	<!-- collection is really a component. Move down a directory -->
       <component id="alfwidgetutils_build" filter="s60" name="ALF Widget Utils">
         <unit bldFile="alfwidgetutils/group"/>
       </component>
     </collection>
     <collection id="resourcepool" name="Resource Pool" level="util">
+    	<!-- collection is really a component. Move down a directory -->
       <component id="alfresourcepool" filter="s60" name="ALF Resource Pool">
         <unit bldFile="resourcepool/group"/>
       </component>
     </collection>
     <collection id="widgetmodel" name="Widget Model" level="mdl">
-      <component id="alfwidgetmodel" filter="s60" name="ALF Widget Model">
-        <!-- <unit bldFile="widgetmodel/alfwidgetmodel/group"/> -->
-      </component>
-      <component id="alfwidgetfactory" filter="s60" name="ALF Widget Factory">
-        <!-- <unit bldFile="widgetmodel/alfwidgetfactory/group"/> -->
-      </component>
+    	<!-- collection is really a component. Move down a directory -->
       <component id="widgetmodel_build" filter="s60" name="Widget Model Build">
-      	<!--  eitehr split this into the other 2 components or collapse them all into this one -->
         <unit bldFile="widgetmodel/group"/>
       </component>
     </collection>
@@ -45,13 +42,13 @@
       <component id="muldatamodel" filter="s60" name="MUL Data Model">
         <unit bldFile="mulwidgets/muldatamodel/group"/>
       </component>
-      <component id="mulwidgets_common" filter="s60" name="MUL Common">
+      <component id="mulwidgets_common" filter="s60" name="MUL Common Utils">
         <unit bldFile="mulwidgets/common/group"/>
       </component>
       <component id="gesturehelper" filter="s60" name="Gesture Helper">
         <unit bldFile="mulwidgets/gesturehelper/group"/>
       </component>
-      <component id="mulcoverflowwidget" filter="s60" name="MUL Coverflow Widget">
+      <component id="mulcoverflowwidget" filter="s60" name="MUL CoverFlow Widget">
         <unit bldFile="mulwidgets/mulcoverflowwidget/group"/>
       </component>
       <component id="mulsliderwidget" filter="s60" name="MUL Slider Widget">
@@ -66,9 +63,6 @@
       <component id="alfscrollbarwidget" filter="s60" name="ALF Scrollbar Widget">
         <unit bldFile="mulwidgets/alfscrollbarwidget/group"/>
       </component>
-      <component id="mulwidgets_build" filter="s60" name="MUL Widgets Build">
-        <unit bldFile="mulwidgets/group"/>
-      </component>
     </collection>
   </package>
 </SystemDefinition>