# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1290695622 0
# Node ID 5b9ea224ada68057a418ae1041cf7fc219836dd1
# Parent  d8ac09bd7e84837816d654cbef85cc827b66ce35
Update package models from latest system model  (platform@7ed7e7a9dfa6)

diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/adapt/stubs/package_definition.xml
--- a/CompilerCompatibility/adapt/stubs/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/adapt/stubs/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -53,7 +53,7 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adapt" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" long-name="Stubs" levels="stub">
+   <block name="stubs" level="high" span="2" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
 <unit bldFile="/sf/adapt/stubs/audiostubs/group"/>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/app/commonemail/package_definition.xml
--- a/CompilerCompatibility/app/commonemail/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/app/commonemail/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -104,9 +104,11 @@
 <component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/commonemail/ipsservices/ipssosaoplugin/group"/>
 </component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="/sf/app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
+<component name="ipsservices_conf" filter="s60" long-name="IPS Services Configuration" introduced="^2">
+<unit bldFile="/sf/app/commonemail/ipsservices/conf"/>
+</component>
+<component name="ipsservices_rom" filter="s60" long-name="IPS Services ROM" introduced="^2">
+<unit bldFile="/sf/app/commonemail/ipsservices/rom"/>
 </component>
 </collection>
 <collection name="emailcontacts" long-name="Email Contacts" level="support">
@@ -166,10 +168,29 @@
 <component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
-			alternatively, move the exports into a RM Config component-->
-<unit bldFile="/sf/app/commonemail/meetingrequest/group"/>
+<component name="meetingrequest_config" filter="s60" long-name="MR Configuration" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/conf"/>
+</component>
+<component name="meetingrequest_rom" filter="s60" long-name="MR ROM" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/rom"/>
+</component>
+<component name="mrbcplugin" filter="s60" long-name="MR BC Plugin" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrbcplugin/group"/>
+</component>
+<component name="mrcalremoteattachment" filter="s60" long-name="MR Calendar Remote Attachment" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrcalremoteattachment/group"/>
+</component>
+<component name="mrcmailremoteattachmentplugin" filter="s60" long-name="MR Cmail Remote Attachment Plugin" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrcmailremoteattachmentplugin/group"/>
+</component>
+<component name="mrguicommon" filter="s60" long-name="MR GUI COmmon" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrguicommon/group"/>
+</component>
+<component name="mrmbutilsextension" filter="s60" long-name="MR MB Utilities Extension" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrmbutilsextension/group"/>
+</component>
+<component name="mrprocessor" filter="s60" long-name="MR Processor" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrprocessor/group"/>
 </component>
 </collection>
 <collection name="emailuis" long-name="Email UIs" level="app">
@@ -183,11 +204,7 @@
 <unit bldFile="/sf/app/commonemail/emailuis/uicomponents/group"/>
 </component>
 <component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="/sf/app/commonemail/emailuis/group"/>
+<unit bldFile="/sf/app/commonemail/emailuis/widget/group"/>
 </component>
 </collection>
 <collection name="commonemail_info" long-name="Email Apps Info" level="app">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/app/conversations/package_definition.xml
--- a/CompilerCompatibility/app/conversations/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/app/conversations/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -90,9 +90,8 @@
 <component name="imconversationview" filter="s60" long-name="IM Conversation View">
 <unit bldFile="/sf/app/conversations/imstutils/imconversationview/group"/>
 </component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="/sf/app/conversations/imstutils/group"/>
+<component name="imstutils_loc" filter="s60" long-name="IM Service Tab Utils Localisation" class="config">
+<unit bldFile="/sf/app/conversations/imstutils/loc"/>
 </component>
 </collection>
 <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
@@ -115,9 +114,8 @@
 <component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
 <unit bldFile="/sf/app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
 </component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="/sf/app/conversations/uiservicetab/group"/>
+<component name="uiservicetab_exports" filter="s60" long-name="UI Service Tab Exports">
+<unit bldFile="/sf/app/conversations/uiservicetab/exports"/>
 </component>
 </collection>
 <collection name="servicewidget" long-name="Service Widget" level="ui">
@@ -128,9 +126,8 @@
 <!-- does this really need to have that number in the directory name? -->
 <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
 </component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="/sf/app/conversations/servicewidget/group"/>
+<component name="servicewidget_rom" filter="s60" long-name="Service Widget ROM">
+<unit bldFile="/sf/app/conversations/servicewidget/rom"/>
 </component>
 </collection>
 <collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
@@ -147,8 +144,7 @@
 </collection>
 <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
 <component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="/sf/app/conversations/group"/>
+<unit bldFile="/sf/app/conversations/exports"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/app/mmsharinguis/package_definition.xml
--- a/CompilerCompatibility/app/mmsharinguis/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/app/mmsharinguis/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -87,8 +87,8 @@
 <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
 <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
 </component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="/sf/app/mmsharinguis/mmsharing/group"/>
+<component name="mmsharing_exports" filter="s60" long-name="MM Sharing exports">
+<unit bldFile="/sf/app/mmsharinguis/mmsharing/exports"/>
 </component>
 </collection>
 <collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
@@ -109,9 +109,8 @@
 </component>
 </collection>
 <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!--  consider distributing to other components -->
-<unit bldFile="/sf/app/mmsharinguis/group"/>
+<component name="mmsharinguis_rom" filter="s60" long-name="Multimedia Sharing UIs ROM">
+<unit bldFile="/sf/app/mmsharinguis/rom"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/app/musicplayer/package_definition.xml
--- a/CompilerCompatibility/app/musicplayer/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/app/musicplayer/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -99,9 +99,8 @@
 <component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
 <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/app/group"/>
 </component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/group"/>
+<component name="mpxmusicplayer_exports" filter="s60" long-name="MPX Music Player Exports">
+<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/exports"/>
 </component>
 </collection>
 <collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
@@ -133,17 +132,11 @@
 <component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
 <unit bldFile="/sf/app/musicplayer/mpxplugins/viewplugins/group"/>
 </component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxplugins/group"/>
+<component name="mpxplugins_exports" filter="s60" long-name="MPX Plugins Exports">
+<unit bldFile="/sf/app/musicplayer/mpxplugins/exports"/>
 </component>
 </collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
-<unit bldFile="/sf/app/musicplayer/group"/>
-</component>
-</collection>
+<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app"/>
 </block>
   </layer>
  </systemModel>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/app/organizer/package_definition.xml
--- a/CompilerCompatibility/app/organizer/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/app/organizer/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -232,9 +232,11 @@
 <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
 <unit bldFile="/sf/app/organizer/calendarui/caldav/group"/>
 </component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="/sf/app/organizer/calendarui/group"/>
+<component name="calendarui_exports" filter="s60" long-name="Calendar UI Exports">
+<unit bldFile="/sf/app/organizer/calendarui/exports"/>
+</component>
+<component name="calendarui_organizerplugin" filter="s60" long-name="Calendar UI Organizer Plugin">
+<unit bldFile="/sf/app/organizer/calendarui/organizerplugin/group"/>
 </component>
 </collection>
 <collection name="meetingui" long-name="Meeting UI" level="ui">
@@ -265,9 +267,8 @@
 <component name="clock2_help" filter="s60" long-name="Clock Help">
 <unit bldFile="/sf/app/organizer/clock2/help/group"/>
 </component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="/sf/app/organizer/clock2/group"/>
+<component name="clock2_exports" filter="s60" long-name="Clock Exports">
+<unit bldFile="/sf/app/organizer/clock2/exports"/>
 </component>
 </collection>
 <collection name="notepad" long-name="Notepad" level="ui">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/app/podcatcher/package_definition.xml
--- a/CompilerCompatibility/app/podcatcher/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/app/podcatcher/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -58,6 +58,8 @@
 <component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
 <unit bldFile="/sf/app/podcatcher/group"/>
 </component>
+<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3"/>
+<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3"/>
 </collection>
 </block>
   </layer>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/app/speechsrv/package_definition.xml
--- a/CompilerCompatibility/app/speechsrv/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/app/speechsrv/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -151,12 +151,10 @@
 <unit bldFile="/sf/app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
 </component>
 <component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
+<unit bldFile="/sf/app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
 </component>
 <component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!--  can this be put into the other components? -->
-<unit bldFile="/sf/app/speechsrv/voiceui/group"/>
+<unit bldFile="/sf/app/speechsrv/voiceui/build"/>
 </component>
 </collection>
 <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/app/webuis/package_definition.xml
--- a/CompilerCompatibility/app/webuis/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/app/webuis/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -67,20 +67,14 @@
 </collection>
 <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
 <component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
+<unit bldFile="/sf/app/webuis/browserplugins/browsersysteminfoplugin/group"/>
 </component>
 <component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
+<unit bldFile="/sf/app/webuis/browserplugins/browsergpsplugin/group"/>
 </component>
 <component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
 <unit bldFile="/sf/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
 </component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="/sf/app/webuis/browserplugins/group"/>
-</component>
 </collection>
 <collection name="pushmtm" long-name="Push MTM" level="plugin">
 <component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/mw/appinstall/package_definition.xml
--- a/CompilerCompatibility/mw/appinstall/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/mw/appinstall/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -96,8 +96,8 @@
 <component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
 <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
 </component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
+<component name="ncdengine_exports" filter="s60" long-name="NCD Exports" introduced="^1">
+<unit bldFile="/sf/mw/appinstall/ncdengine/exports"/>
 </component>
 </collection>
 <collection name="appinstaller" long-name="Application Installer" level="generic">
@@ -122,8 +122,8 @@
 <component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
 <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
 </component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
+<component name="iaupdate_rom" filter="s60" long-name="IA Update ROM" introduced="^2">
+<unit bldFile="/sf/mw/appinstall/iaupdate/rom"/>
 </component>
 </collection>
 <collection name="installationservices" long-name="Installation Services" level="generic">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/mw/ipconnmgmt/package_definition.xml
--- a/CompilerCompatibility/mw/ipconnmgmt/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/mw/ipconnmgmt/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -184,8 +184,7 @@
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
 </component>
 <component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
 </component>
 <component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -193,15 +192,16 @@
 <component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
 </component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/group"/>
+<component name="dbcreator_conf" filter="s60" long-name="DB Creator Configuration" introduced="9.3">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/conf"/>
+</component>
+<component name="dbcreator_rom" filter="s60" long-name="DB Creator ROM" introduced="9.3">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/rom"/>
 </component>
 </collection>
 <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
-<component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
-<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
-<unit bldFile="/sf/mw/ipconnmgmt/group"/>
+<component name="ipcm_config" filter="s60" long-name="IP Connectivity Management Configuration">
+<unit bldFile="/sf/mw/ipconnmgmt/data"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 CompilerCompatibility/os/lbs/package_definition.xml
--- a/CompilerCompatibility/os/lbs/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/CompilerCompatibility/os/lbs/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -70,7 +70,7 @@
 <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
 </component>
-<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/adapt/stubs/package_definition.xml
--- a/RCL_3/adapt/stubs/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/adapt/stubs/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -53,7 +53,7 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adapt" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" long-name="Stubs" levels="stub">
+   <block name="stubs" level="high" span="2" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
 <unit bldFile="/sf/adapt/stubs/audiostubs/group"/>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/app/commonemail/package_definition.xml
--- a/RCL_3/app/commonemail/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/app/commonemail/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -104,9 +104,11 @@
 <component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/commonemail/ipsservices/ipssosaoplugin/group"/>
 </component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="/sf/app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
+<component name="ipsservices_conf" filter="s60" long-name="IPS Services Configuration" introduced="^2">
+<unit bldFile="/sf/app/commonemail/ipsservices/conf"/>
+</component>
+<component name="ipsservices_rom" filter="s60" long-name="IPS Services ROM" introduced="^2">
+<unit bldFile="/sf/app/commonemail/ipsservices/rom"/>
 </component>
 </collection>
 <collection name="emailcontacts" long-name="Email Contacts" level="support">
@@ -166,10 +168,29 @@
 <component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
-			alternatively, move the exports into a RM Config component-->
-<unit bldFile="/sf/app/commonemail/meetingrequest/group"/>
+<component name="meetingrequest_config" filter="s60" long-name="MR Configuration" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/conf"/>
+</component>
+<component name="meetingrequest_rom" filter="s60" long-name="MR ROM" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/rom"/>
+</component>
+<component name="mrbcplugin" filter="s60" long-name="MR BC Plugin" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrbcplugin/group"/>
+</component>
+<component name="mrcalremoteattachment" filter="s60" long-name="MR Calendar Remote Attachment" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrcalremoteattachment/group"/>
+</component>
+<component name="mrcmailremoteattachmentplugin" filter="s60" long-name="MR Cmail Remote Attachment Plugin" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrcmailremoteattachmentplugin/group"/>
+</component>
+<component name="mrguicommon" filter="s60" long-name="MR GUI COmmon" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrguicommon/group"/>
+</component>
+<component name="mrmbutilsextension" filter="s60" long-name="MR MB Utilities Extension" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrmbutilsextension/group"/>
+</component>
+<component name="mrprocessor" filter="s60" long-name="MR Processor" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrprocessor/group"/>
 </component>
 </collection>
 <collection name="emailuis" long-name="Email UIs" level="app">
@@ -183,11 +204,7 @@
 <unit bldFile="/sf/app/commonemail/emailuis/uicomponents/group"/>
 </component>
 <component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="/sf/app/commonemail/emailuis/group"/>
+<unit bldFile="/sf/app/commonemail/emailuis/widget/group"/>
 </component>
 </collection>
 <collection name="commonemail_info" long-name="Email Apps Info" level="app">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/app/conversations/package_definition.xml
--- a/RCL_3/app/conversations/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/app/conversations/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -90,9 +90,8 @@
 <component name="imconversationview" filter="s60" long-name="IM Conversation View">
 <unit bldFile="/sf/app/conversations/imstutils/imconversationview/group"/>
 </component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="/sf/app/conversations/imstutils/group"/>
+<component name="imstutils_loc" filter="s60" long-name="IM Service Tab Utils Localisation" class="config">
+<unit bldFile="/sf/app/conversations/imstutils/loc"/>
 </component>
 </collection>
 <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
@@ -115,9 +114,8 @@
 <component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
 <unit bldFile="/sf/app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
 </component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="/sf/app/conversations/uiservicetab/group"/>
+<component name="uiservicetab_exports" filter="s60" long-name="UI Service Tab Exports">
+<unit bldFile="/sf/app/conversations/uiservicetab/exports"/>
 </component>
 </collection>
 <collection name="servicewidget" long-name="Service Widget" level="ui">
@@ -128,9 +126,8 @@
 <!-- does this really need to have that number in the directory name? -->
 <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
 </component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="/sf/app/conversations/servicewidget/group"/>
+<component name="servicewidget_rom" filter="s60" long-name="Service Widget ROM">
+<unit bldFile="/sf/app/conversations/servicewidget/rom"/>
 </component>
 </collection>
 <collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
@@ -147,8 +144,7 @@
 </collection>
 <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
 <component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="/sf/app/conversations/group"/>
+<unit bldFile="/sf/app/conversations/exports"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/app/mmsharinguis/package_definition.xml
--- a/RCL_3/app/mmsharinguis/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/app/mmsharinguis/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -87,8 +87,8 @@
 <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
 <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
 </component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="/sf/app/mmsharinguis/mmsharing/group"/>
+<component name="mmsharing_exports" filter="s60" long-name="MM Sharing exports">
+<unit bldFile="/sf/app/mmsharinguis/mmsharing/exports"/>
 </component>
 </collection>
 <collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
@@ -109,9 +109,8 @@
 </component>
 </collection>
 <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!--  consider distributing to other components -->
-<unit bldFile="/sf/app/mmsharinguis/group"/>
+<component name="mmsharinguis_rom" filter="s60" long-name="Multimedia Sharing UIs ROM">
+<unit bldFile="/sf/app/mmsharinguis/rom"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/app/musicplayer/package_definition.xml
--- a/RCL_3/app/musicplayer/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/app/musicplayer/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -99,9 +99,8 @@
 <component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
 <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/app/group"/>
 </component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/group"/>
+<component name="mpxmusicplayer_exports" filter="s60" long-name="MPX Music Player Exports">
+<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/exports"/>
 </component>
 </collection>
 <collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
@@ -133,17 +132,11 @@
 <component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
 <unit bldFile="/sf/app/musicplayer/mpxplugins/viewplugins/group"/>
 </component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxplugins/group"/>
+<component name="mpxplugins_exports" filter="s60" long-name="MPX Plugins Exports">
+<unit bldFile="/sf/app/musicplayer/mpxplugins/exports"/>
 </component>
 </collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
-<unit bldFile="/sf/app/musicplayer/group"/>
-</component>
-</collection>
+<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app"/>
 </block>
   </layer>
  </systemModel>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/app/organizer/package_definition.xml
--- a/RCL_3/app/organizer/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/app/organizer/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -232,9 +232,11 @@
 <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
 <unit bldFile="/sf/app/organizer/calendarui/caldav/group"/>
 </component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="/sf/app/organizer/calendarui/group"/>
+<component name="calendarui_exports" filter="s60" long-name="Calendar UI Exports">
+<unit bldFile="/sf/app/organizer/calendarui/exports"/>
+</component>
+<component name="calendarui_organizerplugin" filter="s60" long-name="Calendar UI Organizer Plugin">
+<unit bldFile="/sf/app/organizer/calendarui/organizerplugin/group"/>
 </component>
 </collection>
 <collection name="meetingui" long-name="Meeting UI" level="ui">
@@ -265,9 +267,8 @@
 <component name="clock2_help" filter="s60" long-name="Clock Help">
 <unit bldFile="/sf/app/organizer/clock2/help/group"/>
 </component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="/sf/app/organizer/clock2/group"/>
+<component name="clock2_exports" filter="s60" long-name="Clock Exports">
+<unit bldFile="/sf/app/organizer/clock2/exports"/>
 </component>
 </collection>
 <collection name="notepad" long-name="Notepad" level="ui">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/app/podcatcher/package_definition.xml
--- a/RCL_3/app/podcatcher/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/app/podcatcher/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -58,6 +58,8 @@
 <component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
 <unit bldFile="/sf/app/podcatcher/group"/>
 </component>
+<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3"/>
+<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3"/>
 </collection>
 </block>
   </layer>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/app/speechsrv/package_definition.xml
--- a/RCL_3/app/speechsrv/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/app/speechsrv/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -151,12 +151,10 @@
 <unit bldFile="/sf/app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
 </component>
 <component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
+<unit bldFile="/sf/app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
 </component>
 <component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!--  can this be put into the other components? -->
-<unit bldFile="/sf/app/speechsrv/voiceui/group"/>
+<unit bldFile="/sf/app/speechsrv/voiceui/build"/>
 </component>
 </collection>
 <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/app/webuis/package_definition.xml
--- a/RCL_3/app/webuis/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/app/webuis/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -67,20 +67,14 @@
 </collection>
 <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
 <component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
+<unit bldFile="/sf/app/webuis/browserplugins/browsersysteminfoplugin/group"/>
 </component>
 <component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
+<unit bldFile="/sf/app/webuis/browserplugins/browsergpsplugin/group"/>
 </component>
 <component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
 <unit bldFile="/sf/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
 </component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="/sf/app/webuis/browserplugins/group"/>
-</component>
 </collection>
 <collection name="pushmtm" long-name="Push MTM" level="plugin">
 <component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/mw/appinstall/package_definition.xml
--- a/RCL_3/mw/appinstall/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/mw/appinstall/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -96,8 +96,8 @@
 <component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
 <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
 </component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
+<component name="ncdengine_exports" filter="s60" long-name="NCD Exports" introduced="^1">
+<unit bldFile="/sf/mw/appinstall/ncdengine/exports"/>
 </component>
 </collection>
 <collection name="appinstaller" long-name="Application Installer" level="generic">
@@ -122,8 +122,8 @@
 <component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
 <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
 </component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
+<component name="iaupdate_rom" filter="s60" long-name="IA Update ROM" introduced="^2">
+<unit bldFile="/sf/mw/appinstall/iaupdate/rom"/>
 </component>
 </collection>
 <collection name="installationservices" long-name="Installation Services" level="generic">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/mw/ipconnmgmt/package_definition.xml
--- a/RCL_3/mw/ipconnmgmt/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/mw/ipconnmgmt/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -184,8 +184,7 @@
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
 </component>
 <component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
 </component>
 <component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -193,15 +192,16 @@
 <component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
 </component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/group"/>
+<component name="dbcreator_conf" filter="s60" long-name="DB Creator Configuration" introduced="9.3">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/conf"/>
+</component>
+<component name="dbcreator_rom" filter="s60" long-name="DB Creator ROM" introduced="9.3">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/rom"/>
 </component>
 </collection>
 <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
-<component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
-<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
-<unit bldFile="/sf/mw/ipconnmgmt/group"/>
+<component name="ipcm_config" filter="s60" long-name="IP Connectivity Management Configuration">
+<unit bldFile="/sf/mw/ipconnmgmt/data"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 RCL_3/os/lbs/package_definition.xml
--- a/RCL_3/os/lbs/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/RCL_3/os/lbs/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -70,7 +70,7 @@
 <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
 </component>
-<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/adapt/stubs/package_definition.xml
--- a/symbian3/adapt/stubs/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/adapt/stubs/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -53,7 +53,7 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adapt" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" long-name="Stubs" levels="stub">
+   <block name="stubs" level="high" span="2" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
 <unit bldFile="/sf/adapt/stubs/audiostubs/group"/>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/app/commonemail/package_definition.xml
--- a/symbian3/app/commonemail/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -104,9 +104,11 @@
 <component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/commonemail/ipsservices/ipssosaoplugin/group"/>
 </component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="/sf/app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
+<component name="ipsservices_conf" filter="s60" long-name="IPS Services Configuration" introduced="^2">
+<unit bldFile="/sf/app/commonemail/ipsservices/conf"/>
+</component>
+<component name="ipsservices_rom" filter="s60" long-name="IPS Services ROM" introduced="^2">
+<unit bldFile="/sf/app/commonemail/ipsservices/rom"/>
 </component>
 </collection>
 <collection name="emailcontacts" long-name="Email Contacts" level="support">
@@ -166,10 +168,29 @@
 <component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
-			alternatively, move the exports into a RM Config component-->
-<unit bldFile="/sf/app/commonemail/meetingrequest/group"/>
+<component name="meetingrequest_config" filter="s60" long-name="MR Configuration" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/conf"/>
+</component>
+<component name="meetingrequest_rom" filter="s60" long-name="MR ROM" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/rom"/>
+</component>
+<component name="mrbcplugin" filter="s60" long-name="MR BC Plugin" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrbcplugin/group"/>
+</component>
+<component name="mrcalremoteattachment" filter="s60" long-name="MR Calendar Remote Attachment" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrcalremoteattachment/group"/>
+</component>
+<component name="mrcmailremoteattachmentplugin" filter="s60" long-name="MR Cmail Remote Attachment Plugin" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrcmailremoteattachmentplugin/group"/>
+</component>
+<component name="mrguicommon" filter="s60" long-name="MR GUI COmmon" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrguicommon/group"/>
+</component>
+<component name="mrmbutilsextension" filter="s60" long-name="MR MB Utilities Extension" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrmbutilsextension/group"/>
+</component>
+<component name="mrprocessor" filter="s60" long-name="MR Processor" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrprocessor/group"/>
 </component>
 </collection>
 <collection name="emailuis" long-name="Email UIs" level="app">
@@ -183,11 +204,7 @@
 <unit bldFile="/sf/app/commonemail/emailuis/uicomponents/group"/>
 </component>
 <component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="/sf/app/commonemail/emailuis/group"/>
+<unit bldFile="/sf/app/commonemail/emailuis/widget/group"/>
 </component>
 </collection>
 <collection name="commonemail_info" long-name="Email Apps Info" level="app">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/app/conversations/package_definition.xml
--- a/symbian3/app/conversations/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/app/conversations/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -90,9 +90,8 @@
 <component name="imconversationview" filter="s60" long-name="IM Conversation View">
 <unit bldFile="/sf/app/conversations/imstutils/imconversationview/group"/>
 </component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="/sf/app/conversations/imstutils/group"/>
+<component name="imstutils_loc" filter="s60" long-name="IM Service Tab Utils Localisation" class="config">
+<unit bldFile="/sf/app/conversations/imstutils/loc"/>
 </component>
 </collection>
 <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
@@ -115,9 +114,8 @@
 <component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
 <unit bldFile="/sf/app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
 </component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="/sf/app/conversations/uiservicetab/group"/>
+<component name="uiservicetab_exports" filter="s60" long-name="UI Service Tab Exports">
+<unit bldFile="/sf/app/conversations/uiservicetab/exports"/>
 </component>
 </collection>
 <collection name="servicewidget" long-name="Service Widget" level="ui">
@@ -128,9 +126,8 @@
 <!-- does this really need to have that number in the directory name? -->
 <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
 </component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="/sf/app/conversations/servicewidget/group"/>
+<component name="servicewidget_rom" filter="s60" long-name="Service Widget ROM">
+<unit bldFile="/sf/app/conversations/servicewidget/rom"/>
 </component>
 </collection>
 <collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
@@ -147,8 +144,7 @@
 </collection>
 <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
 <component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="/sf/app/conversations/group"/>
+<unit bldFile="/sf/app/conversations/exports"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/app/mmsharinguis/package_definition.xml
--- a/symbian3/app/mmsharinguis/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/app/mmsharinguis/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -87,8 +87,8 @@
 <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
 <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
 </component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="/sf/app/mmsharinguis/mmsharing/group"/>
+<component name="mmsharing_exports" filter="s60" long-name="MM Sharing exports">
+<unit bldFile="/sf/app/mmsharinguis/mmsharing/exports"/>
 </component>
 </collection>
 <collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
@@ -109,9 +109,8 @@
 </component>
 </collection>
 <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!--  consider distributing to other components -->
-<unit bldFile="/sf/app/mmsharinguis/group"/>
+<component name="mmsharinguis_rom" filter="s60" long-name="Multimedia Sharing UIs ROM">
+<unit bldFile="/sf/app/mmsharinguis/rom"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/app/musicplayer/package_definition.xml
--- a/symbian3/app/musicplayer/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/app/musicplayer/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -99,9 +99,8 @@
 <component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
 <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/app/group"/>
 </component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/group"/>
+<component name="mpxmusicplayer_exports" filter="s60" long-name="MPX Music Player Exports">
+<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/exports"/>
 </component>
 </collection>
 <collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
@@ -133,17 +132,11 @@
 <component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
 <unit bldFile="/sf/app/musicplayer/mpxplugins/viewplugins/group"/>
 </component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxplugins/group"/>
+<component name="mpxplugins_exports" filter="s60" long-name="MPX Plugins Exports">
+<unit bldFile="/sf/app/musicplayer/mpxplugins/exports"/>
 </component>
 </collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
-<unit bldFile="/sf/app/musicplayer/group"/>
-</component>
-</collection>
+<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app"/>
 </block>
   </layer>
  </systemModel>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/app/organizer/package_definition.xml
--- a/symbian3/app/organizer/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/app/organizer/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -232,9 +232,11 @@
 <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
 <unit bldFile="/sf/app/organizer/calendarui/caldav/group"/>
 </component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="/sf/app/organizer/calendarui/group"/>
+<component name="calendarui_exports" filter="s60" long-name="Calendar UI Exports">
+<unit bldFile="/sf/app/organizer/calendarui/exports"/>
+</component>
+<component name="calendarui_organizerplugin" filter="s60" long-name="Calendar UI Organizer Plugin">
+<unit bldFile="/sf/app/organizer/calendarui/organizerplugin/group"/>
 </component>
 </collection>
 <collection name="meetingui" long-name="Meeting UI" level="ui">
@@ -265,9 +267,8 @@
 <component name="clock2_help" filter="s60" long-name="Clock Help">
 <unit bldFile="/sf/app/organizer/clock2/help/group"/>
 </component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="/sf/app/organizer/clock2/group"/>
+<component name="clock2_exports" filter="s60" long-name="Clock Exports">
+<unit bldFile="/sf/app/organizer/clock2/exports"/>
 </component>
 </collection>
 <collection name="notepad" long-name="Notepad" level="ui">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/app/podcatcher/package_definition.xml
--- a/symbian3/app/podcatcher/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/app/podcatcher/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -58,6 +58,8 @@
 <component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
 <unit bldFile="/sf/app/podcatcher/group"/>
 </component>
+<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3"/>
+<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3"/>
 </collection>
 </block>
   </layer>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/app/speechsrv/package_definition.xml
--- a/symbian3/app/speechsrv/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/app/speechsrv/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -151,12 +151,10 @@
 <unit bldFile="/sf/app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
 </component>
 <component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
+<unit bldFile="/sf/app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
 </component>
 <component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!--  can this be put into the other components? -->
-<unit bldFile="/sf/app/speechsrv/voiceui/group"/>
+<unit bldFile="/sf/app/speechsrv/voiceui/build"/>
 </component>
 </collection>
 <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/app/webuis/package_definition.xml
--- a/symbian3/app/webuis/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/app/webuis/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -67,20 +67,14 @@
 </collection>
 <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
 <component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
+<unit bldFile="/sf/app/webuis/browserplugins/browsersysteminfoplugin/group"/>
 </component>
 <component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
+<unit bldFile="/sf/app/webuis/browserplugins/browsergpsplugin/group"/>
 </component>
 <component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
 <unit bldFile="/sf/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
 </component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="/sf/app/webuis/browserplugins/group"/>
-</component>
 </collection>
 <collection name="pushmtm" long-name="Push MTM" level="plugin">
 <component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/mw/appinstall/package_definition.xml
--- a/symbian3/mw/appinstall/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/mw/appinstall/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -96,8 +96,8 @@
 <component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
 <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
 </component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
+<component name="ncdengine_exports" filter="s60" long-name="NCD Exports" introduced="^1">
+<unit bldFile="/sf/mw/appinstall/ncdengine/exports"/>
 </component>
 </collection>
 <collection name="appinstaller" long-name="Application Installer" level="generic">
@@ -122,8 +122,8 @@
 <component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
 <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
 </component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
+<component name="iaupdate_rom" filter="s60" long-name="IA Update ROM" introduced="^2">
+<unit bldFile="/sf/mw/appinstall/iaupdate/rom"/>
 </component>
 </collection>
 <collection name="installationservices" long-name="Installation Services" level="generic">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/mw/ipconnmgmt/package_definition.xml
--- a/symbian3/mw/ipconnmgmt/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -184,8 +184,7 @@
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
 </component>
 <component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
 </component>
 <component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -193,15 +192,16 @@
 <component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
 </component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/group"/>
+<component name="dbcreator_conf" filter="s60" long-name="DB Creator Configuration" introduced="9.3">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/conf"/>
+</component>
+<component name="dbcreator_rom" filter="s60" long-name="DB Creator ROM" introduced="9.3">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/rom"/>
 </component>
 </collection>
 <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
-<component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
-<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
-<unit bldFile="/sf/mw/ipconnmgmt/group"/>
+<component name="ipcm_config" filter="s60" long-name="IP Connectivity Management Configuration">
+<unit bldFile="/sf/mw/ipconnmgmt/data"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/symbian3/os/lbs/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -70,7 +70,7 @@
 <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
 </component>
-<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/adapt/stubs/package_definition.xml
--- a/tip_bulk_s3/adapt/stubs/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/adapt/stubs/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -53,7 +53,7 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="adapt" long-name="Adaptation" levels="low mw high">
-   <block name="stubs" level="high" long-name="Stubs" levels="stub">
+   <block name="stubs" level="high" span="2" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
 <unit bldFile="/sf/adapt/stubs/audiostubs/group"/>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/app/commonemail/package_definition.xml
--- a/tip_bulk_s3/app/commonemail/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/app/commonemail/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -104,9 +104,11 @@
 <component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/commonemail/ipsservices/ipssosaoplugin/group"/>
 </component>
-<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
-<unit bldFile="/sf/app/commonemail/ipsservices/group"/>
-<!-- can the exports be broken up into the other components or made a config component?-->
+<component name="ipsservices_conf" filter="s60" long-name="IPS Services Configuration" introduced="^2">
+<unit bldFile="/sf/app/commonemail/ipsservices/conf"/>
+</component>
+<component name="ipsservices_rom" filter="s60" long-name="IPS Services ROM" introduced="^2">
+<unit bldFile="/sf/app/commonemail/ipsservices/rom"/>
 </component>
 </collection>
 <collection name="emailcontacts" long-name="Email Contacts" level="support">
@@ -166,10 +168,29 @@
 <component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
 <unit bldFile="/sf/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
-<component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
-			alternatively, move the exports into a RM Config component-->
-<unit bldFile="/sf/app/commonemail/meetingrequest/group"/>
+<component name="meetingrequest_config" filter="s60" long-name="MR Configuration" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/conf"/>
+</component>
+<component name="meetingrequest_rom" filter="s60" long-name="MR ROM" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/rom"/>
+</component>
+<component name="mrbcplugin" filter="s60" long-name="MR BC Plugin" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrbcplugin/group"/>
+</component>
+<component name="mrcalremoteattachment" filter="s60" long-name="MR Calendar Remote Attachment" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrcalremoteattachment/group"/>
+</component>
+<component name="mrcmailremoteattachmentplugin" filter="s60" long-name="MR Cmail Remote Attachment Plugin" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrcmailremoteattachmentplugin/group"/>
+</component>
+<component name="mrguicommon" filter="s60" long-name="MR GUI COmmon" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrguicommon/group"/>
+</component>
+<component name="mrmbutilsextension" filter="s60" long-name="MR MB Utilities Extension" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrmbutilsextension/group"/>
+</component>
+<component name="mrprocessor" filter="s60" long-name="MR Processor" introduced="^2">
+<unit bldFile="/sf/app/commonemail/meetingrequest/mrprocessor/group"/>
 </component>
 </collection>
 <collection name="emailuis" long-name="Email UIs" level="app">
@@ -183,11 +204,7 @@
 <unit bldFile="/sf/app/commonemail/emailuis/uicomponents/group"/>
 </component>
 <component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
-<!--<unit bldFile="emailuis/widget/group"/>-->
-</component>
-<component name="emailuis_build" filter="s60" long-name="Email UIs Build" introduced="^2">
-<unit bldFile="/sf/app/commonemail/emailuis/group"/>
+<unit bldFile="/sf/app/commonemail/emailuis/widget/group"/>
 </component>
 </collection>
 <collection name="commonemail_info" long-name="Email Apps Info" level="app">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/app/conversations/package_definition.xml
--- a/tip_bulk_s3/app/conversations/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/app/conversations/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -90,9 +90,8 @@
 <component name="imconversationview" filter="s60" long-name="IM Conversation View">
 <unit bldFile="/sf/app/conversations/imstutils/imconversationview/group"/>
 </component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="/sf/app/conversations/imstutils/group"/>
+<component name="imstutils_loc" filter="s60" long-name="IM Service Tab Utils Localisation" class="config">
+<unit bldFile="/sf/app/conversations/imstutils/loc"/>
 </component>
 </collection>
 <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
@@ -115,9 +114,8 @@
 <component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
 <unit bldFile="/sf/app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
 </component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="/sf/app/conversations/uiservicetab/group"/>
+<component name="uiservicetab_exports" filter="s60" long-name="UI Service Tab Exports">
+<unit bldFile="/sf/app/conversations/uiservicetab/exports"/>
 </component>
 </collection>
 <collection name="servicewidget" long-name="Service Widget" level="ui">
@@ -128,9 +126,8 @@
 <!-- does this really need to have that number in the directory name? -->
 <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
 </component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="/sf/app/conversations/servicewidget/group"/>
+<component name="servicewidget_rom" filter="s60" long-name="Service Widget ROM">
+<unit bldFile="/sf/app/conversations/servicewidget/rom"/>
 </component>
 </collection>
 <collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
@@ -147,8 +144,7 @@
 </collection>
 <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
 <component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="/sf/app/conversations/group"/>
+<unit bldFile="/sf/app/conversations/exports"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/app/mmsharinguis/package_definition.xml
--- a/tip_bulk_s3/app/mmsharinguis/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/app/mmsharinguis/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -87,8 +87,8 @@
 <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
 <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
 </component>
-<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
-<unit bldFile="/sf/app/mmsharinguis/mmsharing/group"/>
+<component name="mmsharing_exports" filter="s60" long-name="MM Sharing exports">
+<unit bldFile="/sf/app/mmsharinguis/mmsharing/exports"/>
 </component>
 </collection>
 <collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
@@ -109,9 +109,8 @@
 </component>
 </collection>
 <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
-<!--  consider distributing to other components -->
-<unit bldFile="/sf/app/mmsharinguis/group"/>
+<component name="mmsharinguis_rom" filter="s60" long-name="Multimedia Sharing UIs ROM">
+<unit bldFile="/sf/app/mmsharinguis/rom"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/app/musicplayer/package_definition.xml
--- a/tip_bulk_s3/app/musicplayer/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/app/musicplayer/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -99,9 +99,8 @@
 <component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
 <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/app/group"/>
 </component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/group"/>
+<component name="mpxmusicplayer_exports" filter="s60" long-name="MPX Music Player Exports">
+<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/exports"/>
 </component>
 </collection>
 <collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
@@ -133,17 +132,11 @@
 <component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
 <unit bldFile="/sf/app/musicplayer/mpxplugins/viewplugins/group"/>
 </component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxplugins/group"/>
+<component name="mpxplugins_exports" filter="s60" long-name="MPX Plugins Exports">
+<unit bldFile="/sf/app/musicplayer/mpxplugins/exports"/>
 </component>
 </collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
-<unit bldFile="/sf/app/musicplayer/group"/>
-</component>
-</collection>
+<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app"/>
 </block>
   </layer>
  </systemModel>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/app/organizer/package_definition.xml
--- a/tip_bulk_s3/app/organizer/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/app/organizer/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -232,9 +232,11 @@
 <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
 <unit bldFile="/sf/app/organizer/calendarui/caldav/group"/>
 </component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="/sf/app/organizer/calendarui/group"/>
+<component name="calendarui_exports" filter="s60" long-name="Calendar UI Exports">
+<unit bldFile="/sf/app/organizer/calendarui/exports"/>
+</component>
+<component name="calendarui_organizerplugin" filter="s60" long-name="Calendar UI Organizer Plugin">
+<unit bldFile="/sf/app/organizer/calendarui/organizerplugin/group"/>
 </component>
 </collection>
 <collection name="meetingui" long-name="Meeting UI" level="ui">
@@ -265,9 +267,8 @@
 <component name="clock2_help" filter="s60" long-name="Clock Help">
 <unit bldFile="/sf/app/organizer/clock2/help/group"/>
 </component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="/sf/app/organizer/clock2/group"/>
+<component name="clock2_exports" filter="s60" long-name="Clock Exports">
+<unit bldFile="/sf/app/organizer/clock2/exports"/>
 </component>
 </collection>
 <collection name="notepad" long-name="Notepad" level="ui">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/app/podcatcher/package_definition.xml
--- a/tip_bulk_s3/app/podcatcher/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/app/podcatcher/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -58,6 +58,8 @@
 <component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
 <unit bldFile="/sf/app/podcatcher/group"/>
 </component>
+<component name="podcatcher_app" filter="sf_build" long-name="Podcatcher Application" introduced="^3"/>
+<component name="podcatcher_engine" filter="sf_build" long-name="Podcatcher Engine" introduced="^3"/>
 </collection>
 </block>
   </layer>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/app/speechsrv/package_definition.xml
--- a/tip_bulk_s3/app/speechsrv/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/app/speechsrv/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -151,12 +151,10 @@
 <unit bldFile="/sf/app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
 </component>
 <component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
-<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
+<unit bldFile="/sf/app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
 </component>
 <component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<!--  can this be put into the other components? -->
-<unit bldFile="/sf/app/speechsrv/voiceui/group"/>
+<unit bldFile="/sf/app/speechsrv/voiceui/build"/>
 </component>
 </collection>
 <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/app/webuis/package_definition.xml
--- a/tip_bulk_s3/app/webuis/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/app/webuis/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -67,20 +67,14 @@
 </collection>
 <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
 <component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
+<unit bldFile="/sf/app/webuis/browserplugins/browsersysteminfoplugin/group"/>
 </component>
 <component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
-<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
+<unit bldFile="/sf/app/webuis/browserplugins/browsergpsplugin/group"/>
 </component>
 <component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
 <unit bldFile="/sf/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
 </component>
-<component name="browserplugins_build" filter="s60" long-name="Browser Plugins Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-<unit bldFile="/sf/app/webuis/browserplugins/group"/>
-</component>
 </collection>
 <collection name="pushmtm" long-name="Push MTM" level="plugin">
 <component name="pushmtm_help" filter="s60" long-name="Push MTM Help">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/mw/appinstall/package_definition.xml
--- a/tip_bulk_s3/mw/appinstall/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/mw/appinstall/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -96,8 +96,8 @@
 <component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
 <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
 </component>
-<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
-<unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
+<component name="ncdengine_exports" filter="s60" long-name="NCD Exports" introduced="^1">
+<unit bldFile="/sf/mw/appinstall/ncdengine/exports"/>
 </component>
 </collection>
 <collection name="appinstaller" long-name="Application Installer" level="generic">
@@ -122,8 +122,8 @@
 <component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
 <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
 </component>
-<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
-<unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
+<component name="iaupdate_rom" filter="s60" long-name="IA Update ROM" introduced="^2">
+<unit bldFile="/sf/mw/appinstall/iaupdate/rom"/>
 </component>
 </collection>
 <collection name="installationservices" long-name="Installation Services" level="generic">
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/mw/ipconnmgmt/package_definition.xml
--- a/tip_bulk_s3/mw/ipconnmgmt/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/mw/ipconnmgmt/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -184,8 +184,7 @@
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
 </component>
 <component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
 </component>
 <component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -193,15 +192,16 @@
 <component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
 </component>
-<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
-<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
-<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/group"/>
+<component name="dbcreator_conf" filter="s60" long-name="DB Creator Configuration" introduced="9.3">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/conf"/>
+</component>
+<component name="dbcreator_rom" filter="s60" long-name="DB Creator ROM" introduced="9.3">
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/rom"/>
 </component>
 </collection>
 <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
-<component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
-<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
-<unit bldFile="/sf/mw/ipconnmgmt/group"/>
+<component name="ipcm_config" filter="s60" long-name="IP Connectivity Management Configuration">
+<unit bldFile="/sf/mw/ipconnmgmt/data"/>
 </component>
 </collection>
 </block>
diff -r d8ac09bd7e84 -r 5b9ea224ada6 tip_bulk_s3/os/lbs/package_definition.xml
--- a/tip_bulk_s3/os/lbs/package_definition.xml	Thu Nov 18 14:33:17 2010 +0000
+++ b/tip_bulk_s3/os/lbs/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
@@ -70,7 +70,7 @@
 <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
 </component>
-<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>