--- a/symbian4/mw/classicui/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,14 +50,11 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
 <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_framework_api/group"/>
-</component>
 <component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
 </component>
@@ -76,15 +73,9 @@
 <component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
 </component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
 <component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
 </component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
 <component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
 </component>
@@ -115,9 +106,6 @@
 <component name="task_list_api" long-name="Task List API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
 </component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
 <component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
 </component>
@@ -166,9 +154,6 @@
 <component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
 </component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
 <component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
 </component>
@@ -318,6 +303,12 @@
 <component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
 <unit bldFile="/sf/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
 </component>
+<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+<unit bldFile="/sf/mw/classicui/classicui_plat/directory_localizer_api/group"/>
+</component>
+<component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
+<unit bldFile="/sf/mw/classicui/classicui_plat/findutil_api/group"/>
+</component>
 </collection>
 <collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
 <component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
@@ -546,12 +537,6 @@
 <unit bldFile="/sf/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
 </component>
 </collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="/sf/mw/classicui/psln/group"/>
-</component>
-</collection>
 <collection name="commonadapter" long-name="Common Adapter" level="support">
 <!-- the collection is really a component. Move down a directory.-->
 <component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">