--- a/symbian3/single/sources.csv	Sun Nov 07 22:30:48 2010 +0000
+++ b/symbian3/single/sources.csv	Fri Nov 12 17:35:16 2010 +0000
@@ -98,7 +98,7 @@
 http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,branch,RCL_3,emulator.cfg for winsock
 http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,ec8b76ee69ef,
 http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,RCL_3,Bug 3786
-http://developer.symbian.org/oss/FCL/sf/os/fshell/,/sf/os/fshell,branch,RCL_3,
+http://developer.symbian.org/oss/FCL/sf/os/fshell/,/sf/os/fshell,branch,default,
 http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,
 http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,branch,RCL_3,
 http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3, Bug 2149 bug 2283 GCCE and rom_sbs.pl 

--- a/symbian3/single/sysdefs/auto/system_model.xml	Sun Nov 07 22:30:48 2010 +0000
+++ b/symbian3/single/sysdefs/auto/system_model.xml	Fri Nov 12 17:35:16 2010 +0000
@@ -4150,9 +4150,8 @@
 <component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
 <unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
 </component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
+<component name="vpnclient_exports" filter="s60" long-name="VPN Client Exports">
+<unit bldFile="mw/vpnclient/exports" filter="!oem_build"/>
 </component>
 </collection>
 </block>
@@ -4482,9 +4481,6 @@
 <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
 <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
 </component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
 <component name="watcherfw" long-name="Watcher Framework" purpose="optional">
 <unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
 </component>
@@ -5710,10 +5706,9 @@
 <unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
 </component>
 </collection>
-<collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
-<component name="mmuifw_build" filter="s60" long-name="Multimedia UI Framework Build" deprecated="^3">
-<!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
-<unit bldFile="mw/mmuifw/group"/>
+<collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="util">
+<component name="mmuifw_rom" filter="s60" long-name="Multimedia UI Framework ROM" deprecated="^3">
+<unit bldFile="mw/mmuifw/rom/group"/>
 </component>
 </collection>
 <collection name="osncore" long-name="OS Neutral Library Core" level="util">
@@ -8457,9 +8452,8 @@
 <component name="dasgsplugin" filter="s60" long-name="Default Application Settings GS Plugin" introduced="^1" plugin="Y">
 <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
 </component>
-<component name="defaultapplicationsettings_build" filter="s60" long-name="Default Application Settings Build" introduced="^1">
-<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
-<unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
+<component name="defaultapplicationsettings_rom" filter="s60" long-name="Default Application Settings ROM" introduced="^1">
+<unit bldFile="app/settingsuis/defaultapplicationsettings/rom/group"/>
 </component>
 </collection>
 <collection name="systemswuis" long-name="System SW UIs" level="ui">
@@ -8557,9 +8551,11 @@
 <component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
 <unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
 </component>
-<component name="applicationmanagement_build" filter="s60" long-name="AM Build">
-<!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed AM ROM? -->
-<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
+<component name="applicationmanagement_config" filter="s60" long-name="AM Configuration">
+<unit bldFile="app/devicecontrol/applicationmanagement/conf/group"/>
+</component>
+<component name="applicationmanagement_rom" filter="s60" long-name="AM ROM">
+<unit bldFile="app/devicecontrol/applicationmanagement/rom/group"/>
 </component>
 </collection>
 <collection name="customization" long-name="DM Customization Adapters" level="mid">
@@ -8587,9 +8583,8 @@
 <component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
 <unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
 </component>
-<component name="customization_build" filter="s60" long-name="DM Customization Build">
-<!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed DM Customization ROM? -->
-<unit bldFile="app/devicecontrol/customization/group"/>
+<component name="customization_config" filter="s60" long-name="DM Customization Configuration">
+<unit bldFile="app/devicecontrol/customization/conf/group"/>
 </component>
 </collection>
 <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
@@ -8649,8 +8644,11 @@
 <component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
 <unit bldFile="app/files/deviceencryption/help/group"/>
 </component>
-<component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
-<unit bldFile="app/files/deviceencryption/group"/>
+<component name="deviceencryption_headers" filter="s60" long-name="Device Encryption Headers" introduced="^3">
+<unit bldFile="app/files/deviceencryption/common/group"/>
+</component>
+<component name="deviceencryption_rom" filter="s60" long-name="Device Encryption ROM" introduced="^3">
+<unit bldFile="app/files/deviceencryption/rom/group"/>
 </component>
 </collection>
 <collection name="filemanager" long-name="File Manager" level="apps">

--- a/symbian3/single/sysdefs/system_model.xml	Sun Nov 07 22:30:48 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Fri Nov 12 17:35:16 2010 +0000
@@ -4492,9 +4492,6 @@
 <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional">
 <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
 </component>
-<component name="msgconf" long-name="Messaging Config" introduced="^2" purpose="optional" class="config">
-<unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-</component>
 <component name="watcherfw" long-name="Watcher Framework" purpose="optional">
 <unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
 </component>