--- a/symbian4/app/browserui/package_definition.xml	Wed May 19 12:43:21 2010 +0100
+++ b/symbian4/app/browserui/package_definition.xml	Wed May 19 16:50:40 2010 +0100
@@ -53,7 +53,13 @@
 <SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="browserui" level="services"/>
+<block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
+<collection name="browserui_info" long-name="Browser UI Info" level="ui">
+<component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="/sf/app/browserui" proFile="browserui.pro" qmakeArgs="&quot;what+=plat_101&quot;"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/app/recents/package_definition.xml	Wed May 19 12:43:21 2010 +0100
+++ b/symbian4/app/recents/package_definition.xml	Wed May 19 16:50:40 2010 +0100
@@ -53,7 +53,20 @@
 <SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="recents" level="apps"/>
+<block name="recents" level="apps" long-name="Recent Events" levels="engine support ui api">
+<collection name="recents_plat" long-name="Recent Events Platform Interfaces" level="api">
+<component name="logs_services_api" long-name="Logs Services API" filter="s60" introduced="^4" class="api"/>
+<component name="logs_engine_api" long-name="Logs Engine API" filter="s60" introduced="^4" class="api"/>
+<component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api"/>
+<component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
+</collection>
+<collection name="logsui" long-name="Logs UI" level="ui">
+<component name="logsui_build" filter="s60" long-name="Logs UI Build">
+<!-- component at too high a rank, should move down one directory -->
+<unit bldFile="/sf/app/recents/logsui" proFile="logsui.pro"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/mw/browser/package_definition.xml	Wed May 19 12:43:21 2010 +0100
+++ b/symbian4/mw/browser/package_definition.xml	Wed May 19 16:50:40 2010 +0100
@@ -53,7 +53,13 @@
 <SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="browser" level="specific"/>
+<block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
+<collection name="bookmarksengine" long-name="Bookmarks Engine" level="support">
+<component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4">
+<unit bldFile="/sf/mw/browser/bookmarksengine" proFile="bookmarksengine.pro" qmakeArgs="&quot;what+=plat_101&quot;"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file

--- a/symbian4/os/persistentdata/package_definition.xml	Wed May 19 12:43:21 2010 +0100
+++ b/symbian4/os/persistentdata/package_definition.xml	Wed May 19 16:50:40 2010 +0100
@@ -66,7 +66,7 @@
 <component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
 <unit bldFile="/sf/os/persistentdata/loggingservices/eventlogger/group" mrp="/sf/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
 </component>
-<component name="filelogger" long-name="File Logger" introduced="ER5" deprecated="^4" purpose="optional">
+<component name="filelogger" long-name="File Logger" introduced="ER5" deprecated="^3" purpose="optional">
 <unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
 </component>
 <component name="rfilelogger" long-name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">