diff -r 4469f26a2533 -r a44ae815a47f CompilerCompatibility/app/homescreen/package_definition.xml
--- a/CompilerCompatibility/app/homescreen/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/CompilerCompatibility/app/homescreen/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,71 +54,77 @@
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
-    <collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
-     <component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-     </component>
-     <component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
-      <!-- why is the ID so different from the name? Is one wrong? -->
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/exths/group"/>
-     </component>
-     <component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/hscontentcontrol/group"/>
-     </component>
-     <component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
-      <!--  can only have one unit. #include from a common bld.inf, or split into two components -->
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
-     </component>
-     <component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/xmluirendering/group"/>
-     </component>
-     <component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/xmluicontroller/group"/>
-     </component>
-     <component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/widgetmanager/group"/>
-     </component>
-     <component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/help/group"/>
-     </component>
-     <component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/data/group"/>
-     </component>
-     <component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
-      <!-- can the loc file be moved to another comopnent and this one removed? -->
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/group"/>
-     </component>
-    </collection>
-    <collection name="menufw" long-name="Menu Framework" level="fw">
-     <component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
-      <unit bldFile="/sf/app/homescreen/menufw/hierarchynavigator/group"/>
-     </component>
-     <component name="menufwui" filter="s60" long-name="Menu Framework UI">
-      <unit bldFile="/sf/app/homescreen/menufw/menufwui/group"/>
-     </component>
-     <component name="menusuites" filter="s60" long-name="Menu Suites">
-      <unit bldFile="/sf/app/homescreen/menufw/menusuites/group"/>
-     </component>
-     <component name="menufw_build" filter="s60" long-name="Menu Framework Build">
-      <!-- can the exports be exported by the other components? -->
-      <unit bldFile="/sf/app/homescreen/menufw/group"/>
-     </component>
-    </collection>
-    <collection name="taskswitcher" long-name="Task Switcher" level="support">
-     <component name="contextengine" filter="s60" long-name="Context Engine" introduced="^3">
-      <unit bldFile="/sf/app/homescreen/taskswitcher/contextengine/group"/>
-     </component>
-     <component name="taskswitcherui" filter="s60" long-name="Task Switcher UI" introduced="^3">
-      <unit bldFile="/sf/app/homescreen/taskswitcher/taskswitcherui/group"/>
-     </component>
-    </collection>
-    <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
-     <component name="homescreen_plat" filter="s60" long-name="Home Screen Apps Platform Interfaces" class="api">
-      <unit bldFile="/sf/app/homescreen/homescreen_plat/group"/>
-     </component>
-    </collection>
-   </block>
+<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
+<component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
+<unit bldFile="/sf/app/homescreen/homescreen_plat/menu_settings_api/group"/>
+</component>
+<component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
+<unit bldFile="/sf/app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
+</component>
+<component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
+</component>
+</collection>
+<collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
+<component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
+<unit bldFile="/sf/app/homescreen/idlehomescreen/nativeuicontroller/group"/>
+</component>
+<component name="exths" filter="s60" long-name="Active Idle Container" plugin="Y">
+<!-- why is the ID so different from the name? Is one wrong? -->
+<unit bldFile="/sf/app/homescreen/idlehomescreen/exths/group"/>
+</component>
+<component name="hscontentcontrol" filter="s60" long-name="Home Screen Content Control" introduced="^3">
+<unit bldFile="/sf/app/homescreen/idlehomescreen/hscontentcontrol/group"/>
+</component>
+<component name="hssapiwrapper" filter="s60" long-name="HS SAPI Wrapper" introduced="^3">
+<!--  can only have one unit. #include from a common bld.inf, or split into two components -->
+<unit bldFile="/sf/app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
+<unit bldFile="/sf/app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
+</component>
+<component name="xmluirendering" filter="s60" long-name="XML UI Rendering" introduced="^3">
+<unit bldFile="/sf/app/homescreen/idlehomescreen/xmluirendering/group"/>
+</component>
+<component name="xmluicontroller" filter="s60" long-name="XML UI Controller" introduced="^3">
+<unit bldFile="/sf/app/homescreen/idlehomescreen/xmluicontroller/group"/>
+</component>
+<component name="widgetmanager" filter="s60" long-name="Widget Manager" introduced="^3">
+<unit bldFile="/sf/app/homescreen/idlehomescreen/widgetmanager/group"/>
+</component>
+<component name="idlehomescreen_help" filter="s60" long-name="Idle Home Screen Help">
+<unit bldFile="/sf/app/homescreen/idlehomescreen/help/group"/>
+</component>
+<component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
+<unit bldFile="/sf/app/homescreen/idlehomescreen/data/group"/>
+</component>
+<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
+<!-- can the loc file be moved to another comopnent and this one removed? -->
+<unit bldFile="/sf/app/homescreen/idlehomescreen/group"/>
+</component>
+</collection>
+<collection name="menufw" long-name="Menu Framework" level="fw">
+<component name="hierarchynavigator" filter="s60" long-name="Hierarchy Navigator">
+<unit bldFile="/sf/app/homescreen/menufw/hierarchynavigator/group"/>
+</component>
+<component name="menufwui" filter="s60" long-name="Menu Framework UI">
+<unit bldFile="/sf/app/homescreen/menufw/menufwui/group"/>
+</component>
+<component name="menusuites" filter="s60" long-name="Menu Suites">
+<unit bldFile="/sf/app/homescreen/menufw/menusuites/group"/>
+</component>
+<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
+<!-- can the exports be exported by the other components? -->
+<unit bldFile="/sf/app/homescreen/menufw/group"/>
+</component>
+</collection>
+<collection name="taskswitcher" long-name="Task Switcher" level="support">
+<component name="contextengine" filter="s60" long-name="Context Engine" introduced="^3">
+<unit bldFile="/sf/app/homescreen/taskswitcher/contextengine/group"/>
+</component>
+<component name="taskswitcherui" filter="s60" long-name="Task Switcher UI" introduced="^3">
+<unit bldFile="/sf/app/homescreen/taskswitcher/taskswitcherui/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file