# HG changeset patch
# User andysimpson
# Date 1291217045 0
# Node ID 0240cdcd84461f11555468562c9a59d80cf5e8f2
# Parent  2eb1f7ae37ca2657be9c8f09babc6f3d1f5ba068
revert system_model.xml and sources.csv back to PDK_3.0.4 except for messagingmw model changes for bug 3831

diff -r 2eb1f7ae37ca -r 0240cdcd8446 symbian3/single/sources.csv
--- a/symbian3/single/sources.csv	Mon Nov 29 14:34:06 2010 +0000
+++ b/symbian3/single/sources.csv	Wed Dec 01 15:24:05 2010 +0000
@@ -1,118 +1,117 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adapt/naviengine.nec/,/sf/adapt/naviengine.nec,branch,RCL_3,
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,changeset,e34b5496f1f6,
+http://developer.symbian.org/oss/FCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,changeset,bb31fbe78861,
+http://developer.symbian.org/oss/FCL/sf/adapt/naviengine.nec/,/sf/adapt/naviengine.nec,changeset,677e6dca2906,
 http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,changeset,f4712cc7c69e,
-http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,RCL_3,bug 2449
-http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,bug 2179
-http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/conversations/,/sf/app/conversations,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/dictionary/,/sf/app/dictionary,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/files/,/sf/app/files,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/helps/,/sf/app/helps,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,branch,RCL_3,bug 1972 and bug 2840
-http://developer.symbian.org/oss/FCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/im/,/sf/app/im,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,
-http://developer.symbian.org/oss/FCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,branch,RCL_3,bug 2896 and generatej9zips.py
-http://developer.symbian.org/oss/FCL/sf/app/location/,/sf/app/location,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/messaging/,/sf/app/messaging,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,RCL_3,Bug 3596 and Bug 2832
-http://developer.symbian.org/oss/FCL/sf/app/photos/,/sf/app/photos,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/podcatcher/,/sf/app/podcatcher,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,branch,RCL_3,Bug 1502
-http://developer.symbian.org/oss/FCL/sf/app/profile/,/sf/app/profile,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/radio/,/sf/app/radio,branch,RCL_3,
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,changeset,3d1d11ced885,bug 2449
+http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,changeset,756ad29ed18e,
+http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,changeset,726fba06891a,
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,93a7f5bb8928,bug 2179
+http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,changeset,38bb213f60ba,
+http://developer.symbian.org/oss/FCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,2abf74df9cdc,
+http://developer.symbian.org/oss/FCL/sf/app/conversations/,/sf/app/conversations,changeset,e7f34e614544,
+http://developer.symbian.org/oss/FCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,5d5344402085,
+http://developer.symbian.org/oss/FCL/sf/app/dictionary/,/sf/app/dictionary,changeset,0909ea406f50,
+http://developer.symbian.org/oss/FCL/sf/app/files/,/sf/app/files,changeset,40fb776cbfb3,
+http://developer.symbian.org/oss/FCL/sf/app/graphicsuis/,/sf/app/graphicsuis,changeset,5fd161fa28b6,
+http://developer.symbian.org/oss/FCL/sf/app/helps/,/sf/app/helps,changeset,156dce2f0a3b,
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,changeset,966d119a7e67,bug 1972 and bug 2840
+http://developer.symbian.org/oss/FCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,daa23cd212b0,
+http://developer.symbian.org/oss/FCL/sf/app/im/,/sf/app/im,changeset,90c4e431dda1,
+http://developer.symbian.org/oss/FCL/sf/app/imgeditor/,/sf/app/imgeditor,changeset,7cf23ec47b99,
+http://developer.symbian.org/oss/FCL/sf/app/iptelephony/,/sf/app/iptelephony,changeset,2989b291cac7,
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,changeset,be12440571b9,bug 2896 and generatej9zips.py
+http://developer.symbian.org/oss/FCL/sf/app/location/,/sf/app/location,changeset,5033d469f7c9,
+http://developer.symbian.org/oss/FCL/sf/app/messaging/,/sf/app/messaging,changeset,da6ac9d688df,
+http://developer.symbian.org/oss/FCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,755f0370535b,
+http://developer.symbian.org/oss/FCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,1f1dad4af8f8,
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,changeset,9dfcaf1038dd,
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,changeset,b49b5af297a7,Bug 3596 and Bug 2832
+http://developer.symbian.org/oss/FCL/sf/app/photos/,/sf/app/photos,changeset,01504893d9cb,
+http://developer.symbian.org/oss/FCL/sf/app/podcatcher/,/sf/app/podcatcher,changeset,c11c471936bc,
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,changeset,453a466b0a43,Bug 1502
+http://developer.symbian.org/oss/FCL/sf/app/profile/,/sf/app/profile,changeset,d0e1a4b40897,
+http://developer.symbian.org/oss/FCL/sf/app/radio/,/sf/app/radio,changeset,37cf54fb509f,
 http://developer.symbian.org/oss/FCL/sf/app/rndtools/,/sf/app/rndtools,changeset,d40e813b23c0,
-http://developer.symbian.org/oss/FCL/sf/app/screensaver/,/sf/app/screensaver,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/techview/,/sf/app/techview,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/utils/,/sf/app/utils,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,
-http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/voicerec/,/sf/app/voicerec,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,RCL_3,Bug 2524 Bug 2414 
-http://developer.symbian.org/oss/FCL/sf/mw/btservices/,/sf/mw/btservices,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,RCL_3,Bugs 2846 2584 and 2012
-http://developer.symbian.org/oss/FCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/helix/,/sf/mw/helix,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,RCL_3,error on rom boot
-http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,bug 1414
-http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/svgt/,/sf/mw/svgt,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_3,Bug 26 Bug 1361 and fresh theme
-http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/web/,/sf/mw/web,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/websrv/,/sf/mw/websrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/bt/,/sf/os/bt,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,RCL_3,bug 1398
-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/app/screensaver/,/sf/app/screensaver,changeset,8f536f98e1f8,
+http://developer.symbian.org/oss/FCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,ed95320285d0,
+http://developer.symbian.org/oss/FCL/sf/app/speechsrv/,/sf/app/speechsrv,changeset,01e4abc4f07e,
+http://developer.symbian.org/oss/FCL/sf/app/techview/,/sf/app/techview,changeset,d65097b299bb,
+http://developer.symbian.org/oss/FCL/sf/app/utils/,/sf/app/utils,changeset,9d6a662e71d9,
+http://developer.symbian.org/oss/FCL/sf/app/videoeditor/,/sf/app/videoeditor,changeset,d87d32eab1a9,
+http://developer.symbian.org/oss/FCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,375929f879c2,
+http://developer.symbian.org/oss/FCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,8e703580edd3,
+http://developer.symbian.org/oss/FCL/sf/app/voicerec/,/sf/app/voicerec,changeset,c9b63fff5abf,
+http://developer.symbian.org/oss/FCL/sf/app/webuis/,/sf/app/webuis,changeset,a45dccb283c5,
+http://developer.symbian.org/oss/FCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,9c2aa05919d9,
+http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,8b5c572a3757,
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,20e07ff6040b,Bug 2524 Bug 2414 
+http://developer.symbian.org/oss/FCL/sf/mw/btservices/,/sf/mw/btservices,changeset,4b59561a31c0,
+http://developer.symbian.org/oss/FCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,e3d67ce66f28,
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,changeset,7437a26b11d0,Bugs 2846 2584 and 2012
+http://developer.symbian.org/oss/FCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,e0762c15653a,
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,changeset,c38f396e1cd0,
+http://developer.symbian.org/oss/FCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,940cad2b4a51,
+http://developer.symbian.org/oss/FCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,df6ad9bd4687,
+http://developer.symbian.org/oss/FCL/sf/mw/helix/,/sf/mw/helix,changeset,9376517ef47b,
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,67f2ed48ad91,
+http://developer.symbian.org/oss/FCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,9e8b0cc88842,
+http://developer.symbian.org/oss/FCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,338724211739,
+http://developer.symbian.org/oss/FCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,9eb76adaa71f,error on rom boot
+http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,2c7192069824,
+http://developer.symbian.org/oss/FCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,b0e4b01681c5,
+http://developer.symbian.org/oss/FCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,cf1b3ddbe9a1,
+http://developer.symbian.org/oss/FCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,bafa26c1d234,
+http://developer.symbian.org/oss/FCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,ea98413ce11f,
+http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,changeset,e538444823de,
+http://developer.symbian.org/oss/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,d1d846af7341,
+http://developer.symbian.org/oss/FCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,fa828693a4ae,
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,16db3449d7ba,
+http://developer.symbian.org/oss/FCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,71743823f7d4,
+http://developer.symbian.org/oss/FCL/sf/mw/mmuifw/,/sf/mw/mmuifw,changeset,96b9ec297e56,
+http://developer.symbian.org/oss/FCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,c59bddbfd7b9,
+http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,2735883dd3f6,
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,4bd2599cdfb5,bug 1414
+http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,changeset,4b6ee5efea19,
+http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,142dacf7b30e,
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,3cdbd92ee07b,
+http://developer.symbian.org/oss/FCL/sf/mw/remotestorage/,/sf/mw/remotestorage,changeset,1aa8c82cb4cb,
+http://developer.symbian.org/oss/FCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,79bd6bd83ec3,
+http://developer.symbian.org/oss/FCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,5146369cfdc9,
+http://developer.symbian.org/oss/FCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,1fea62d03c27,
+http://developer.symbian.org/oss/FCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,7a45d2ea2f56,
+http://developer.symbian.org/oss/FCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,changeset,594d15129e2c,
+http://developer.symbian.org/oss/FCL/sf/mw/svgt/,/sf/mw/svgt,changeset,1902ade171ab,
+http://developer.symbian.org/oss/FCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,e1987ab3768a,
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,f24e086457b7,Bug 26 Bug 1361 and fresh theme
+http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,changeset,8db86ce11363,
+http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,changeset,dde4619868dc,
+http://developer.symbian.org/oss/FCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,13a33d82ad98,
+http://developer.symbian.org/oss/FCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,5960d2d03390,
+http://developer.symbian.org/oss/FCL/sf/mw/web/,/sf/mw/web,changeset,be5f8c9adf67,
+http://developer.symbian.org/oss/FCL/sf/mw/websrv/,/sf/mw/websrv,changeset,9db35237e6aa,
+http://developer.symbian.org/oss/FCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,32fadeea4023,
+http://developer.symbian.org/oss/FCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,7151b503b58d,
+http://developer.symbian.org/oss/FCL/sf/os/bt/,/sf/os/bt,changeset,015fa7494bd2,
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,7e5a49312cad,
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,ea777f234bd4,bug 1398
+http://developer.symbian.org/oss/FCL/sf/os/commsfw/,/sf/os/commsfw,changeset,9d66deb8dc6f,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,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 
-http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/mm/,/sf/os/mm,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,RCL_3,Bug 1894 and Bug 3108
-http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,RCL_3,Bug 1301 and Bug 1170
-http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,RCL_3,bug 1543 and bug 1860 
-http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,branch,RCL_3,
-http://developer.symbian.org/oss/FCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,RCL_3,
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,e5cdfbe15c03,Bug 3786
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,f67ec42dc838,
+http://developer.symbian.org/oss/FCL/sf/os/imagingext/,/sf/os/imagingext,changeset,e6e35c6539fa,
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,2024e52ac966, Bug 2149 bug 2283 GCCE and rom_sbs.pl 
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,changeset,a796fdeeb33c,
+http://developer.symbian.org/oss/FCL/sf/os/mm/,/sf/os/mm,changeset,af86cc8a4692,
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,8c9903e4e6b4,Bug 1894 and Bug 3108
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,5b3c983434ca,
+http://developer.symbian.org/oss/FCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,839ea9debada,
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,c3d26e45acc2,Bug 1301 and Bug 1170
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,be92a98663d5,bug 1543 and bug 1860 
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,changeset,b279b6be9e20,
+http://developer.symbian.org/oss/FCL/sf/os/wlan/,/sf/os/wlan,changeset,5cdddd04119b,
+http://developer.symbian.org/oss/FCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,80a0ad972c63,
 http://developer.symbian.org/oss/FCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,3406c99bc375,
 http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,e541da0d3b0d,
-http://developer.symbian.org/oss/FCL/sf/incubator/stemkit,/sf/incubator/stemkit,branch,default,
+http://developer.symbian.org/oss/FCL/sf/incubator/stemkit,/sf/incubator/stemkit,changeset,8ee002ad9af5,
 http://developer.symbian.org/oss/FCL/sftools/depl/sdkcreationmdw/packaging/,/sftools/depl/sdkcreationmdw/packaging,changeset,ba779db5b8c5,layers.sysdef.xml
diff -r 2eb1f7ae37ca -r 0240cdcd8446 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Mon Nov 29 14:34:06 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Wed Dec 01 15:24:05 2010 +0000
@@ -76,7 +76,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" span="2" long-name="Stubs" levels="stub">
+<block name="stubs" level="high" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
 <unit bldFile="adapt/stubs/audiostubs/group"/>
@@ -374,13 +374,6 @@
 </component>
 </collection>
 </block>
-<block name="fshell" level="generic" long-name="FShell" levels="bld mw fw ui">
-<collection name="fshell_all" long-name="FShell Build" level="fw">
-<component name="fshell_s3" long-name="FShell Symbian^3" introduced="^3" purpose="development">
-<unit bldFile="os/fshell/build/sf/3"/>
-</component>
-</collection>
-</block>
 <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
 <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
 <component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
@@ -579,6 +572,7 @@
 <unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
 </component>
 <component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
+
 <unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
 </component>
 <component name="gobject" long-name="GObject API" filter="s60" class="api">
@@ -647,7 +641,7 @@
 <component name="dbus_api" long-name="Dbus API" filter="s60" class="api">
 <unit bldFile="os/ossrv/ossrv_pub/dbus/group"/>
 </component>
-<component name="dbus_glib_api" long-name="D-Bus GLib API" filter="s60" class="api">
+<component name="dbus-glib" long-name="Dbus-glib API" filter="s60" class="api">
 <unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
 </component>
 </collection>
@@ -699,7 +693,7 @@
 <component name="dbus" filter="s60" long-name="D-Bus">
 <unit bldFile="os/ossrv/ofdbus/dbus/group"/>
 </component>
-<component name="dbus_glib" filter="s60" long-name="D-Bus GLib">
+<component name="dbus-glib" filter="s60" long-name="D-Bus GLib">
 <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
@@ -790,7 +784,7 @@
 <component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional">
 <unit bldFile="os/persistentdata/loggingservices/eventlogger/group" mrp="os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
 </component>
-<component name="filelogger" long-name="File Logger" introduced="ER5" deprecated="^3" purpose="optional">
+<component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional">
 <unit bldFile="os/persistentdata/loggingservices/filelogger/group" mrp="os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
 </component>
 <component name="rfilelogger" long-name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
@@ -1291,8 +1285,8 @@
 <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
 </component>
-<component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
+<component name="locationapesuplpsy" long-name="APE SUPL PSY" introduced="^3" purpose="optional" filter="s60" plugin="Y">
+<unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group"/>
 </component>
 </collection>
 <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adapt">
@@ -1342,15 +1336,15 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
-<component name="suplprotocolmodule1" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/HostSettingsApi/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
-<component name="suplprotocolmodule2" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+<component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
-<component name="suplrrlpprotocol3" long-name="SUPL RRLP Protocol Module">
+<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
 </component>
@@ -1855,9 +1849,6 @@
 </collection>
 </block>
 <block name="usb" level="services" long-name="USB" levels="adapt hw-if plugin framework server app-if">
-<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
-<!-- placeholder for platform APIs -->
-</collection>
 <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 </collection>
@@ -1878,13 +1869,13 @@
 <block name="mm" level="services" long-name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
 </component>
 <component name="audio_effects_presets_api" long-name="Audio Effects Presets API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
 </component>
 <component name="drm_audio_player_api" long-name="DRM Audio Player API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/drm_audio_player_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
 </component>
 <component name="multimedia_extension_interfaces_api" long-name="Multimedia Extension Interfaces API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
@@ -1892,7 +1883,7 @@
 </collection>
 <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
 <component name="aac_decoder_config_api" long-name="AAC Decoder Config API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
 </component>
 <component name="aac_decoder_config_msg_hdlr_api" long-name="AAC Decoder Config Msg Hdlr API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
@@ -1919,7 +1910,7 @@
 <unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
 </component>
 <component name="audio_routing_api" long-name="Audio Routing API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
 </component>
 <component name="audio_routing_msg_hdlr_api" long-name="Audio Routing Msg Hdlr API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
@@ -1946,7 +1937,7 @@
 <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
 </component>
 <component name="eaac_plus_decoder_interface_api" long-name="eAAC Plus Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
 </component>
 <component name="eaac_plus_decoder_interface_msg_hdlr_api" long-name="eAAC Plus Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
@@ -1955,7 +1946,7 @@
 <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
 </component>
 <component name="error_concealment_interface_api" long-name="Error Concealment Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
 </component>
 <component name="error_concealment_interface_msg_hdlr_api" long-name="Error Concealment Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
@@ -1967,7 +1958,7 @@
 <unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
 </component>
 <component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
 </component>
 <component name="g711_decoder_interface_msg_hdlr_api" long-name="G711 Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
@@ -1976,7 +1967,7 @@
 <unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
 </component>
 <component name="g711_encoder_interface_api" long-name="G711 Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
 </component>
 <component name="g711_encoder_interface_msg_hdlr_api" long-name="G711 Encoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
@@ -1985,7 +1976,7 @@
 <unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
 </component>
 <component name="g729_decoder_interface_api" long-name="G729 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
 </component>
 <component name="g729_decoder_interface_msg_hdlr_api" long-name="G729 Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
@@ -1994,7 +1985,7 @@
 <unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
 </component>
 <component name="g729_encoder_interface_api" long-name="G729 Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
 </component>
 <component name="g729_encoder_interface_proxy_api" long-name="G729 Encoder Interface Proxy API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
@@ -2003,13 +1994,13 @@
 <unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
 </component>
 <component name="global_audio_settings_api" long-name="Global Audio Settings API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/global_audio_settings_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
 </component>
 <component name="global_audio_settings_definition_api" long-name="Global Audio Settings Definition API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
 </component>
 <component name="ilbc_decoder_interface_api" long-name="Ilbc Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
 </component>
 <component name="ilbc_decoder_interface_msg_hdlr_api" long-name="Ilbc Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
@@ -2018,7 +2009,7 @@
 <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
 </component>
 <component name="ilbc_encoder_interface_api" long-name="Ilbc Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
 </component>
 <component name="ilbc_encoder_interface_msg_hdlr_api" long-name="Ilbc Encoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
@@ -2039,7 +2030,7 @@
 <unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
 </component>
 <component name="ra8_decoder_interface_api" long-name="RA8 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
 </component>
 <component name="ra8_decoder_interface_msg_hdlr_api" long-name="RA8 Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
@@ -2051,7 +2042,7 @@
 <unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
 </component>
 <component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
 </component>
 <component name="restricted_audio_output_msg_hdlr_api" long-name="Restricted Audio Output Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
@@ -2060,7 +2051,7 @@
 <unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
 </component>
 <component name="sbc_encoder_interface_api" long-name="SBC Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
 </component>
 <component name="sbc_encoder_interface_msg_hdlr_api" long-name="SBC Encoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
@@ -2072,7 +2063,7 @@
 <unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
 </component>
 <component name="speech_encoder_config_api" long-name="Speech Encoder Config API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
 </component>
 <component name="speech_encoder_config_msg_hdlr_api" long-name="Speech Encoder Config Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
@@ -2102,7 +2093,7 @@
 <unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
 </component>
 <component name="wma_decoder_interface_api" long-name="WMA Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group" filter="!test"/>
+<unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
 </component>
 <component name="wma_decoder_interface_msg_hdlr_api" long-name="WMA Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
@@ -2261,7 +2252,7 @@
 <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
 <unit bldFile="os/mm/devsound/devsoundrefplugin/group" mrp="os/mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
 </component>
-<component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" deprecated="^4" plugin="Y">
+<component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
 <unit bldFile="os/mm/devsound/sounddevbt/group" mrp="os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
 </component>
 <component name="a3ftrace" long-name="A3F Trace Utility" introduced="^2" purpose="development">
@@ -2317,7 +2308,7 @@
 <component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
 <unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
 </component>
-<component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" introduced="^3" class="api">
+<component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" class="api">
 <unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
 </component>
 </collection>
@@ -2730,7 +2721,7 @@
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
 </component>
-<component name="rombuild_sfrefhw" filter="sf_build" long-name="Foundation Reference Hardware iMaker Config" purpose="development" introduced="^3" class="config">
+<component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
 </component>
 </collection>
@@ -2762,7 +2753,7 @@
 </component>
 </collection>
 </block>
-<block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace analysis">
+<block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
 <collection name="stif" long-name="STIF" level="fw">
 <component name="stif_plat" filter="s60" long-name="STIF Platform Interfaces" purpose="development" class="api">
 <unit bldFile="os/osrndtools/stif/stif_plat/group"/>
@@ -2812,23 +2803,23 @@
 <unit bldFile="os/osrndtools/stif/group"/>
 </component>
 </collection>
-<collection name="memspy" long-name="MemSpy" level="trace">
-<component name="memspy_plat" filter="s60" long-name="MemSpy Platform Interfaces" purpose="development" class="api">
+<collection name="memspy" long-name="Memspy" level="trace">
+<component name="memspy_plat" filter="s60" long-name="Memspy Platform Interfaces" purpose="development" class="api">
 <unit bldFile="os/osrndtools/memspy/memspy_plat/group"/>
 </component>
-<component name="driver" filter="s60" long-name="MemSpy Driver" purpose="development">
+<component name="driver" filter="s60" long-name="Memspy Driver" purpose="development">
 <unit bldFile="os/osrndtools/memspy/driver/group"/>
 </component>
-<component name="memspy_engine" filter="s60" long-name="MemSpy Engine" purpose="development">
+<component name="memspy_engine" filter="s60" long-name="Memspy Engine" purpose="development">
 <unit bldFile="os/osrndtools/memspy/engine/group"/>
 </component>
-<component name="commandline" filter="s60" long-name="MemSpy Command Line" purpose="development">
+<component name="commandline" filter="s60" long-name="Memspy Command Line" purpose="development">
 <unit bldFile="os/osrndtools/memspy/commandline/group"/>
 </component>
-<component name="console" filter="s60" long-name="MemSpy Console" purpose="development">
+<component name="console" filter="s60" long-name="Memspy Console" purpose="development">
 <unit bldFile="os/osrndtools/memspy/console/group"/>
 </component>
-<component name="memspy_build" filter="s60" long-name="MemSpy Build" purpose="development">
+<component name="memspy_build" filter="s60" long-name="Memspy Build" purpose="development">
 <!--  move exports into self-contained component.-->
 <unit bldFile="os/osrndtools/memspy/group"/>
 </component>
@@ -3258,7 +3249,7 @@
 <unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
 </component>
 </collection>
-<collection name="wim" long-name="Wireless Identity Module" level="framework">
+<collection name="wim" long-name="Wireless Identity Module " level="framework">
 <!-- collection is really a component. Need to move down a directory-->
 <component name="wim_build" filter="s60" long-name="WIM Build">
 <unit bldFile="mw/securitysrv/wim/group"/>
@@ -3330,7 +3321,7 @@
 <component name="devencstarter" filter="s60" long-name="Device Encryption Starter" introduced="^3" plugin="Y">
 <unit bldFile="mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
 </component>
-<component name="devencdiskutils_build" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
+<component name="devencdiskutils" filter="s60" long-name="Device Encryption Disk Utils Build" introduced="^3">
 <!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
 <unit bldFile="mw/securitysrv/devencdiskutils/group"/>
 </component>
@@ -3629,7 +3620,7 @@
 <component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
 <unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
 </component>
-<component name="wifi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
+<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
 <unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
 </component>
 <component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
@@ -3690,8 +3681,8 @@
 </component>
 </collection>
 </block>
-<block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server utils api">
-<collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="api">
+<block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
+<collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="utils">
 <component name="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
 <unit bldFile="mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
 </component>
@@ -3729,7 +3720,7 @@
 <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
 </component>
 </collection>
-<collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="api">
+<collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="utils">
 <component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
 <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
 </component>
@@ -3821,7 +3812,8 @@
 <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
 </component>
 <component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
 </component>
 <component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
 <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -3829,16 +3821,15 @@
 <component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
 <unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
 </component>
-<component name="dbcreator_conf" filter="s60" long-name="DB Creator Configuration" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/conf"/>
-</component>
-<component name="dbcreator_rom" filter="s60" long-name="DB Creator ROM" introduced="9.3">
-<unit bldFile="mw/ipconnmgmt/dbcreator/rom"/>
-</component>
-</collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
-<component name="ipcm_config" filter="s60" long-name="IP Connectivity Management Configuration">
-<unit bldFile="mw/ipconnmgmt/data"/>
+<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="mw/ipconnmgmt/dbcreator/group"/>
+</component>
+</collection>
+<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
+<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="mw/ipconnmgmt/group"/>
 </component>
 </collection>
 </block>
@@ -4046,7 +4037,7 @@
 </component>
 </collection>
 <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi_impl" filter="s60" long-name="VPN API">
+<component name="vpnapi" filter="s60" long-name="VPN API">
 <unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
 </component>
 </collection>
@@ -4146,7 +4137,7 @@
 <component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
 <unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group" filter="!oem_build"/>
 </component>
-<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" deprecated="^3" plugin="Y">
+<component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
 <unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
 </component>
 <component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
@@ -4160,8 +4151,9 @@
 <component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
 <unit bldFile="mw/vpnclient/help/group" filter="!oem_build"/>
 </component>
-<component name="vpnclient_exports" filter="s60" long-name="VPN Client Exports">
-<unit bldFile="mw/vpnclient/exports" filter="!oem_build"/>
+<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>
 </collection>
 </block>
@@ -4468,7 +4460,7 @@
 <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
 </component>
 </collection>
-<collection name="msgbranched" long-name="Messaging Branched" level="support">
+<collection name="msgbranched" long-name="Messaging Branched" level="fw">
 <!-- collection is really a component. Need to move down a directory -->
 <component name="msgbranched_build" filter="s60" long-name="Messaging Branched Build">
 <unit bldFile="mw/messagingmw/msgbranched/group"/>
@@ -4599,7 +4591,7 @@
 <component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
 <unit bldFile="mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component name="presence_avabilitytext" long-name="Presence Availability Text" filter="s60" class="api">
+<component name="presence_avabilitytext" long-name="Presence Availbility Text" filter="s60" class="api">
 <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -5044,37 +5036,37 @@
 </block>
 <block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
 <collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
-<component name="upnp_device_api" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+<component name="upnpstack_plat" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
 <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
 </component>
-<component name="upnp_common_api" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+<component name="upnpstack_plat" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
 <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
 </component>
-<component name="upnp_utils_api" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+<component name="upnpstack_plat" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
 <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
 </component>
-<component name="upnp_control_point_api" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+<component name="upnpstack_plat" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
 <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
 </component>
-<component name="upnp_httpserver_api" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+<component name="upnpstack_plat" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
 <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
 </component>
-<component name="upnp_http_transfer_api" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+<component name="upnpstack_plat" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
 <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
 </component>
 </collection>
 <collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
-<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional" filter="s60">
+<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional">
 <unit bldFile="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
 </component>
 </collection>
 <collection name="upnp" long-name="UPnP" level="server">
-<component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional" filter="s60">
+<component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
 <unit bldFile="mw/srvdiscovery/upnp/upnpstack/group"/>
 </component>
 </collection>
 <collection name="srvdiscovery_info" long-name="Service Discovery and Usage Info" level="specific">
-<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" filter="s60" class="config PC">
+<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
 </component>
 </collection>
@@ -5291,19 +5283,19 @@
 <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
 </component>
 <component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
 </component>
 <component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
 </component>
 <component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
 </component>
 <component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" class="api">
 <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
 </component>
 <component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
 </component>
 <component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" class="api">
 <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
@@ -5329,7 +5321,7 @@
 <unit bldFile="mw/btservices/bluetoothengine/btnotif/group"/>
 </component>
 <component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
-<unit bldFile="mw/btservices/bluetoothengine/btaudioman/group" filter="!test"/>
+<unit bldFile="mw/btservices/bluetoothengine/btaudioman/group"/>
 </component>
 <component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
 <unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
@@ -5338,7 +5330,7 @@
 <unit bldFile="mw/btservices/bluetoothengine/btsac/group"/>
 </component>
 <component name="btaudiostreamer" filter="s60" long-name="Bluetooth Audio Streamer">
-<unit bldFile="mw/btservices/bluetoothengine/btaudiostreamer/group" filter="!test"/>
+<unit bldFile="mw/btservices/bluetoothengine/btaudiostreamer/group"/>
 </component>
 <component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
 <unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
@@ -5528,7 +5520,7 @@
 <component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
 <unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
 </component>
-<component name="lib3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
+<component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
 <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
 </component>
 <component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
@@ -5702,111 +5694,112 @@
 </block>
 <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
 <collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="api">
-<component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" deprecated="^3" class="api">
+<component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
 </component>
-<component name="alf_widgetutils_api" long-name="ALF Widget Utils API" filter="s60" deprecated="^3" class="api">
+<component name="alf_widgetutils_api" long-name="ALF Widget Utils API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
 </component>
-<component name="alf_widgetmodel_api" long-name="ALF Widget Model API" filter="s60" deprecated="^3" class="api">
+<component name="alf_widgetmodel_api" long-name="ALF Widget Model API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
 </component>
-<component name="osn_container_api" long-name="OSN Container API" filter="s60" deprecated="^3" class="api">
+<component name="osn_container_api" long-name="OSN Container API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
 </component>
-<component name="osn_global_api" long-name="OSN Global API" filter="s60" deprecated="^3" class="api">
+<component name="osn_global_api" long-name="OSN Global API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
 </component>
-<component name="osn_string_api" long-name="OSN String API" filter="s60" deprecated="^3" class="api">
+<component name="osn_string_api" long-name="OSN String API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
 </component>
-<component name="alf_resourcepool_api" long-name="ALF Resource Pool API" filter="s60" deprecated="^3" class="api">
+<component name="alf_resourcepool_api" long-name="ALF Resource Pool API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
 </component>
-<component name="alf_containerwidget_api" long-name="ALF Container Widget API" filter="s60" deprecated="^3" class="api">
+<component name="alf_containerwidget_api" long-name="ALF Container Widget API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
 </component>
-<component name="alf_viewwidget_api" long-name="ALF View Widget API" filter="s60" deprecated="^3" class="api">
+<component name="alf_viewwidget_api" long-name="ALF View Widget API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
 </component>
-<component name="alf_scrollbarwidget_api" long-name="ALF Scrollbar Widget API" filter="s60" deprecated="^3" class="api">
+<component name="alf_scrollbarwidget_api" long-name="ALF Scrollbar Widget API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
 </component>
-<component name="alf_customlayoutmanagers_api" long-name="ALF Custom Layout Managers API" filter="s60" deprecated="^3" class="api">
+<component name="alf_customlayoutmanagers_api" long-name="ALF Custom Layout Managers API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
 </component>
-<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" deprecated="^3" class="api">
+<component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
 </component>
-<component name="mul_coverflowwidget_api" long-name="MUL Coverflow Widget API" filter="s60" deprecated="^3" class="api">
+<component name="mul_coverflowwidget_api" long-name="MUL Coverflow Widget API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
 </component>
-<component name="mul_datamodel_api" long-name="MUL Data Model API" filter="s60" deprecated="^3" class="api">
+<component name="mul_datamodel_api" long-name="MUL Data Model API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
 </component>
-<component name="mul_sliderwidget_api" long-name="MUL Slider Widget API" filter="s60" deprecated="^3" class="api">
+<component name="mul_sliderwidget_api" long-name="MUL Slider Widget API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
 </component>
-<component name="mul_widget_api" long-name="MUL Widget API" filter="s60" deprecated="^3" class="api">
+<component name="mul_widget_api" long-name="MUL Widget API" filter="s60" class="api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
 </component>
 </collection>
-<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"/>
+<collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
+<component name="mmuifw_build" filter="s60" long-name="Multimedia UI Framework Build">
+<!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
+<unit bldFile="mw/mmuifw/group"/>
 </component>
 </collection>
 <collection name="osncore" long-name="OS Neutral Library Core" level="util">
 <!-- collection is really a component. Move down a directory -->
-<component name="osncore_build" filter="s60" long-name="OSN Core Build" deprecated="^3">
+<component name="osncore_build" filter="s60" long-name="OSN Core Build">
 <unit bldFile="mw/mmuifw/osncore/group"/>
 </component>
 </collection>
 <collection name="alfwidgetutils" long-name="Accelerated LAF Widget Utils" level="ui">
 <!-- collection is really a component. Move down a directory -->
-<component name="alfwidgetutils_build" filter="s60" long-name="ALF Widget Utils" deprecated="^3">
+<component name="alfwidgetutils_build" filter="s60" long-name="ALF Widget Utils">
 <unit bldFile="mw/mmuifw/alfwidgetutils/group"/>
 </component>
 </collection>
 <collection name="resourcepool" long-name="Resource Pool" level="util">
 <!-- collection is really a component. Move down a directory -->
-<component name="alfresourcepool" filter="s60" long-name="ALF Resource Pool" deprecated="^3">
+<component name="alfresourcepool" filter="s60" long-name="ALF Resource Pool">
 <unit bldFile="mw/mmuifw/resourcepool/group"/>
 </component>
 </collection>
 <collection name="widgetmodel" long-name="Widget Model" level="mdl">
 <!-- collection is really a component. Move down a directory -->
-<component name="widgetmodel_build" filter="s60" long-name="Widget Model Build" deprecated="^3">
+<component name="widgetmodel_build" filter="s60" long-name="Widget Model Build">
 <unit bldFile="mw/mmuifw/widgetmodel/group"/>
 </component>
 </collection>
 <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
 <!-- should spell out MUL in the collection name -->
-<component name="mullogging" filter="s60" long-name="MUL Logging" deprecated="^3">
+<component name="mullogging" filter="s60" long-name="MUL Logging">
 <unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
 </component>
-<component name="muldatamodel" filter="s60" long-name="MUL Data Model" deprecated="^3">
+<component name="muldatamodel" filter="s60" long-name="MUL Data Model">
 <unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
 </component>
-<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils" deprecated="^3">
+<component name="mulwidgets_common" filter="s60" long-name="MUL Common Utils">
 <unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
 </component>
-<component name="gesturehelper" filter="s60" long-name="Gesture Helper" deprecated="^3">
+<component name="gesturehelper" filter="s60" long-name="Gesture Helper">
 <unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
 </component>
-<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget" deprecated="^3">
+<component name="mulcoverflowwidget" filter="s60" long-name="MUL CoverFlow Widget">
 <unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
 </component>
-<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget" deprecated="^3">
+<component name="mulsliderwidget" filter="s60" long-name="MUL Slider Widget">
 <unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
 </component>
-<component name="alfviewwidget" filter="s60" long-name="ALF View Widget" deprecated="^3">
+<component name="alfviewwidget" filter="s60" long-name="ALF View Widget">
 <unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
 </component>
-<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget" deprecated="^3">
+<component name="alfcontainerwidget" filter="s60" long-name="ALF Container Widget">
 <unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
 </component>
-<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget" deprecated="^3">
+<component name="alfscrollbarwidget" filter="s60" long-name="ALF Scrollbar Widget">
 <unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
 </component>
 </collection>
@@ -5814,10 +5807,10 @@
 <block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
 <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="if">
 <component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group" filter="!test"/>
+<unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
 </component>
 <component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
-<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group" filter="!test"/>
+<unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
 </component>
 <component name="videoplayer_constants_api" long-name="Videoplayer Constants API" filter="s60" class="api">
 <unit bldFile="mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
@@ -6003,7 +5996,7 @@
 <component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
 <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
 </component>
-<component name="lib3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+<component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
 <unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
 </component>
 <component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
@@ -6065,7 +6058,7 @@
 <component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
 <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
 </component>
-<component name="mmappfw_mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
+<component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
 <unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
 </component>
 <component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
@@ -6099,10 +6092,12 @@
 <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
 </component>
 <component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+<!-- uncomment when configuration is put in place
+	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
 </component>
 <component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+<!-- uncomment when configuration is put in place
+    <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
 </component>
 <component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
 <unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
@@ -6110,6 +6105,10 @@
 <component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
 <unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
 </component>
+<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interface Build" introduced="^1" filter="s60" class="api">
+<!-- needed only for #ifdefs. Remove anmd uncomment above units when configuration is in place -->
+<unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
+</component>
 </collection>
 <collection name="mpx" long-name="Multimedia Player" level="fw">
 <component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
@@ -6124,17 +6123,17 @@
 <component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
 <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
 </component>
-<component name="mpx_conf" filter="s60" long-name="MPX Configuration" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/Conf"/>
-</component>
-<component name="mpx_rom" filter="s60" long-name="MPX ROM" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/rom"/>
-</component>
-<component name="mpx_sis" filter="s60" long-name="MPX SIS" introduced="^1">
-<unit bldFile="mw/mmappfw/mpx/sis"/>
+<component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
+<!--  Move the export to another component or remove the #includes from this one -->
+<unit bldFile="mw/mmappfw/mpx/group"/>
 </component>
 </collection>
 <collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
+<component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+      		Can remove this once configuration is in place-->
+<unit bldFile="mw/mmappfw/mmappcomponents/group"/>
+</component>
 <component name="collectionhelper" filter="s60" long-name="Media Player Collection Helper" introduced="^1">
 <unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
 </component>
@@ -6151,10 +6150,12 @@
 <unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
 </component>
 <component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<unit bldFile="mw/mmappfw/mmappcomponents/audiofetcher/group"/>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
 </component>
 <component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
 </component>
 <component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
 <unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
@@ -6167,6 +6168,10 @@
 </component>
 </collection>
 <collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="if">
+<component name="mmappfw_build" filter="s60" long-name="Multimedia App Framework Build" introduced="^1">
+<!--  Move the export to another component or remove the #includes from this one -->
+<unit bldFile="mw/mmappfw/group"/>
+</component>
 <component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
 </collection>
 </block>
@@ -6213,7 +6218,8 @@
 </collection>
 <collection name="textinput" long-name="Text Input" level="framework">
 <component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
+<!--uncomment when configuration is turned on and textinput_build is removed-->
+<!--  <unit bldFile="textinput/ptienginev2/group"/>-->
 </component>
 <component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
 <unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
@@ -6272,6 +6278,10 @@
 <component name="peninputsplitqwerty" filter="s60" long-name="Pen Input Split QWERTY" introduced="^3" plugin="Y">
 <unit bldFile="mw/inputmethods/textinput/peninputsplitqwerty/group"/>
 </component>
+<component name="textinput_build" filter="s60" long-name="Text Input Build">
+<!--needed for #ifdef, can be removed when configuration is implemented -->
+<unit bldFile="mw/inputmethods/textinput/group"/>
+</component>
 </collection>
 <collection name="fep" long-name="FEP" level="engine">
 <component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
@@ -6554,7 +6564,7 @@
 <component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
 </component>
-<component name="ganes_api" long-name="Ganes API" filter="s60" class="api">
+<component name="ganes_api" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
 </component>
 <component name="ode_api" long-name="Ode API" filter="s60" class="api">
@@ -7411,8 +7421,8 @@
 <component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
 <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
 </component>
-<component name="ncdengine_exports" filter="s60" long-name="NCD Exports" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/exports"/>
+<component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
+<unit bldFile="mw/appinstall/ncdengine/group"/>
 </component>
 </collection>
 <collection name="appinstaller" long-name="Application Installer" level="generic">
@@ -7437,8 +7447,8 @@
 <component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
 <unit bldFile="mw/appinstall/iaupdate/help/group"/>
 </component>
-<component name="iaupdate_rom" filter="s60" long-name="IA Update ROM" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/rom"/>
+<component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
+<unit bldFile="mw/appinstall/iaupdate/group"/>
 </component>
 </collection>
 <collection name="installationservices" long-name="Installation Services" level="generic">
@@ -7642,10 +7652,16 @@
 <component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
 <unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
 </component>
-<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API" filter="s60" class="api">
+<component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
 <unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
 </component>
 </collection>
+<collection name="web_info" long-name="Web Info" level="specific">
+<component name="web_build" filter="s60" long-name="Web Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="mw/web/group"/>
+</component>
+</collection>
 <collection name="browserutilities" long-name="Browser Utilities" level="utils">
 <component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
 <unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
@@ -7675,7 +7691,8 @@
 <unit bldFile="mw/web/browserutilities/feedsengine/group"/>
 </component>
 <component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<unit bldFile="mw/web/browserutilities/multipartparser/group"/>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
 </component>
 <component name="schemehandler" filter="s60" long-name="Scheme Handler">
 <unit bldFile="mw/web/browserutilities/schemehandler/group"/>
@@ -7686,6 +7703,10 @@
 <component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
 <unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
 </component>
+<component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="mw/web/browserutilities/group"/>
+</component>
 </collection>
 <collection name="webengine" long-name="Web Engine" level="server">
 <component name="osswebengine" filter="s60" long-name="OSS Web Engine">
@@ -7759,11 +7780,10 @@
 <component name="roapapp" filter="s60" long-name="ROAP Application">
 <unit bldFile="mw/web/codhandler/roapapp/group"/>
 </component>
-<component name="codhandler_loc" filter="s60" long-name="COD Handler Localisation">
-<unit bldFile="mw/web/codhandler/Loc"/>
-</component>
-<component name="codhandler_rom" filter="s60" long-name="COD Handler ROM">
-<unit bldFile="mw/web/codhandler/rom"/>
+<component name="codhandler_build" filter="s60" long-name="COD Handler Build">
+<!-- Exports need to go into another component or make this self-contained.
+      		#included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="mw/web/codhandler/group"/>
 </component>
 </collection>
 <collection name="widgets" long-name="Web Widget Framework" level="generic">
@@ -7932,10 +7952,10 @@
 </component>
 </collection>
 <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
-<component name="uitools_cdl_api" long-name="CDL API" filter="s60" class="api">
+<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
 <unit bldFile="mw/uitools/uitools_plat/cdl_api/group"/>
 </component>
-<component name="uitools_layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+<component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
 <unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
 </component>
 </collection>
@@ -7980,6 +8000,7 @@
 </component>
 </collection>
 </block>
+<!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
 </layer>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
@@ -8016,11 +8037,9 @@
 <component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
 <unit bldFile="app/location/landmarksui/msgviewer/group"/>
 </component>
-<component name="landmarksui_loc" filter="s60" long-name="Landmarks UI Localisation">
-<unit bldFile="app/location/landmarksui/loc"/>
-</component>
-<component name="landmarksui_rom" filter="s60" long-name="Landmarks UI ROM">
-<unit bldFile="app/location/landmarksui/rom"/>
+<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
+<!-- consider distributing this into the other components or collapsing into a single component -->
+<unit bldFile="app/location/landmarksui/group"/>
 </component>
 </collection>
 <collection name="eventsui" long-name="Location Events UI" level="events">
@@ -8042,17 +8061,9 @@
 <component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
 <unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
 </component>
-<component name="eventsui_conf" filter="s60" long-name="Events UI Configuration">
-<unit bldFile="app/location/eventsui/conf"/>
-</component>
-<component name="eventsui_data" filter="s60" long-name="Events UI Data">
-<unit bldFile="app/location/eventsui/data"/>
-</component>
-<component name="eventsui_loc" filter="s60" long-name="Events UI Localisation">
-<unit bldFile="app/location/eventsui/loc"/>
-</component>
-<component name="eventsui_rom" filter="s60" long-name="Events UI ROM">
-<unit bldFile="app/location/eventsui/rom"/>
+<component name="eventsui_build" filter="s60" long-name="Events UI Build">
+<!-- consider distributing this into the other components or collapsing into a single component -->
+<unit bldFile="app/location/eventsui/group"/>
 </component>
 </collection>
 <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
@@ -8120,8 +8131,8 @@
 <unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
 <unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
 </component>
-<component name="mmsharing_exports" filter="s60" long-name="MM Sharing exports">
-<unit bldFile="app/mmsharinguis/mmsharing/exports"/>
+<component name="mmsharing_build" filter="s60" long-name="MM Sharing Build">
+<unit bldFile="app/mmsharinguis/mmsharing/group"/>
 </component>
 </collection>
 <collection name="mmshplugins" long-name="Multimedia Sharing Plugins" level="plugin">
@@ -8142,14 +8153,15 @@
 </component>
 </collection>
 <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="if">
-<component name="mmsharinguis_rom" filter="s60" long-name="Multimedia Sharing UIs ROM">
-<unit bldFile="app/mmsharinguis/rom"/>
+<component name="mmsharinguis_build" filter="s60" long-name="Multimedia Sharing UIs Build">
+<!--  consider distributing to other components -->
+<unit bldFile="app/mmsharinguis/group"/>
 </component>
 </collection>
 </block>
 <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
 <collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
-<component name="ringing_tone_3d_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
+<component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
 <unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
 </component>
 <component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
@@ -8194,7 +8206,7 @@
 <component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
 <unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
 </component>
-<component name="phone_telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+<component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
 <unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
 </component>
 <component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
@@ -8480,8 +8492,9 @@
 <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_rom" filter="s60" long-name="Default Application Settings ROM" introduced="^1">
-<unit bldFile="app/settingsuis/defaultapplicationsettings/rom/group"/>
+<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>
 </collection>
 <collection name="systemswuis" long-name="System SW UIs" level="ui">
@@ -8525,29 +8538,29 @@
 </block>
 <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
 <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
-<component name="devdiagapp" filter="s60" long-name="Device Diagnostics App" deprecated="^3">
+<component name="devdiagapp" filter="s60" long-name="Device Diagnostics App">
 <unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
 </component>
-<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" deprecated="^3" plugin="Y">
+<component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
 <unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
 </component>
-<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" deprecated="^3" plugin="Y">
+<component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
 <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
 </component>
-<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" deprecated="^3" plugin="Y">
+<component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
 <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
 </component>
-<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build" deprecated="^3">
+<component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
 <!-- can the exports be moved to one of the other components?
 			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
 <unit bldFile="app/devicecontrol/devicediagnostics/group"/>
 </component>
 </collection>
 <collection name="omadm" long-name="OMA Device Management" level="oma">
-<component name="omadmappui" filter="s60" long-name="OMA DM Application UI" deprecated="^3">
+<component name="omadmappui" filter="s60" long-name="OMA DM Application UI">
 <unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
 </component>
-<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" deprecated="^3" plugin="Y">
+<component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" plugin="Y">
 <unit bldFile="app/devicecontrol/omadm/omadmextensions/group"/>
 </component>
 <component name="dcmo" filter="s60" long-name="Device Capabilities Management Object" introduced="^3" plugin="Y">
@@ -8555,7 +8568,7 @@
 </component>
 </collection>
 <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-<component name="pnpms" filter="s60" long-name="PnP MS" deprecated="^3">
+<component name="pnpms" filter="s60" long-name="PnP MS">
 <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
 </component>
 </collection>
@@ -8579,11 +8592,9 @@
 <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_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 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>
 </collection>
 <collection name="customization" long-name="DM Customization Adapters" level="mid">
@@ -8611,8 +8622,9 @@
 <component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
 <unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
 </component>
-<component name="customization_config" filter="s60" long-name="DM Customization Configuration">
-<unit bldFile="app/devicecontrol/customization/conf/group"/>
+<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>
 </collection>
 <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
@@ -8622,7 +8634,7 @@
 </collection>
 </block>
 <block name="printing" level="services" long-name="Printing" levels="app">
-<collection name="directprint" long-name="DirectPrint" level="app">
+<collection name="DirectPrint" level="app">
 <component name="DirectPrintApp" filter="sf_build" long-name="DirectPrint App" introduced="^3">
 <unit bldFile="app/printing/DirectPrint/DirectPrintApp/group"/>
 </component>
@@ -8672,11 +8684,8 @@
 <component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
 <unit bldFile="app/files/deviceencryption/help/group"/>
 </component>
-<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 name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
+<unit bldFile="app/files/deviceencryption/group"/>
 </component>
 </collection>
 <collection name="filemanager" long-name="File Manager" level="apps">
@@ -8730,10 +8739,10 @@
 </collection>
 <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
 <component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
 </component>
 <component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
 </component>
 <component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
 <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
@@ -8742,28 +8751,28 @@
 <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
 </component>
 <component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
 </component>
 <component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
 </component>
 <component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
 <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
 </component>
 <component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
 </component>
 <component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
 </component>
 <component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
 <unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
 </component>
 <component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
 </component>
 <component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
 </component>
 <component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
 <unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
@@ -8850,16 +8859,16 @@
 <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
 </component>
 <component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
 </component>
 <component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
 </component>
 <component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
 </component>
 <component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
 </component>
 <component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
 <unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
@@ -8868,7 +8877,7 @@
 <unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
 </component>
 <component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
-<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group" filter="!test"/>
+<unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
 </component>
 </collection>
 <collection name="contactextensions" long-name="Contacts Extensions" level="services">
@@ -9141,11 +9150,9 @@
 <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
 <unit bldFile="app/organizer/calendarui/caldav/group"/>
 </component>
-<component name="calendarui_exports" filter="s60" long-name="Calendar UI Exports">
-<unit bldFile="app/organizer/calendarui/exports"/>
-</component>
-<component name="calendarui_organizerplugin" filter="s60" long-name="Calendar UI Organizer Plugin">
-<unit bldFile="app/organizer/calendarui/organizerplugin/group"/>
+<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
+<!-- split contents into separate components -->
+<unit bldFile="app/organizer/calendarui/group"/>
 </component>
 </collection>
 <collection name="meetingui" long-name="Meeting UI" level="ui">
@@ -9176,8 +9183,9 @@
 <component name="clock2_help" filter="s60" long-name="Clock Help">
 <unit bldFile="app/organizer/clock2/help/group"/>
 </component>
-<component name="clock2_exports" filter="s60" long-name="Clock Exports">
-<unit bldFile="app/organizer/clock2/exports"/>
+<component name="clock2_build" filter="s60" long-name="Clock Build">
+<!-- split contents into separate components, or just make this one component -->
+<unit bldFile="app/organizer/clock2/group"/>
 </component>
 </collection>
 <collection name="notepad" long-name="Notepad" level="ui">
@@ -9517,11 +9525,9 @@
 <component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
 <unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
 </component>
-<component name="ipsservices_conf" filter="s60" long-name="IPS Services Configuration" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/conf"/>
-</component>
-<component name="ipsservices_rom" filter="s60" long-name="IPS Services ROM" introduced="^2">
-<unit bldFile="app/commonemail/ipsservices/rom"/>
+<component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
+<unit bldFile="app/commonemail/ipsservices/group"/>
+<!-- can the exports be broken up into the other components or made a config component?-->
 </component>
 </collection>
 <collection name="emailcontacts" long-name="Email Contacts" level="support">
@@ -9581,29 +9587,10 @@
 <component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
 <unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
-<component name="meetingrequest_config" filter="s60" long-name="MR Configuration" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/conf"/>
-</component>
-<component name="meetingrequest_rom" filter="s60" long-name="MR ROM" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/rom"/>
-</component>
-<component name="mrbcplugin" filter="s60" long-name="MR BC Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrbcplugin/group"/>
-</component>
-<component name="mrcalremoteattachment" filter="s60" long-name="MR Calendar Remote Attachment" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcalremoteattachment/group"/>
-</component>
-<component name="mrcmailremoteattachmentplugin" filter="s60" long-name="MR Cmail Remote Attachment Plugin" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrcmailremoteattachmentplugin/group"/>
-</component>
-<component name="mrguicommon" filter="s60" long-name="MR GUI COmmon" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrguicommon/group"/>
-</component>
-<component name="mrmbutilsextension" filter="s60" long-name="MR MB Utilities Extension" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrmbutilsextension/group"/>
-</component>
-<component name="mrprocessor" filter="s60" long-name="MR Processor" introduced="^2">
-<unit bldFile="app/commonemail/meetingrequest/mrprocessor/group"/>
+<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="app/commonemail/meetingrequest/group"/>
 </component>
 </collection>
 <collection name="emailuis" long-name="Email UIs" level="app">
@@ -9617,7 +9604,11 @@
 <unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
 </component>
 <component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
-<unit bldFile="app/commonemail/emailuis/widget/group"/>
+<!-- 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="app/commonemail/emailuis/group"/>
 </component>
 </collection>
 <collection name="commonemail_info" long-name="Email Apps Info" level="app">
@@ -9668,8 +9659,9 @@
 <component name="imconversationview" filter="s60" long-name="IM Conversation View">
 <unit bldFile="app/conversations/imstutils/imconversationview/group"/>
 </component>
-<component name="imstutils_loc" filter="s60" long-name="IM Service Tab Utils Localisation" class="config">
-<unit bldFile="app/conversations/imstutils/loc"/>
+<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="app/conversations/imstutils/group"/>
 </component>
 </collection>
 <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
@@ -9692,8 +9684,9 @@
 <component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
 <unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
 </component>
-<component name="uiservicetab_exports" filter="s60" long-name="UI Service Tab Exports">
-<unit bldFile="app/conversations/uiservicetab/exports"/>
+<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
+<!-- can this be distributed into the above bld.infs? -->
+<unit bldFile="app/conversations/uiservicetab/group"/>
 </component>
 </collection>
 <collection name="servicewidget" long-name="Service Widget" level="ui">
@@ -9704,8 +9697,9 @@
 <!-- does this really need to have that number in the directory name? -->
 <unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
 </component>
-<component name="servicewidget_rom" filter="s60" long-name="Service Widget ROM">
-<unit bldFile="app/conversations/servicewidget/rom"/>
+<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="app/conversations/servicewidget/group"/>
 </component>
 </collection>
 <collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
@@ -9722,7 +9716,8 @@
 </collection>
 <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
 <component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<unit bldFile="app/conversations/exports"/>
+<!-- can the exports be moved to other components? or this remade into a configuration component?-->
+<unit bldFile="app/conversations/group"/>
 </component>
 </collection>
 </block>
@@ -9755,10 +9750,10 @@
 <block name="camera" level="apps" long-name="Camera Apps">
 <collection name="camera_plat" long-name="Camera Apps Platform Interfaces">
 <component name="camcorder_ui_constants_api" long-name="Camcorder UI Constants API" filter="s60" class="api">
-<unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group" filter="!test"/>
+<unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group"/>
 </component>
 <component name="active_palette_2_api" long-name="Active Palette 2 API" filter="s60" class="api">
-<unit bldFile="app/camera/camera_plat/active_palette_2_api/group" filter="!test"/>
+<unit bldFile="app/camera/camera_plat/active_palette_2_api/group"/>
 </component>
 </collection>
 <collection name="camerauis" long-name="Camera UIs">
@@ -9832,8 +9827,9 @@
 <component name="editorprovider" filter="s60" long-name="Image Editor Provider">
 <unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
 </component>
-<component name="imageeditor_exports" filter="s60" long-name="Image Editor Exports">
-<unit bldFile="app/imgeditor/imageeditor/exports"/>
+<component name="imageeditor_build" filter="s60" long-name="Image Editor Build">
+<!-- should distribute this to the other components -->
+<unit bldFile="app/imgeditor/imageeditor/group"/>
 </component>
 </collection>
 <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
@@ -9872,6 +9868,10 @@
 <component name="enginewrapper" filter="s60" long-name="Image Editor Engine Wrapper">
 <unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
 </component>
+<component name="imageeditorengine_build" filter="s60" long-name="Image Editor Engine Build">
+<!-- should distribute this to the other components -->
+<unit bldFile="app/imgeditor/imageeditorengine/group"/>
+</component>
 </collection>
 </block>
 <!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
@@ -10065,8 +10065,9 @@
 <component name="imgvwr" filter="s60" long-name="Photos Image Viewer" introduced="^3">
 <unit bldFile="app/photos/photosgallery/imgvwr/group"/>
 </component>
-<component name="photosgallery_exports" filter="s60" long-name="Photos Gallery Exports" introduced="^2">
-<unit bldFile="app/photos/photosgallery/exports"/>
+<component name="photosgallery_build" filter="s60" long-name="Photos Gallery Build" introduced="^2">
+<!--  need to remove the #included above bld.infs from this  -->
+<unit bldFile="app/photos/photosgallery/group"/>
 </component>
 </collection>
 </block>
@@ -10116,8 +10117,9 @@
 <component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
 <unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
 </component>
-<component name="mpxmusicplayer_exports" filter="s60" long-name="MPX Music Player Exports">
-<unit bldFile="app/musicplayer/mpxmusicplayer/exports"/>
+<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
+<!--  can the exports be distributed to the above components?  -->
+<unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
 </component>
 </collection>
 <collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
@@ -10149,11 +10151,17 @@
 <component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
 <unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
 </component>
-<component name="mpxplugins_exports" filter="s60" long-name="MPX Plugins Exports">
-<unit bldFile="app/musicplayer/mpxplugins/exports"/>
-</component>
-</collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app"/>
+<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
+<!--  can the exports be distributed to the above components?  -->
+<unit bldFile="app/musicplayer/mpxplugins/group"/>
+</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="app/musicplayer/group"/>
+</component>
+</collection>
 </block>
 <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
 <collection name="fmradio" long-name="FM Radio" level="ui">
@@ -10175,11 +10183,9 @@
 <component name="fmradio_help" filter="s60" long-name="FM Radio Help">
 <unit bldFile="app/radio/fmradio/help/group"/>
 </component>
-<component name="fmradio_conf" filter="s60" long-name="FM Radio Configuration">
-<unit bldFile="app/radio/fmradio/conf"/>
-</component>
-<component name="fmradio_loc" filter="s60" long-name="FM Radio Localisation">
-<unit bldFile="app/radio/fmradio/loc"/>
+<component name="fmradio_build" filter="s60" long-name="FM Radio ROM">
+<!--  remove above #included bld.infs -->
+<unit bldFile="app/radio/fmradio/group"/>
 </component>
 </collection>
 </block>
@@ -10188,8 +10194,6 @@
 <component name="podcatcher_build" filter="sf_build" long-name="Podcatcher Build" introduced="^3">
 <unit bldFile="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>
 <block name="voicerec" level="apps" long-name="Voice Recorder Apps">
@@ -10276,8 +10280,9 @@
 <component name="idlehomescreen_data" filter="s60" long-name="Idle Home Screen Data">
 <unit bldFile="app/homescreen/idlehomescreen/data/group"/>
 </component>
-<component name="idlehomescreen_loc" filter="s60" long-name="Idle Home Screen Localisation">
-<unit bldFile="app/homescreen/idlehomescreen/loc/group"/>
+<component name="idlehomescreen_build" filter="s60" long-name="Idle Home Screen Build">
+<!-- can the loc file be moved to another comopnent and this one removed? -->
+<unit bldFile="app/homescreen/idlehomescreen/group"/>
 </component>
 </collection>
 <collection name="menufw" long-name="Menu Framework" level="fw">
@@ -10290,9 +10295,13 @@
 <component name="menusuites" filter="s60" long-name="Menu Suites">
 <unit bldFile="app/homescreen/menufw/menusuites/group"/>
 </component>
+<component name="menufw_build" filter="s60" long-name="Menu Framework Build">
+<!-- can the exports be exported by the other components? -->
+<unit bldFile="app/homescreen/menufw/group"/>
+</component>
 </collection>
 <collection name="taskswitcher" long-name="Task Switcher" level="support">
-<component name="hs_contextengine" filter="s60" long-name="Context Engine" introduced="^3">
+<component name="contextengine" filter="s60" long-name="Context Engine" introduced="^3">
 <unit bldFile="app/homescreen/taskswitcher/contextengine/group"/>
 </component>
 <component name="taskswitcherui" filter="s60" long-name="Task Switcher UI" introduced="^3">
@@ -10433,10 +10442,12 @@
 <unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
 </component>
 <component name="vccontrolpanelplugin" filter="s60" long-name="Voice Commands Control Panel Plugin" introduced="^1" plugin="Y">
-<unit bldFile="app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
+<!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
+<!--<unit bldFile="voiceui/vccontrolpanelplugin/group"/>-->
 </component>
 <component name="voiceui_build" filter="s60" long-name="Voice UI Build" introduced="^1">
-<unit bldFile="app/speechsrv/voiceui/build"/>
+<!--  can this be put into the other components? -->
+<unit bldFile="app/speechsrv/voiceui/group"/>
 </component>
 </collection>
 <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
@@ -10546,14 +10557,20 @@
 </collection>
 <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
 <component name="browsersysteminfoplugin" filter="s60" long-name="Browser System Info Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browsersysteminfoplugin/group"/>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+<!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
 </component>
 <component name="browsergpsplugin" filter="s60" long-name="Browser GPS Plugin" plugin="Y">
-<unit bldFile="app/webuis/browserplugins/browsergpsplugin/group"/>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+<!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
 </component>
 <component name="browseraudiovideoplugin" filter="s60" long-name="Browser Audio Video Plugin" plugin="Y">
 <unit bldFile="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="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">
@@ -10713,7 +10730,7 @@
 </collection>
 <collection name="techviewplat" long-name="Techview Platform" level="services"/>
 <collection name="techviewui" long-name="Techview UI" level="ui"/>
-<collection name="tv_controlpanel" long-name="Control Panel" level="ui"/>
+<collection name="controlpanel" long-name="Control Panel" level="ui"/>
 <collection name="pimapps" long-name="PIM Apps" level="apps3"/>
 <collection name="securityapps" long-name="Security Apps" level="apps3"/>
 <collection name="utilityapps" long-name="Utility Apps" level="apps2"/>