--- a/symbian4/single/sysdefs/system_model.xml	Tue Jun 29 11:29:17 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Sat Jun 26 10:29:40 2010 +0100
@@ -1,79 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition schema="2.0.1" name="Symbian^4">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
@@ -283,12 +282,9 @@
 <component name="euser" long-name="User Library" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
 </component>
-<component name="compsupp" long-name="RVCT Compiler Runtime Support" filter="gt" purpose="mandatory">
+<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
 </component>
-<component name="compsupp_gcc" long-name="GCC Compiler Runtime Support" filter="gt,sf_build" purpose="mandatory">
-<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp/gcce"/>
-</component>
 <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
 </component>
@@ -340,6 +336,9 @@
 <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
 </component>
+<component name="kernelhwsrv_docpub" long-name="Kernel and Hardware Services Public Documentation" introduced="^3" purpose="development" class="doc">
+<unit mrp="os/kernelhwsrv/kernelhwsrv_info/doc_pub/kernelhwsrv_doc_pub.mrp"/>
+</component>
 </collection>
 </block>
 <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
@@ -559,7 +558,7 @@
 <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="os/ossrv/ofdbus/group"/>
 </component>
@@ -980,9 +979,7 @@
 <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
 </component>
 <component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
-      		may need to  -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+<unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/>
 </component>
 <component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
 <unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
@@ -993,9 +990,8 @@
 <component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
 <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
-         	This needs to be kept around until configuration is in place -->
+<component name="resourcemgmt_data" filter="s60" long-name="Resource Management Data" class="config">
+<!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
 <unit bldFile="os/devicesrv/resourcemgmt/group"/>
 </component>
 <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
@@ -1977,7 +1973,7 @@
 <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2160,7 +2156,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="^4" class="api">
+<component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" introduced="^3" class="api">
 <unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
 </component>
 </collection>
@@ -2309,7 +2305,8 @@
 <component name="gdi" long-name="GDI" purpose="mandatory">
 <unit bldFile="os/graphics/graphicsdeviceinterface/gdi/group" mrp="os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
 </component>
-<component name="bitgdi" long-name="BitGDI" purpose="mandatory">
+<component name="bitgdi" long-name="BitGDI" purpose="mandatory" filter="api_test">
+<!-- just api_test, not test -->
 <unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
 </component>
 <component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional">
@@ -2337,9 +2334,6 @@
 </block>
 <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
 <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
 <component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
 <unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
 </component>
@@ -2347,11 +2341,6 @@
 <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
 </component>
 </collection>
-<collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
 <collection name="charconvfw" long-name="Character Conversion" level="encoding">
 <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
 <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
@@ -2390,19 +2379,16 @@
 </collection>
 <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
 <component name="numbergrouping" long-name="Number Grouping">
-<unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
+<unit bldFile="os/textandloc/textandlocutils/numbergrouping/group" mrp="os/textandloc/textandlocutils/numbergrouping/group/tls_numbergrouping.mrp"/>
 </component>
 <component name="jplangutil" long-name="Japanese Language Utilities">
-<unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
+<unit bldFile="os/textandloc/textandlocutils/jplangutil/group" mrp="os/textandloc/textandlocutils/jplangutil/group/tls_jplangutil.mrp"/>
 </component>
 <component name="sortutil" long-name="Sorting Utility">
-<unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
+<unit bldFile="os/textandloc/textandlocutils/sortutil/group" mrp="os/textandloc/textandlocutils/sortutil/group/tls_sortutil.mrp"/>
 </component>
 <component name="inlinetext" long-name="Inline Text">
-<unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component name="nearestlangutil" long-name="Nearest Language Util" introduced="^2" purpose="mandatory" class="placeholder">
-<!-- placeholder for split from bafl -->
+<unit bldFile="os/textandloc/textandlocutils/inlinetext/group" mrp="os/textandloc/textandlocutils/inlinetext/group/tls_inlinetext.mrp"/>
 </component>
 <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional">
 <unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
@@ -2433,8 +2419,8 @@
 <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
 <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
 <component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -2495,13 +2481,13 @@
 <collection name="s60extras" long-name="S60 Extras" level="mid">
 <!-- collection is really a component. Need to move down a directory -->
 <component name="s60extras_build" filter="s60" long-name="S60 Extras Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
+<unit bldFile="os/deviceplatformrelease/s60extras/group"/>
 </component>
 </collection>
 <collection name="version" long-name="Version" level="top">
 <!-- collection is really a component. Need to move down a directory -->
 <component name="version_build" filter="s60" long-name="Version Build" purpose="development" class="config">
-<unit bldFile="os/deviceplatformrelease/Version/group"/>
+<unit bldFile="os/deviceplatformrelease/version/group"/>
 </component>
 </collection>
 <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
@@ -2516,7 +2502,7 @@
 <component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
 <unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
 </component>
-<component name="sf_config" long-name="Foundation Config" introduced="^4">
+<component name="sf_config" filter="s60" long-name="Foundation Config" introduced="^4">
 <unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
 </component>
 <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
@@ -2524,16 +2510,11 @@
 <!-- will should give the id/path something more unique than cenrep -->
 <unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
 </component>
-<!-- comment out until rom configs are added -->
-<!-- component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
+<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
 </component>
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
-</component -->
-<component name="sbs" filter="sf_build" long-name="Foundation SBS config" purpose="development" class="config">
-<!-- will should give the id/path something more unique than sbs -->
-<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/sbs/group"/>
 </component>
 </collection>
 <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
@@ -2542,7 +2523,7 @@
 </component>
 </collection>
 </block>
-<block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
+<block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace analysis">
 <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"/>
@@ -2584,31 +2565,36 @@
 <unit bldFile="os/osrndtools/stif/suevent/group"/>
 </component>
 <component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!--  move exports into self-contained component. Remove this when configuration is in place-->
+<unit bldFile="os/osrndtools/stif/stifkerneltestclassbase/group"/>
+</component>
+<component name="stif_data" filter="s60" long-name="STIF Data" purpose="development" class="config">
+<!--  This is a component. Should move down a directory. or move into other STIF components-->
 <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="memspyserver" filter="s60" long-name="MemSpy Server" purpose="development" introduced="^4">
+<unit bldFile="os/osrndtools/memspy/MemSpyServer/group"/>
+</component>
+<component name="memspyclient" filter="s60" long-name="MemSpy Client" purpose="development" introduced="^4">
+<unit bldFile="os/osrndtools/memspy/MemSpyClient/group"/>
+</component>
+<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>
@@ -2652,6 +2638,16 @@
 <unit bldFile="os/osrndtools/hti/group"/>
 </component>
 </collection>
+<collection name="piprofiler" long-name="Performance Investigator Profiler" level="analysis">
+<component name="piprofiler_build" long-name="Performance Investigator Profiler Build" introduced="^4">
+<unit bldFile="os/osrndtools/piprofiler/group"/>
+</component>
+</collection>
+<collection name="analyzetool" long-name="Analyze Tool" level="analysis">
+<component name="analyzetool_build" long-name="Analyze Tool Build" introduced="^4">
+<unit bldFile="os/osrndtools/analyzetool/group"/>
+</component>
+</collection>
 <collection name="osrndtools_info" long-name="OS R&amp;D tools Info" level="trace">
 <component name="osrndtools_metadata" long-name="OS R&amp;D tools Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
@@ -2768,16 +2764,11 @@
 </component>
 </collection>
 <collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
-		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
+<unit bldFile="mw/appsupport/contextframework/cfw/group"/>
 </component>
 <component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="mw/appsupport/contextframework/group"/>
+<unit bldFile="mw/appsupport/contextframework/cfwplugins/group"/>
 </component>
 </collection>
 <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
@@ -3021,18 +3012,12 @@
 <component name="pkcs12" filter="s60" long-name="PKCS #12">
 <unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
 </component>
-<component name="certmanui" filter="s60" long-name="Certificate Management UI">
-<unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
 <component name="ctsecuritydialogs" filter="s60" long-name="Crypto Token Security Dialogs">
 <unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
 </component>
 <component name="certsaver" filter="s60" long-name="Certificate Saver">
 <unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
 </component>
-<component name="secmodui" filter="s60" long-name="Security Module UI">
-<unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
 <component name="devicetoken" filter="s60" long-name="Device Token">
 <unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
 </component>
@@ -3072,7 +3057,8 @@
 <component name="securitynotifier" filter="s60" long-name="Security Notifier">
 <unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
 </component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^4">
+<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
+<!-- This overwrites the bld.inf already in this dir. I'm pretty sure this will cause problems with the export -->
 <unit bldFile="mw/securitysrv/securitydialogs/lockclient/group" proFile="lockclient.pro" qmakeArgs="-r"/>
 </component>
 <component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
@@ -3081,6 +3067,29 @@
 <component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
 <unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
 </component>
+<component name="indicatorautolockplugin" long-name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
+<!-- directory at the wrong level to be a component-->
+<unit bldFile="mw/securitysrv/securitydialogs/AutolockSrv/indicatorplugin" proFile="indicatorautolockplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60">
+<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
+<unit bldFile="mw/securitysrv/securitydialogs/AutolockSrv" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
+</component>
+<component name="autolocksrv" long-name="Auto Lock Server" introduced="^4" filter="s60">
+<!-- directory at the wrong level to be a component-->
+<unit bldFile="mw/securitysrv/securitydialogs/AutolockSrv" proFile="AutolockSrv.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="cpsecplugins" long-name="Security Settings Plugins" level="plugin">
+<component name="devicelockplugin" long-name="Device Lock Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/devicelockplugin" proFile="devicelockplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="simpincodeplugin" long-name="SIM PIN Code Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/simpincodeplugin" proFile="pincodeplugin.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpadvancedsecplugin" long-name="Advanced Security Plugin" introduced="^4" filter="s60">
+<unit bldFile="mw/securitysrv/cpsecplugins/cpadvancedsecplugin/group" proFile="advancedsecplugin.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
 <!-- collection is really a component. Need to move down a directory-->
@@ -3194,9 +3203,6 @@
 <component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
 <!-- this should have its own bld.inf or be removed as a component -->
 </component>
-<component name="drmsettingsplugin" filter="s60" long-name="DRM Settings Plugin" plugin="Y" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
 <component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
 <unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
 </component>
@@ -3253,6 +3259,12 @@
 <component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
 </component>
+<component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" class="api placeholder">
+<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+	 -->
+</component>
 <component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
 </component>
@@ -3308,6 +3320,9 @@
 <component name="locationsysui" filter="s60" long-name="Location System UI">
 <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
 </component>
+<component name="locationsysui" filter="s60" long-name="Location System Qt UI">
+<unit bldFile="mw/locationsrv/locationsystemui/locationsysui" proFile="locsysui.pro"/>
+</component>
 </collection>
 <collection name="supl" long-name="SUPL" level="fw">
 <component name="locationsuplfw" filter="s60" long-name="Location SUPL Framework">
@@ -3366,9 +3381,12 @@
 <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
 </component>
 </collection>
-<collection name="securitysettings" long-name="Security Settings" level="generic">
-<component name="securitysettings_build" long-name="Security Settings Build" introduced="^4">
-<unit bldFile="mw/accesssec/securitysettings" qmakeArgs="-r" proFile="securitysettings.pro"/>
+<collection name="securitysettings" long-name="WLAN Security Settings" level="specific">
+<component name="accesssec_qtconfigutils" filter="s60" long-name="Access Security Config Utils" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="eapol" long-name="EAPOL" level="framework">
@@ -3442,11 +3460,6 @@
 <unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
 </component>
 </collection>
-<collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-<component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
-<unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
 <collection name="alwayson_net_plugin" long-name="Always Online Net Plugin" level="server">
 <component name="pdpcontextmanager2" filter="s60" long-name="PDP Context Manager 2">
 <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
@@ -3499,8 +3512,7 @@
 <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">
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+<unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
 </component>
 <component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
 <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -3515,7 +3527,7 @@
 </collection>
 <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
 <component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
-<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
+<!-- need to move exports to another component, or make this a config component and revmove the #includes -->
 <unit bldFile="mw/ipconnmgmt/group"/>
 </component>
 <component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
@@ -3637,8 +3649,8 @@
 <component name="sippwlanplugin" filter="s60" long-name="SIP WLAN Plugin" plugin="Y">
 <unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
 </component>
-<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y">
-<unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+<component name="sippsipsettingsui" filter="s60" long-name="SIP Settings UI" plugin="Y" class="placeholder">
+<!--<unit bldFile="sipplugins/sippsipsettingsui/group"/> -->
 </component>
 <component name="sippdevmgmtsipadapter" filter="s60" long-name="Device Management SIP Settings Adapter" plugin="Y">
 <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
@@ -3727,7 +3739,6 @@
 </collection>
 </block>
 <block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
 <collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
 <component name="vpnapi" filter="s60" long-name="VPN API" class="api">
 <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
@@ -3739,8 +3750,8 @@
 </component>
 </collection>
 <collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
 <unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
@@ -4215,7 +4226,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 Avability Text" filter="s60" class="api">
+<component name="presence_avabilitytext" long-name="Presence Availability Text" filter="s60" class="api">
 <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -4297,12 +4308,6 @@
 <unit bldFile="mw/legacypresence/xdmengine/group"/>
 </component>
 </collection>
-<collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
-<component name="xdmsettingsui_build" filter="s60" long-name="XDM Settings UI Build">
-<unit bldFile="mw/legacypresence/xdmsettingsui/group"/>
-</component>
-</collection>
 <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
 <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
 <component name="xdmprotocols_build" filter="s60" long-name="XDM Protocols Build">
@@ -4315,12 +4320,6 @@
 <unit bldFile="mw/legacypresence/msgconnmanager/group"/>
 </component>
 </collection>
-<collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
-<!-- collection is really a component. Need to move down a directory-->
-<component name="presencesettingsui_build" filter="s60" long-name="Presence Settings UI Build">
-<unit bldFile="mw/legacypresence/presencesettingsui/group"/>
-</component>
-</collection>
 <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
 <!-- collection is really a component. Need to move down a directory-->
 <component name="simpleengine_build" filter="s60" long-name="SIMPLE Engine Build">
@@ -4476,21 +4475,6 @@
 <component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
 </component>
-<component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
-<unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
 <component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
 </component>
@@ -4574,23 +4558,6 @@
 <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
 </component>
 </collection>
-<collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-<component name="diagframework" filter="s60" long-name="Diagnostics Framework">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component name="diagpluginbase" filter="s60" long-name="Diagnostics Plugin Base">
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component name="diagresultsdb" filter="s60" long-name="Diagnostics Results Database">
-<!--  can only have one unit, merge or split into two components -->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component name="devicediagnosticsfw_build" filter="s60" long-name="Device Diagnostics Framework Build">
-<!--  need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
 <collection name="dcmofw" long-name="Device Capability Management Object Framework" level="framework">
 <component name="dcmoclient" filter="s60" long-name="DCMO Client">
 <unit bldFile="mw/remotemgmt/dcmofw/dcmoclient/group"/>
@@ -4607,17 +4574,15 @@
 </component>
 </collection>
 <collection name="fotaapplication" long-name="FOTA Application" level="generic">
-<component name="fotaapplication_build" filter="s60" long-name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-</component>
 <component name="fotaserver" filter="s60" long-name="FOTA Server">
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
-</component>
-<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands" class="placeholder">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
+</component>
+<component name="fotacustcmds" filter="s60" long-name="FOTA Custom Commands">
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
+</component>
+<!-- really need to find a better way to do this -->
+<component name="fotacustcmds-alt" filter="s60" long-name="FOTA Custom Commands">
+<unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
 </component>
 </collection>
 </block>
@@ -4789,19 +4754,19 @@
 <unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
 </component>
 <component name="upnpextensionpluginif" filter="s60" long-name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
 </component>
 <component name="upnpfiletransferengine" filter="s60" long-name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
 </component>
 <component name="upnpcommonui" filter="s60" long-name="UPnP Common UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpcommonui/group"/>
 </component>
 <component name="upnpaiwengine" filter="s60" long-name="UPnP AIW Engine" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
 </component>
 <component name="upnpaiwprovider" filter="s60" long-name="UPnP AIW Provider" introduced="^2" deprecated="^3" plugin="Y">
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
 </component>
 <component name="upnpmusicadapter" filter="s60" long-name="UPnP Music Adapter" introduced="^2">
 <unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
@@ -4810,7 +4775,7 @@
 <unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
 </component>
 <component name="upnpframework_build" filter="s60" long-name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
+<!-- move exports content into one or more of above components -->
 <unit bldFile="mw/dlnasrv/upnpframework/group"/>
 </component>
 </collection>
@@ -4819,13 +4784,13 @@
 <unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
 </component>
 <component name="multiselectionui" filter="s60" long-name="Multi-Selection UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpsettings/multiselectionui/group"/>
 </component>
 <component name="appwizard" filter="s60" long-name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpsettings/appwizard/group"/>
 </component>
 <component name="upnpsharingui" filter="s60" long-name="UPnP Sharing UI" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
 </component>
 <component name="upnpgsplugin" filter="s60" long-name="UPnP GS Plugin" introduced="^2" plugin="Y">
 <unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
@@ -4863,42 +4828,37 @@
 </component>
 </collection>
 <collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
-<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
+<component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3">
 <!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
-        <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
-</component>
-<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
-</component>
-<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3" class="placeholder">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
-</component>
-<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3" class="placeholder">
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
+<unit bldFile="mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
+</component>
+<component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpharvester/cdssync/common"/>
+</component>
+<component name="mdhserver" filter="s60" long-name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/upnpharvester/mdhserver/group"/>
+</component>
+<component name="upnpharvester_build" filter="s60" long-name="UPnP Harvester Build" introduced="^2" deprecated="^3">
 <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
+<unit bldFile="mw/dlnasrv/upnpharvester/group"/>
 </component>
 </collection>
 <collection name="homesync" long-name="Home Sync" level="plugin">
-<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homesync/group"/>-->
+<component name="contentmanager" filter="s60" long-name="Content Manager" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/homesync/group"/>
 <!-- move bld.inf into contentmanager dir -->
 </component>
 </collection>
 <collection name="homemedia" long-name="Home Media" level="framework">
 <!-- collection is really just a component. Move down a directory -->
-<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3" class="placeholder">
-<!-- <unit bldFile="homemedia/group"/> -->
-</component>
-</collection>
-<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-<component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
-<unit bldFile="mw/dlnasrv/group"/>
-</component>
-</collection>
+<component name="homemedia_build" filter="s60" long-name="Home Media" introduced="^2" deprecated="^3">
+<unit bldFile="mw/dlnasrv/homemedia/group"/>
+</component>
+</collection>
+<collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin"/>
 </block>
 <block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
 <collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
@@ -4951,12 +4911,22 @@
 </component>
 </collection>
 <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
+<component name="btnotifclient" filter="s60" long-name="Bluetooth Notification Client" introduced="^4">
+<!-- cannot put a component under another component. Move up a directory -->
+<unit bldFile="mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
+</component>
 <component name="bteng" filter="s60" long-name="Bluetooth Engine">
 <unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
 </component>
+<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils" introduced="^4">
+<unit bldFile="mw/btservices/bluetoothengine/btserviceutil/group"/>
+</component>
 <component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
 <unit bldFile="mw/btservices/bluetoothengine/btnotif/group"/>
 </component>
+<component name="btdevicedialogplugin" filter="s60" long-name="Bluetooth Device Dialog Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/btservices/bluetoothengine/btnotif/btdevicedialogplugin" proFile="btdevicedialogplugin.pro"/>
+</component>
 <component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
 <unit bldFile="mw/btservices/bluetoothengine/btaudioman/group"/>
 </component>
@@ -4973,7 +4943,7 @@
 <unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
 </component>
 <component name="btui" filter="s60" long-name="Bluetooth UI">
-<unit bldFile="mw/btservices/bluetoothengine/btui/group"/>
+<unit bldFile="mw/btservices/bluetoothengine/btui" proFile="btui.pro"/>
 </component>
 <component name="btpbap" filter="s60" long-name="Bluetooth Phonebook Access Profile" plugin="Y">
 <unit bldFile="mw/btservices/bluetoothengine/btpbap/group"/>
@@ -4984,12 +4954,6 @@
 <component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
 <unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
 </component>
-<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils">
-<unit bldFile="mw/btservices/bluetoothengine/btserviceutil/group"/>
-</component>
-<component name="btnotifclient" filter="s60" long-name="Bluetooth Notifier Client">
-<unit bldFile="mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
-</component>
 </collection>
 <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
 <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
@@ -5075,15 +5039,15 @@
 <component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
 <unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
 <unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5093,9 +5057,6 @@
 </component>
 </collection>
 <collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="mw/usbservices/usbuis/usbui/group"/>
-</component>
 <component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
 <unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
 </component>
@@ -5105,8 +5066,11 @@
 <component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
 <unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
 </component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
+<component name="usbsettingsapp" long-name="USB Settings Application" introduced="^4" filter="s60">
+<unit bldFile="mw/usbservices/usbuis/usbsettingsapp" proFile="usbsettingsapp.pro" qmakeArgs="-r"/>
+</component>
+<component name="usbindicatorplugin" long-name="USB Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="mw/usbservices/usbuis/usbindicatorplugin" proFile="usbindicatorplugin.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="usbservices_test" long-name="USB Services Test" level="server"/>
@@ -5149,6 +5113,10 @@
 <component name="obexsendservices" long-name="OBEX Send Services">
 <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
 </component>
+<component name="obexhighway" long-name="OBEX Highway" introduced="^4">
+<!-- component must be moved to its own directory. Components cannot live in others component's directories -->
+<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/obexhighway" proFile="obexhighway.pro"/>
+</component>
 <component name="obexreceiveservices" long-name="OBEX Receive Services">
 <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
 </component>
@@ -5311,9 +5279,8 @@
 </collection>
 <collection name="clfwrapper" long-name="Content Listing Framework Wrapper" level="int">
 <!-- collection is really a component. Move down a directory -->
-<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2" class="placeholder">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
+<component name="clfwrapper_build" filter="s60" long-name="CLF Wrapper Build" introduced="^2">
+<unit bldFile="mw/mds/clfwrapper/group"/>
 </component>
 </collection>
 <collection name="mds_info" long-name="Metadata Services Info" level="int">
@@ -5343,12 +5310,6 @@
 <component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
 </component>
-<component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
 <component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
 </component>
@@ -5364,9 +5325,6 @@
 <component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
 </component>
-<component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
 <component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
 </component>
@@ -5415,10 +5373,18 @@
 <component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
 </component>
+<component name="openmax_al_ext_api" long-name="OpenMAX AL Extensions API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_ext_api/group"/>
+</component>
 <component name="system_tone_service_api" long-name="System Tone Service API" filter="s60" introduced="^4" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
 </component>
 </collection>
+<collection name="khronosfws" long-name="Khronos Frameworks" level="framework">
+<component name="openmax_al" filter="s60" long-name="OpenMAX AL" introduced="^4">
+<unit bldFile="mw/mmmw/khronosfws/openmax_al/group"/>
+</component>
+</collection>
 <collection name="mmfenh" long-name="MMF Enhancements" level="generic">
 <component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
 <unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
@@ -5438,18 +5404,8 @@
 <component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
 <unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
 </component>
-<component name="progressivedownload" filter="s60" long-name="Progressive Download">
-<unit bldFile="mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-</collection>
-<collection name="mm_fw" long-name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
 </collection>
 <collection name="mmserv" long-name="Multimedia Services" level="specific">
-<component name="audioeffectsui" filter="s60" long-name="Audio Effects UI">
-<unit bldFile="mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
 <component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
 <unit bldFile="mw/mmmw/mmserv/callaudiocontrol/group"/>
 </component>
@@ -5498,7 +5454,7 @@
 </component>
 <component name="gst_plugins_symbian" filter="s60" long-name="GStreamer Sybmian Plugins" introduced="^3" class="placeholder">
 <!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
-<!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
+<!-- add ,pref_test,TA_GSTREAMER filters later -->
 </component>
 </collection>
 <collection name="gstregistrygenerator" long-name="GStreamer Registry Generator" level="core">
@@ -5628,6 +5584,9 @@
 <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="qt_telephony_multimedia_service_api" long-name="Qt Telephony Multimedia Service API" introduced="^4" filter="s60" class="api">
+<unit bldFile="mw/mmappfw/mmappfw_plat/qt_telephony_multimedia_service_api/group"/>
+</component>
 </collection>
 <collection name="mpx" long-name="Multimedia Player" level="fw">
 <component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
@@ -5642,7 +5601,7 @@
 <component name="mpxviewfw" filter="s60" long-name="MPX View Framework" introduced="^1">
 <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
 </component>
-<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
+<component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60" introduced="^4">
 <unit bldFile="mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
 </component>
 <component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
@@ -5652,7 +5611,7 @@
 </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
+<!-- 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>
@@ -5672,12 +5631,10 @@
 <unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
 </component>
 <component name="audiofetcher" filter="s60" long-name="Audio Fetcher" introduced="^1" plugin="Y">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+<unit bldFile="mw/mmappfw/mmappcomponents/audiofetcher/group"/>
 </component>
 <component name="asxparser" filter="s60" long-name="ASX Parser" introduced="^1">
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+<unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/>
 </component>
 <component name="playbackhelper" filter="s60" long-name="Playback Helper" introduced="^3">
 <unit bldFile="mw/mmappfw/mmappcomponents/playbackhelper/group"/>
@@ -5689,6 +5646,12 @@
 <unit bldFile="mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
 </component>
 </collection>
+<collection name="qtms" long-name="Qt Telephony Multimedia Services" level="fw">
+<component name="qtms_build" filter="s60" long-name="Qt Telephony Multimedia Services Build" introduced="^4">
+<!--  Collection is really a component. Move down a dir -->
+<unit bldFile="mw/mmappfw/qtms" proFile="qtmsapi.pro" qmakeArgs="-r -config rom"/>
+</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 -->
@@ -5697,22 +5660,29 @@
 <component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
 </collection>
 </block>
-<block name="hgwidgets" level="specific" long-name="HG Widgets" levels="framework service api">
-<collection name="hgwidgets_plat" long-name="HG Widgets Platform Interfaces" level="api">
+<block name="hgwidgets" level="specific" long-name="Multimedia Widgets" levels="framework service api">
+<collection name="hgwidgets_plat" long-name="Multimedia Widgets Platform Interfaces" level="api">
 <component name="ganeswidgets_api" long-name="Ganes Widgets API" introduced="^4" class="api placeholder">
 <!-- should separate out unit -->
 </component>
-</collection>
-<collection name="hgwidgets_pub" long-name="HG Widgets Public Interfaces" level="api"/>
+<component name="hgcacheproxymodel_api" long-name="Hg Cache Proxy Model API" introduced="^4" class="api placeholder">
+<!-- should separate out unit -->
+</component>
+<component name="hgwidgets_plat_build" long-name="Multimedia Widgets Platform Interfaces Build" introduced="^4" class="api">
+<!-- break this up into separate components -->
+<unit bldFile="mw/hgwidgets/hgwidgets_plat" proFile="hgwidgets_plat.pro"/>
+</component>
+</collection>
 <collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
 <!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" class="placeholder">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
-<component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-<unit bldFile="mw/hgwidgets" proFile="hgwidgets.pro"/>
+<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4">
+<unit bldFile="mw/hgwidgets/ganeswidgets" proFile="ganeswidgets.pro"/>
+</component>
+</collection>
+<collection name="hgcacheproxymodel" long-name="Hurriganes Cache Proxy Model" level="framework">
+<!-- really a component, should move down a dir level and have a unit -->
+<component name="hgcacheproxymodel_build" long-name="Hurriganes Cache Proxy Model Build" introduced="^4">
+<unit bldFile="mw/hgwidgets/hgcacheproxymodel" proFile="hgcacheproxymodel.pro"/>
 </component>
 </collection>
 </block>
@@ -5759,8 +5729,7 @@
 </collection>
 <collection name="textinput" long-name="Text Input" level="framework">
 <component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!--  <unit bldFile="textinput/ptienginev2/group"/>-->
+<unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
 </component>
 <component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
 <unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
@@ -5768,19 +5737,6 @@
 <component name="peninputarc" filter="s60" long-name="Pen Input Arc">
 <unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
 </component>
-<component name="peninputcommonctrls" filter="s60" long-name="Pen Input Common Controls">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component name="peninputcommonlayout" filter="s60" long-name="Pen Input Common Layout">
-<unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component name="peninputhwrtrui" filter="s60" long-name="Pen Input Handwriting Recognition Training UI" introduced="^3" plugin="Y">
-<unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/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">
@@ -5804,19 +5760,11 @@
 </collection>
 <collection name="qt_info" long-name="Qt Info" level="mw">
 <component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="-r -config sgimagelite_support"/>
-</component>
-</collection>
-<collection name="qtdemos" long-name="Qt Demos" level="app">
-<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
-</component>
-</collection>
-<collection name="qtexamples" long-name="Qt Examples" level="app">
-<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
-</component>
-</collection>
+<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+</component>
+</collection>
+<collection name="qtdemos" long-name="Qt Demos" level="app"/>
+<collection name="qtexamples" long-name="Qt Examples" level="app"/>
 <collection name="qt_tests" long-name="Qt Tests" level="app"/>
 </block>
 <block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
@@ -5858,7 +5806,7 @@
 </component>
 </collection>
 <collection name="qtextensions_info" long-name="Qt Extensions Info" level="app">
-<component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" filter="qt_tools" class="conf">
+<component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" filter="qt_tools" class="config">
 <unit bldFile="mw/qtextensions/group"/>
 </component>
 <component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
@@ -5877,9 +5825,6 @@
 </block>
 <block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
 <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-<component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group"/>
-</component>
 <component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
 </component>
@@ -5898,15 +5843,9 @@
 <component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
 </component>
-<component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
 <component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
 </component>
-<component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
 <component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
 </component>
@@ -5937,9 +5876,6 @@
 <component name="task_list_api" long-name="Task List API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
 </component>
-<component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
 <component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
 </component>
@@ -5988,9 +5924,6 @@
 <component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
 </component>
-<component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
 <component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
 </component>
@@ -6140,6 +6073,12 @@
 <component name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
 </component>
+<component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/directory_localizer_api/group"/>
+</component>
+<component name="findutil_api" long-name="Find Util API" filter="s60" class="api">
+<unit bldFile="mw/classicui/classicui_plat/findutil_api/group"/>
+</component>
 </collection>
 <collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
 <component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
@@ -6368,12 +6307,6 @@
 <unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
 </component>
 </collection>
-<collection name="psln" long-name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component name="psln_build" filter="s60" long-name="Personalization Build">
-<unit bldFile="mw/classicui/psln/group"/>
-</component>
-</collection>
 <collection name="commonadapter" long-name="Common Adapter" level="support">
 <!-- the collection is really a component. Move down a directory.-->
 <component name="commonadapter_build" filter="s60" long-name="Common Adapter Build">
@@ -6627,10 +6560,10 @@
 <component name="fontprovider" filter="s60" long-name="Font Provider">
 <unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component name="fontutils" filter="sf_build" long-name="Font Utils">
 <unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -6713,41 +6646,31 @@
 <component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
 <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
 </component>
-<component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
-<unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
 <component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
 <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
 </component>
 </collection>
-<collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
-<component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
-<unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
 <collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
 <component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
 <unit bldFile="mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 <collection name="controlpanel" long-name="Control Panel" level="generic">
-<component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60">
-<unit bldFile="mw/gsprofilesrv/controlpanel/rom" proFile="cp_rom.pri" qmakeArgs="-r -config rom"/>
-</component>
-<component name="controlpanel_source" long-name="Control Panel Source" filter="s60">
-<unit bldFile="mw/gsprofilesrv/controlpanel/src" qmakeArgs="-r -config rom" proFile="src.pro"/>
+<component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60" class="placeholder">
+<!-- Need to create a real .pro file for this 
+	  <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="controlpanel_config" long-name="Control Panel Config" filter="s60" introduced="^4" class="config placeholder">
+<!-- Need to create a real .pro file for this 
+	  <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="controlpanel_source" long-name="Control Panel Source" filter="s60" class="placeholder">
+<!-- Uncomment when controlpanel_build is removed
+	  <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
+</component>
+<component name="controlpanel_build" long-name="Control Panel Build" filter="s60">
+<!-- need to make included .pri file into a real .pro file -->
+<unit bldFile="mw/gsprofilesrv/controlpanel" qmakeArgs="-r -config rom" proFile="controlpanel.pro"/>
 </component>
 </collection>
 <collection name="profilesservices" long-name="Profiles Services" level="server">
@@ -6783,15 +6706,14 @@
 <component name="caclient" long-name="Content Arsenal Client" introduced="^4">
 <unit bldFile="mw/homescreensrv/contentstorage/caclient" qmakeArgs="-r" proFile="caclient.pro"/>
 </component>
+<component name="casoftwareregistry" long-name="Content Arsenal Software Registry" introduced="^4">
+<unit bldFile="mw/homescreensrv/contentstorage/casoftwareregistry" qmakeArgs="-r" proFile="casoftwareregistry.pro"/>
+</component>
 </collection>
 <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
 <component name="homescreensrv_plat_build" long-name="Home Screen Services Platform Interfaces build" introduced="^4">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat" qmakeArgs="-r" proFile="homescreensrv_plat.pro"/>
 </component>
-<component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api"/>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api"/>
-<component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api"/>
-<component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api"/>
 <component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api"/>
 <component name="appruntimemodel_api" long-name="Appliction Run-Time Model API" filter="s60" introduced="^4" class="api"/>
 <component name="contentstorage_api" long-name="Content Storage API" filter="s60" introduced="^4" class="api"/>
@@ -6799,11 +6721,17 @@
 <component name="statemodel_api" long-name="State Model API" filter="s60" introduced="^4" class="api"/>
 <component name="homescreen_information_api" long-name="Homescreen Information API" filter="s60" introduced="^4" class="api"/>
 </collection>
-<collection name="hsactivityfw" long-name="Activity Framework" level="activityfw">
+<collection name="hsactivityfw" long-name="Activity Framework" level="fw">
 <component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4">
 <unit bldFile="mw/homescreensrv/activityfw" qmakeArgs="-r" proFile="activityfw.pro"/>
 </component>
 </collection>
+<collection name="tstaskmonitor" long-name="Task Switcher Task Monitor" level="fw">
+<!-- move collection down to a component directory or split up into component .pro files -->
+<component name="tstaskmonitor_build" long-name="Task Switcher Task Monitor Build" introduced="^4">
+<unit bldFile="mw/homescreensrv/tstaskmonitor" qmakeArgs="-r" proFile="tstaskmonitor.pro"/>
+</component>
+</collection>
 <collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
 <component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4">
 <unit bldFile="mw/homescreensrv/hsappkeyhandler" qmakeArgs="-r" proFile="hsappkeyhandler.pro"/>
@@ -6811,7 +6739,7 @@
 </collection>
 <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
 <component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
-<unit bldFile="mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv.pro"/>
+<unit bldFile="mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
 </component>
 <component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
 <unit bldFile="mw/homescreensrv/group"/>
@@ -6826,7 +6754,7 @@
 <component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
 <unit bldFile="mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
 </component>
-<component name="content_harvester_plugin_api" long-name="Content Harvester Plug-in API" filter="s60" class="api">
+<component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API " filter="s60" class="api">
 <unit bldFile="mw/homescreensrvlegacy/content_harvester_plugin_api/group"/>
 </component>
 </collection>
@@ -6857,9 +6785,6 @@
 <component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
 <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
 </component>
-<component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
-<unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
 <component name="sifui_api" long-name="STIF UI API" filter="s60" class="api">
 <unit bldFile="mw/appinstall/appinstall_plat/sifui_api/group"/>
 </component>
@@ -6870,13 +6795,7 @@
 </component>
 </collection>
 <collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
-<unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
+<!-- collection is really just a component. Move down one diretcory -->
 <component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
 <unit bldFile="mw/appinstall/ncdengine/group"/>
 </component>
@@ -6885,6 +6804,9 @@
 <component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
 <unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
 </component>
+<component name="appinstui_qt" filter="s60" long-name="Application Installer Qt UI" introduced="^2">
+<unit bldFile="mw/appinstall/appinstaller/appinstui" proFile="appinstui.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
 <!-- the collection is really a component. Move down a directory.-->
@@ -6893,12 +6815,9 @@
 </component>
 </collection>
 <collection name="iaupdate" long-name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component name="iad" long-name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
-<unit bldFile="mw/appinstall/iaupdate/help/group"/>
+<!-- Should reorganise into actual components -->
+<component name="iad" long-name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+<unit bldFile="mw/appinstall/iaupdate" proFile="iaupdate.pro" qmakeArgs="-r"/>
 </component>
 <component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
 <unit bldFile="mw/appinstall/iaupdate/group"/>
@@ -7005,8 +6924,9 @@
 <block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
 <!-- should break up this collection into something meaningful -->
 <collection name="serviceproviders" long-name="Service Providers" level="mw1">
-<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+<!-- are commented out components to be removed? -->
+<component name="sapi_contacts_vpbk" long-name="Contacts Phonebook SAPI" filter="s60" plugin="Y" class="placeholder">
+<!--<unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>-->
 </component>
 <component name="sapi_location" long-name="Location SAPI" filter="s60" plugin="Y">
 <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
@@ -7017,14 +6937,14 @@
 <component name="sapi_landmarks" long-name="Landmarks SAPI" filter="s60" plugin="Y">
 <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
 </component>
-<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-</component>
-<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-</component>
-<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y">
-<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+<component name="sapi_messaging" long-name="Messaging SAPI" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="serviceproviders/sapi_messaging/group"/> -->
+</component>
+<component name="sapi_applicationmanager" long-name="Application Manager SAPI" filter="s60" plugin="Y" class="placeholder">
+<!--  <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>-->
+</component>
+<component name="sapi_calendar" long-name="Calendar SAPI" filter="s60" plugin="Y" class="placeholder">
+<!-- <unit bldFile="serviceproviders/sapi_calendar/group"/> -->
 </component>
 <component name="sapi_logging" long-name="Logging SAPI" filter="s60" plugin="Y">
 <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
@@ -7128,12 +7048,6 @@
 <unit bldFile="mw/web/web_plat/xml_parser_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"/>
@@ -7163,8 +7077,7 @@
 <unit bldFile="mw/web/browserutilities/feedsengine/group"/>
 </component>
 <component name="multipartparser" filter="s60" long-name="Multipart Parser">
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+<unit bldFile="mw/web/browserutilities/multipartparser/group"/>
 </component>
 <component name="schemehandler" filter="s60" long-name="Scheme Handler">
 <unit bldFile="mw/web/browserutilities/schemehandler/group"/>
@@ -7175,10 +7088,6 @@
 <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">
@@ -7253,35 +7162,29 @@
 <unit bldFile="mw/web/codhandler/roapapp/group"/>
 </component>
 <component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- 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">
-<!-- the following units can be uncommented when configuration is put in place -->
-<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y" class="placeholder">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-</component>
-<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y" class="placeholder">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-</component>
-<component name="widgetlauncher" filter="s60" long-name="Widget Launcher" class="placeholder">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-</component>
-<component name="widgetapp" filter="s60" long-name="Widget UI" class="placeholder">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
+<component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
+<unit bldFile="mw/web/widgets/widgetrecognizer/group"/>
+</component>
+<component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
+<unit bldFile="mw/web/widgets/widgetinstaller/group"/>
+</component>
+<component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
+<unit bldFile="mw/web/widgets/widgetlauncher/group"/>
+</component>
+<component name="widgetapp" filter="s60" long-name="Widget UI">
+<unit bldFile="mw/web/widgets/widgetapp/group"/>
 </component>
 <component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+<unit bldFile="mw/web/widgets/widgetpreinstaller/group"/>
 </component>
 <component name="widgetstartup" filter="s60" long-name="Widget Startup">
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
-      		#included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="mw/web/widgets/group"/>
+<unit bldFile="mw/web/widgets/widgetstartup/group"/>
 </component>
 </collection>
 </block>
@@ -7405,17 +7308,17 @@
 </collection>
 </block>
 <block name="webruntime" level="specific" long-name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
+<!-- need to break up this package into collections and components -->
 <collection name="webruntime_info" long-name="Web Runtime Info">
 <component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
+<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs="&quot;what+=qtsfw&quot; &quot;what+=qt_unstable&quot; &quot;what+=tenone&quot; &quot;what+=usif&quot; &quot;what+=services&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
 </component>
 </collection>
 </block>
 <block name="platformtools" level="generic" long-name="Platform Tools">
 <collection name="gfxconversion" long-name="Graphics Conversion">
-<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="PC">
-<unit bldFile="mw/platformtools/gfxconversion/bmconv_s60/group"/>
+<component name="bmconv_s60" filter="s60" long-name="S60 Bitmap Converter" class="placeholder PC">
+<!-- Removed bmconv from builds     <unit bldFile="gfxconversion/bmconv_s60/group"/>   -->
 </component>
 <component name="mifconv" filter="s60" long-name="Multi Icon File Converter" class="PC">
 <unit bldFile="mw/platformtools/gfxconversion/mifconv/group"/>
@@ -7504,11 +7407,6 @@
 <component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
 <unit bldFile="app/phone/phoneapp/blacklist/group"/>
 </component>
-
-<component name="phoneringingtoneplayer" filter="s60" long-name="Phone Rining Tone Player">
-<unit bldFile="app/phone/phoneapp/phoneringingtoneplayer/group"/>
-</component>
-
 <component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
 <unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
 </component>
@@ -7590,11 +7488,6 @@
 <component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
 <unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
 </component>
-
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-
 <component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
 <unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
 </component>
@@ -7630,9 +7523,6 @@
 <component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
 <unit bldFile="app/phone/phoneplugins/csplugin/group"/>
 </component>
-<component name="phoneindicatorplugin" filter="s60" long-name="Info Indicator Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneplugins/phoneindicatorplugin" proFile="phoneindicatorplugin.pro"/>
-</component>
 <component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
 <unit bldFile="app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
 </component>
@@ -7654,8 +7544,20 @@
 <component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api"/>
 </collection>
 <collection name="logsui" long-name="Logs UI" level="ui">
+<!-- split into actual components -->
+<component name="logsservices" filter="s60" long-name="Logs Services" introduced="^4" class="placeholder">
+<!-- <unit bldFile="logsui/logsservices" qt:proFile="logsui.pro"/> -->
+</component>
+<component name="logscntfinder" filter="s60" long-name="Logs Contact finder" class="placeholder">
+<!--<unit bldFile="logsui/logscntfinder" qt:proFile="logscntfinder.pro"/> -->
+</component>
+<component name="logsengine" filter="s60" long-name="Logs Engine" introduced="^4" class="placeholder">
+<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+</component>
+<component name="logsapp" filter="s60" long-name="Logs Application" class="placeholder">
+<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+</component>
 <component name="logsui_build" filter="s60" long-name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
 <unit bldFile="app/recents/logsui" proFile="logsui.pro"/>
 </component>
 </collection>
@@ -7745,9 +7647,12 @@
 <block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
 <collection name="filemanager" long-name="File Manager" level="apps">
 <component name="filemanager_plat" long-name="File Manager Platform Interfaces" filter="s60" introduced="^4" class="api"/>
-<component name="fmbkupengine" filter="s60" long-name="File Manager Backup Engine" introduced="^4">
+<component name="fmbkupengine" filter="s60,bldfirst" long-name="File Manager Backup Engine" introduced="^4">
 <unit bldFile="app/files/filemanager/src/fmbkupengine/group"/>
 </component>
+<component name="fmfiledialog" filter="s60,bldfirst" long-name="File Manager File Dialog" introduced="^4">
+<unit bldFile="app/files/filemanager/src/fmfiledialog" proFile="fmfiledialog.pro" qmakeArgs="-r -config rom"/>
+</component>
 <component name="filemanager_build" filter="s60" long-name="File Manager Build">
 <!-- break this up into components or move down a directory -->
 <unit bldFile="app/files/filemanager" qmakeArgs="-r" proFile="filemanager.pro"/>
@@ -7771,8 +7676,8 @@
 <component name="qt_mobility_contacts_api" long-name="Qt Mobility Contacts API" filter="s60" introduced="^4" class="api"/>
 </collection>
 <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-<component name="mobhistorymodel" filter="s60" long-name="Mobile History Model" introduced="^4" class="placeholder">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
+<component name="cnthistorymodel" filter="s60" long-name="Contacts History Model" introduced="^4" class="placeholder">
+<!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
 </component>
 <component name="pbkcommonui" filter="s60" long-name="Phonebook Common UI" introduced="^4" class="placeholder">
 <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
@@ -7788,33 +7693,31 @@
 <unit bldFile="app/contacts/phonebookui" proFile="phonebookui.pro"/>
 </component>
 </collection>
-<collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
-<component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
-</component>
-</collection>
 <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
 <component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
 <unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
 </component>
 <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel" profile="contactsmodel.pro"/>
+<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
 </component>
 <component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
 <unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
 </component>
-<component name="cntlistmodel" filter="s60" long-name="Contacts List Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
-</component>
-<component name="cntactions" filter="s60" long-name="Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
+<component name="qtcontactsmobility" filter="s60" long-name="Qt Contacts Mobility" introduced="^4" plugin="Y">
+<!-- need to move to this actual dir rather than including something from another collection -->
+<unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
+</component>
+<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
+</component>
+<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
 </component>
 <component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
 <unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
 </component>
-<component name="cntsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
+<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
 </component>
 <component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
 <unit bldFile="app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
@@ -7843,7 +7746,7 @@
 </collection>
 <collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
 <component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
-<!-- break up into individual .pro files -->
+<!-- break up into individual .pro files, move the above metaxmls to those components -->
 <unit bldFile="app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
 </component>
 <component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api placeholder">
@@ -7905,6 +7808,9 @@
 <component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
 <unit bldFile="app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
 </component>
+<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y" class="placeholder">
+<!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
+</component>
 </collection>
 <collection name="notes" long-name="Notes" level="ui">
 <component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
@@ -7927,6 +7833,9 @@
 <component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
 <unit bldFile="app/organizer/calendarengines/calenimp/group"/>
 </component>
+<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3" class="placeholder">
+<!-- Not yet delivered in S^4 <unit bldFile="calendarengines/caldav/group"/> -->
+</component>
 </collection>
 <collection name="clock" long-name="Clock" level="app">
 <!-- uncomment unit when block_build is split up-->
@@ -7939,9 +7848,6 @@
 <component name="clockui" filter="s60" long-name="Clock UI" class="placeholder">
 <!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
 </component>
-<component name="ftudatetimewizard" filter="s60" long-name="First Time Use Date/Time Wizard" introduced="^4" class="placeholder">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
 <component name="clock_build" filter="s60" long-name="Clock Build">
 <!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
 <unit bldFile="app/organizer/clock" proFile="clock.pro"/>
@@ -7995,14 +7901,14 @@
 <component name="shareui_api" long-name="Share UI API" filter="s60" introduced="^4" class="api"/>
 <component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
 <component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/messaging/msg_plat" proFile="msg_plat.pro" qmakeArgs="-r"/>
+<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
 </component>
 </collection>
 <collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
 <component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
 <component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
 <component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<unit bldFile="app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
+<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
 </component>
 </collection>
 <collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
@@ -8072,9 +7978,8 @@
 </component>
 </collection>
 <collection name="messagingapp" long-name="Messaging Application" level="app">
-<component name="messagingapp_build" filter="s60" long-name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
+<component name="messaging_conf" filter="s60" long-name="Messaging Application Configuration" introduced="^4" class="config">
+<unit bldFile="app/messaging/messagingapp/conf" proFile="messaging_conf.pro" qmakeArgs="-r"/>
 </component>
 <component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
 <unit bldFile="app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
@@ -8097,6 +8002,9 @@
 <component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
 <unit bldFile="app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
 </component>
+<component name="msgservices" filter="s60" long-name="Messaging Services" introduced="^4">
+<unit bldFile="app/messaging/messagingapp/msgservices" proFile="msgservices.pro" qmakeArgs="-r"/>
+</component>
 </collection>
 <collection name="email" long-name="Email" level="plugin">
 <!-- use commonemail instead -->
@@ -8139,6 +8047,9 @@
 <component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
 <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
 </component>
+<component name="nmutilities" filter="s60" long-name="Nmail Utilities" introduced="^4" class="placeholder">
+<!-- <unit bldFile="emailservices/nmutilities" qt:proFile="nmutilities.pro"/> -->
+</component>
 </collection>
 <collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
 <component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
@@ -8199,6 +8110,8 @@
 </component>
 </collection>
 </block>
+<block name="imgeditor" level="apps" long-name="Image Editor"/>
+<block name="videoeditor" level="apps" long-name="Video Editor"/>
 <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
 <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
 <component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
@@ -8286,6 +8199,11 @@
 <!--<unit bldFile="main" qt:proFile="main.pro"/> -->
 </component>
 </collection>
+<collection name="gallery" long-name="Gallery" level="ui">
+<component name="gallery_build" filter="s60" long-name="Gallery Build" introduced="^4" class="placeholder">
+<!--<unit bldFile="gallery" qt:proFile="gallery.pro"/> -->
+</component>
+</collection>
 <collection name="imageviewerapp" long-name="Image Viewer App" level="support">
 <component name="imageviewerapp_build" filter="s60" long-name="Image Viewer App Build" introduced="^4" class="placeholder">
 <!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
@@ -8298,8 +8216,8 @@
 </component>
 </collection>
 </block>
-<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
+<block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support engine app">
+<!-- move the rom .pri files into their components and uncomment the units -->
 <collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
 <component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
 <!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
@@ -8308,10 +8226,10 @@
 <!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection name="musicfetcher " long-name="Music Fetcher" level="support">
+<collection name="musicservices " long-name="Music Services" level="support">
 <!-- collection is really a component, move down a directory -->
-<component name="musicfetcher_buld" filter="s60" long-name="Music Fetcher Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+<component name="musicservices_build" filter="s60" long-name="Music Services Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection name="musicplayer_app " long-name="Music Player Application" level="app">
@@ -8320,12 +8238,33 @@
 <!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection name="mpviewplugins " long-name="Music Player View Plugins" level="plugins">
+<collection name="mpdata " long-name="Music Player Data" level="support">
+<!-- collection is really a component, move down a directory -->
+<component name="mpdata_build" filter="s60" long-name="Music Player Data Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="mpengine " long-name="Music Player Engine" level="engine">
+<!-- collection is really a component, move down a directory -->
+<component name="mpengine_build" filter="s60" long-name="Music Player Engine Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="mpviewplugins" long-name="Music Player View Plugins" level="plugins">
 <component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 <component name="mpplaybackviewplugin" filter="s60" long-name="MP Playback View Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpsettingsviewplugin" filter="s60" long-name="MP Settings View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpsettingsviewplugin" qt:proFile="mpsettingsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpdetailsviewplugin" filter="s60" long-name="MP Details View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpdetailsviewplugin" qt:proFile="mpdetailsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component name="mpmediawallviewplugin" filter="s60" long-name="MP Media Wall View Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
@@ -8339,24 +8278,30 @@
 <component name="mpxsqlitedbcommon" filter="s60" long-name="MPX SQLite Database Common" introduced="^4" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
 </component>
+<component name="mpxsqlitedbhgplugin" filter="s60" long-name="MPX SQLite Database Hg Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbhgplugin/group"/>-->
+</component>
 <component name="mpxsqlitedbplugin" filter="s60" long-name="MPX SQLite Database Plugin" introduced="^4" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
 </component>
 <component name="mpxsqlitepodcastdbplugin" filter="s60" long-name="MPX SQLlite Podcast Database Plugin" introduced="^4" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
 </component>
+<component name="mpxinmemoryplugin" filter="s60" long-name="MPX In-Memory Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="mpserviceplugins/mpxinmemoryplugin/group"/>-->
+</component>
 <component name="m3uplaylistplugin" filter="s60" long-name="M3U Playlist Plugin" introduced="^4" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/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 brak up into individual components  -->
+<!-- break up into individual components. ROM includes should be in their components -->
 <unit bldFile="app/musicplayer" proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </block>
-<block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
+<block name="radio" level="apps" long-name="Radio Apps" levels="engine plugin ui">
 <collection name="radioengine" long-name="Radio Engine" level="engine">
 <component name="radioengineutils" filter="s60" long-name="Radio Engine Utils" introduced="^4">
 <unit bldFile="app/radio/radioengine/utils/group"/>
@@ -8388,6 +8333,17 @@
 <unit bldFile="app/radio/rom"/>
 </component>
 </collection>
+<collection name="radio_hswidgetplugin" long-name="FM Radio Homescreen Widget Plugin" level="plugin">
+<component name="fmradiohswidgetplugin" filter="s60" long-name="FM Radio HS Widget Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/radio/hswidgetplugin/fmradiohswidgetplugin" proFile="fmradiohswidgetplugin.pro"/>
+</component>
+<component name="fmradiohswidgetplugininstaller" filter="s60" long-name="FM Radio HS Widget Plugin Installer" introduced="^4">
+<unit bldFile="app/radio/hswidgetplugin/fmradiohswidgetplugininstaller" proFile="fmradiohswidgetplugininstaller.pro"/>
+</component>
+<component name="fmradiohswidgetplugin_exports_to_rom" filter="s60" long-name="FM Radio HS Widget Plugin ROM" introduced="^4">
+<unit bldFile="app/radio/hswidgetplugin" proFile="fmradiohswidgetplugin_exports_to_rom.pri"/>
+</component>
+</collection>
 </block>
 <block name="internetradio" level="apps" long-name="Internet Radio Apps" levels="engine server ui">
 <collection name="internetradio2_0" long-name="Internet Radio 2.0" level="ui">
@@ -8424,38 +8380,48 @@
 </collection>
 </block>
 <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="support task ss hs">
-<collection name="homescreen_info" long-name="Home Screen Info" level="support">
-<component name="homescreen_build" long-name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="app/homescreen" proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
-</component>
-</collection>
 <collection name="homescreen_test" long-name="Home Screen Test" level="support"/>
-<!-- fiill in details with broken up homescreen_build -->
 <collection name="homescreenapp" long-name="Home Screen Application" level="hs">
-<component name="hsutils" long-name="Home Screen Utils" introduced="^4"/>
-<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4"/>
-<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y"/>
-<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y"/>
-<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y"/>
-<component name="hsapplication" long-name="Home Screen Application" introduced="^4"/>
-<component name="hshomescreenclientplugin" long-name="Home Screen Client Plugin" introduced="^4" plugin="Y"/>
-<component name="hsmenucontentpublish" long-name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection name="screensaverapp" long-name="Screen Saver Application" level="ss">
-<component name="snsrutils" long-name="Screen Saver Utils" introduced="^4"/>
-<component name="snsr_serviceproviders" long-name="Screen Saver Service Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_stateproviders" long-name="Screen Saver State Providers" introduced="^4" plugin="Y"/>
-<component name="snsr_runtimeproviders" long-name="Screen Saver Runtime Providers" introduced="^4" plugin="Y"/>
-<component name="snsrapplication" long-name="Screen Saver Application" introduced="^4"/>
-<component name="screensaverproviders" long-name="Screen Saver Providers" introduced="^4" plugin="Y"/>
+<component name="hsutils" long-name="Home Screen Utils" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsutils" proFile="hsutils.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsdomainmodel" long-name="HS Domain Model" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsdomainmodel" proFile="hsdomainmodel.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_runtimeplugins" long-name="HS Runtime Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/runtimeplugins" proFile="runtimeplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_serviceproviders" long-name="HS Service Providers" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/serviceproviders" proFile="serviceproviders.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_stateplugins" long-name="HS State Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/stateplugins" proFile="stateplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hs_widgetplugins" long-name="HS Widget Plugins" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/widgetplugins" proFile="widgetplugins.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsapplication" long-name="Home Screen Application" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hsapplication" proFile="hsapplication.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hsmenuclientplugin" long-name="Home Screen Menu Client Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/hsmenuclientplugin" proFile="hsmenuclientplugin.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hshomescreenclientplugin" long-name="HS Menu Client Plugin" introduced="^4" plugin="Y">
+<unit bldFile="app/homescreen/homescreenapp/hshomescreenclientplugin" proFile="hshomescreenclientplugin.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="hswidgetuninstaller" long-name="HS Widget Uninstaller" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp/hswidgetuninstaller" proFile="hswidgetuninstaller.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="homescreenapp_rom" long-name="Home Screen App ROM" introduced="^4">
+<unit bldFile="app/homescreen/homescreenapp" proFile="homescreenapp_exports_to_rom.pri" qmakeArgs="-r -config rom"/>
+</component>
 </collection>
 <collection name="taskswitcherapp" long-name="Task Switcher Application" level="task">
-<component name="taskswitcherappecom" long-name="Task Switcher Application ECom" introduced="^4"/>
-<component name="tsserviceplugin" long-name="Task Switcher Service Plugin" introduced="^4" plugin="Y"/>
-<component name="ts_runtimeplugins" long-name="TS Runtime Plugins" introduced="^4" plugin="Y"/>
-<component name="tsapplication" long-name="Task Switcher Application" introduced="^4"/>
+<!-- break collection info components, or move down a dir and make it a component -->
+<component name="taskswitcherapp_build" long-name="Task Switcher Application Build">
+<unit bldFile="app/homescreen/taskswitcherapp" proFile="taskswitcherapp.pro" qmakeArgs="-r -config rom"/>
+</component>
+<component name="tsdevicedialogplugin" long-name="Task Switcher Device Dialog Plugin" introduced="^4" plugin="Y"/>
 </collection>
 </block>
 <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
@@ -8470,6 +8436,11 @@
 <unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
 </component>
 </collection>
+<collection name="java_stubs" long-name="Java Stubs" level="rt">
+<component name="java_stubs_build" long-name="Build Native Java" filter="sf_build" introduced="^4">
+<unit bldFile="app/jrt/java_stubs/group"/>
+</component>
+</collection>
 <collection name="build_nativejava" long-name="Build Native Java">
 <component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
 <unit bldFile="app/jrt/build/nativejava" filter="!sf_build" proFile="nativejava.pro" qmakeArgs="-r"/>
@@ -8537,34 +8508,25 @@
 <collection name="creator" long-name="Creator" level="support">
 <!-- collection is really a component. Should move down a directory -->
 <component name="creator_build" filter="s60" long-name="Creator Tool" purpose="development" class="tool">
-<unit bldFile="app/rndtools/creator/group"/>
+<unit bldFile="app/rndtools/creator" proFile="creator.pro"/>
 </component>
 </collection>
 <collection name="filebrowser" long-name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component name="fileopserver" filter="s60" long-name="File Operations Server" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component name="fileopclient" filter="s60" long-name="File Operations Client" purpose="development" class="tool">
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component name="filebrowser_build" filter="s60" long-name="File Browser Application" purpose="development" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="app/rndtools/filebrowser/group"/>
+<!-- collection is really a component. Should move down a directory -->
+<component name="filebrowser_build" filter="s60" long-name="File Browser Build" purpose="development" class="tool">
+<unit bldFile="app/rndtools/filebrowser" proFile="filebrowser.pro"/>
 </component>
 </collection>
 <collection name="launcher" long-name="Launcher" level="util">
 <!-- collection is really a component. Should move down a directory -->
 <component name="launcher_build" filter="s60" long-name="Launcher Utility" purpose="development" class="tool">
-<unit bldFile="app/rndtools/launcher/group"/>
+<unit bldFile="app/rndtools/launcher" proFile="launcher.pro"/>
 </component>
 </collection>
 <collection name="loadgen" long-name="Load Generator" level="test">
 <!-- collection is really a component. Should move down a directory -->
 <component name="loadgen_build" filter="s60" long-name="Load Generator Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/loadgen/group"/>
+<unit bldFile="app/rndtools/loadgen" proFile="loadgen.pro"/>
 </component>
 </collection>
 <collection name="perfmon" long-name="Performance Monitor" level="test">
@@ -8573,6 +8535,12 @@
 <unit bldFile="app/rndtools/perfmon" proFile="perfmon.pro"/>
 </component>
 </collection>
+<collection name="piprofilerui" long-name="Performance Investigator Profiler UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component name="piprofilerui_build" filter="s60" long-name="Performance Investigator Profiler UI Build" purpose="development" introduced="^4">
+<unit bldFile="app/rndtools/piprofilerui" proFile="piprofilerui.pro"/>
+</component>
+</collection>
 <collection name="screengrabber" long-name="Screen Grabber" level="util">
 <!-- collection is really a component. Should move down a directory -->
 <component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
@@ -8580,44 +8548,25 @@
 </component>
 </collection>
 <collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_avkon" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/avkon/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
+<component name="stifuiqt" filter="s60" long-name="STIF Qt UI" purpose="development" introduced="^4">
+<unit bldFile="app/rndtools/stifui/qt" proFile="stifqtui.pro"/>
+<!-- should use stifuiqt as the dir name -->
 </component>
 </collection>
 <collection name="memspyui" long-name="Memspy UI" level="generic">
 <!-- collection is really a component. Should move down a directory -->
 <component name="memspyui_build" filter="s60" long-name="Memspy UI Application" purpose="development" class="tool">
-<unit bldFile="app/rndtools/memspyui/group"/>
+<unit bldFile="app/rndtools/memspyui" proFile="memspyui.pro"/>
 </component>
 </collection>
 <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component name="htidevicereboot" filter="s60" long-name="HTI Device Reboot" purpose="development">
-<unit bldFile="app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component name="htistartupwait" filter="s60" long-name="HTI Startup Wait" purpose="development">
-<unit bldFile="app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component name="htiadmin" filter="s60" long-name="HTI Admin" purpose="development">
-<unit bldFile="app/rndtools/htiui/htiadmin/group"/>
-</component>
 <component name="htiui_build" filter="s60" long-name="HTI UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
+<!-- should split up into individual components -->
 <unit bldFile="app/rndtools/htiui/group"/>
 </component>
+<component name="htiadminqt" filter="s60" long-name="HTI Admin Qt" purpose="development">
+<unit bldFile="app/rndtools/htiui/htiadminqt" proFile="HtiAdmin.pro"/>
+</component>
 </collection>
 </block>
 <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools if ui">

--- a/symbian4/single/sysdefs/system_model_3.0.xml	Tue Jun 29 11:29:17 2010 +0100
+++ b/symbian4/single/sysdefs/system_model_3.0.xml	Sat Jun 26 10:29:40 2010 +0100
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition xmlns:qt="http://www.nokia.com/qt" id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
+<?xml version="1.0" encoding="UTF-8"?><SystemDefinition id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
 <systemModel name="Symbian^4">
 <layer id="adaptation" name="Adaptation" levels="low mw high">
 <package id="stubs" tech-domain="hb" level="high" span="2" name="Stubs" levels="adaptation plugin mid engine">
@@ -280,7 +279,7 @@
 <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
 </component>
-<component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
+<component id="kernelhwsrv_docpub" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
 <unit mrp="/os/kernelhwsrv/kernelhwsrv_info/doc_pub/kernelhwsrv_doc_pub.mrp"/>
 </component>
 </collection>
@@ -503,7 +502,7 @@
 <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="/os/ossrv/ofdbus/group"/>
 </component>
@@ -935,9 +934,7 @@
 <meta rel="config">
 <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
 </meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
-      		may need to  -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+<unit bldFile="/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/>
 </component>
 <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
 <unit bldFile="/os/devicesrv/resourcemgmt/vibractrl/group"/>
@@ -948,9 +945,8 @@
 <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
 <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
-<component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-<!-- Move exports to a self-contained component.
-         	This needs to be kept around until configuration is in place -->
+<component id="resourcemgmt_data" filter="s60" name="Resource Management Data" class="config">
+<!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
 <unit bldFile="/os/devicesrv/resourcemgmt/group"/>
 </component>
 <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
@@ -1975,7 +1971,7 @@
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2175,7 +2171,7 @@
 <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
 </component>
-<component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
+<component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^3">
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
 </component>
 </collection>
@@ -2325,7 +2321,8 @@
 <component id="gdi" name="GDI" purpose="mandatory">
 <unit bldFile="/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
 </component>
-<component id="bitgdi" name="BitGDI" purpose="mandatory">
+<component id="bitgdi" name="BitGDI" purpose="mandatory" filter="api_test">
+<!-- just api_test, not test -->
 <unit bldFile="/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
 </component>
 <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
@@ -2356,9 +2353,6 @@
 </package>
 <package id="textandloc" level="services" tech-domain="ui" name="Text and Localisation Services" levels="encoding util fonts tools text">
 <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
-<component id="findutil_api" class="api" name="Find Util API" filter="s60">
-<unit bldFile="/os/textandloc/textandloc_plat/findutil_api/group"/>
-</component>
 <component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
 <unit bldFile="/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
 </component>
@@ -2366,11 +2360,6 @@
 <unit bldFile="/os/textandloc/textandloc_plat/sortutil_api/group"/>
 </component>
 </collection>
-<collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
-<component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
-<unit bldFile="/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-</component>
-</collection>
 <collection id="charconvfw" name="Character Conversion" level="encoding">
 <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
 <unit bldFile="/os/textandloc/charconvfw/charconv_fw/group" mrp="/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
@@ -2410,19 +2399,16 @@
 </collection>
 <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
 <component id="numbergrouping" name="Number Grouping">
-<unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
+<unit bldFile="/os/textandloc/textandlocutils/numbergrouping/group" mrp="/os/textandloc/textandlocutils/numbergrouping/group/tls_numbergrouping.mrp"/>
 </component>
 <component id="jplangutil" name="Japanese Language Utilities">
-<unit bldFile="/os/textandloc/charconvfw/jplangutil/group"/>
+<unit bldFile="/os/textandloc/textandlocutils/jplangutil/group" mrp="/os/textandloc/textandlocutils/jplangutil/group/tls_jplangutil.mrp"/>
 </component>
 <component id="sortutil" name="Sorting Utility">
-<unit bldFile="/os/textandloc/charconvfw/sortutil/group"/>
+<unit bldFile="/os/textandloc/textandlocutils/sortutil/group" mrp="/os/textandloc/textandlocutils/sortutil/group/tls_sortutil.mrp"/>
 </component>
 <component id="inlinetext" name="Inline Text">
-<unit bldFile="/os/textandloc/charconvfw/inlinetext/group"/>
-</component>
-<component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
-<!-- placeholder for split from bafl -->
+<unit bldFile="/os/textandloc/textandlocutils/inlinetext/group" mrp="/os/textandloc/textandlocutils/inlinetext/group/tls_inlinetext.mrp"/>
 </component>
 <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
 <unit bldFile="/os/textandloc/textrendering/numberformatting/group" mrp="/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
@@ -2453,8 +2439,8 @@
 <package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
 <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
 <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -2515,13 +2501,13 @@
 <collection id="s60extras" name="S60 Extras" level="mid">
 <!-- collection is really a component. Need to move down a directory -->
 <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
-<unit bldFile="/os/deviceplatformrelease/S60Extras/group"/>
+<unit bldFile="/os/deviceplatformrelease/s60extras/group"/>
 </component>
 </collection>
 <collection id="version" name="Version" level="top">
 <!-- collection is really a component. Need to move down a directory -->
 <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
-<unit bldFile="/os/deviceplatformrelease/Version/group"/>
+<unit bldFile="/os/deviceplatformrelease/version/group"/>
 </component>
 </collection>
 <collection id="symbianosbld" name="Symbian OS Build" level="bld">
@@ -2536,7 +2522,7 @@
 <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
 </component>
-<component id="sf_config" name="Foundation Config" introduced="^4">
+<component id="sf_config" filter="s60" name="Foundation Config" introduced="^4">
 <unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
 </component>
 <component id="config" filter="s60" name="Config" class="config" purpose="development">
@@ -2559,7 +2545,7 @@
 </component>
 </collection>
 </package>
-<package id="osrndtools" level="services" tech-domain="to" name="OS R&amp;D tools" levels="fw trace">
+<package id="osrndtools" level="services" tech-domain="to" name="OS R&amp;D tools" levels="fw trace analysis">
 <collection id="stif" name="STIF" level="fw">
 <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
 <unit bldFile="/os/osrndtools/stif/stif_plat/group"/>
@@ -2604,31 +2590,36 @@
 <meta rel="config">
 <defined condition="__S60_"/>
 </meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-</component>
-<component id="stif_build" filter="s60" name="STIF Build" purpose="development">
-<!--  move exports into self-contained component. Remove this when configuration is in place-->
+<unit bldFile="/os/osrndtools/stif/stifkerneltestclassbase/group"/>
+</component>
+<component id="stif_data" filter="s60" name="STIF Data" purpose="development" class="config">
+<!--  This is a component. Should move down a directory. or move into other STIF components-->
 <unit bldFile="/os/osrndtools/stif/group"/>
 </component>
 </collection>
-<collection id="memspy" name="Memspy" level="trace">
-<component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+<collection id="memspy" name="MemSpy" level="trace">
+<component id="memspy_plat" filter="s60" name="MemSpy Platform Interfaces" class="api" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/memspy_plat/group"/>
 </component>
-<component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+<component id="driver" filter="s60" name="MemSpy Driver" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/driver/group"/>
 </component>
-<component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+<component id="memspy_engine" filter="s60" name="MemSpy Engine" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/engine/group"/>
 </component>
-<component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+<component id="commandline" filter="s60" name="MemSpy Command Line" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/commandline/group"/>
 </component>
-<component id="console" filter="s60" name="Memspy Console" purpose="development">
+<component id="console" filter="s60" name="MemSpy Console" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/console/group"/>
 </component>
-<component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+<component id="memspyserver" filter="s60" name="MemSpy Server" purpose="development" introduced="^4">
+<unit bldFile="/os/osrndtools/memspy/MemSpyServer/group"/>
+</component>
+<component id="memspyclient" filter="s60" name="MemSpy Client" purpose="development" introduced="^4">
+<unit bldFile="/os/osrndtools/memspy/MemSpyClient/group"/>
+</component>
+<component id="memspy_build" filter="s60" name="MemSpy Build" purpose="development">
 <!--  move exports into self-contained component.-->
 <unit bldFile="/os/osrndtools/memspy/group"/>
 </component>
@@ -2672,6 +2663,16 @@
 <unit bldFile="/os/osrndtools/hti/group"/>
 </component>
 </collection>
+<collection id="piprofiler" name="Performance Investigator Profiler" level="analysis">
+<component id="piprofiler_build" name="Performance Investigator Profiler Build" introduced="^4">
+<unit bldFile="/os/osrndtools/piprofiler/group"/>
+</component>
+</collection>
+<collection id="analyzetool" name="Analyze Tool" level="analysis">
+<component id="analyzetool_build" name="Analyze Tool Build" introduced="^4">
+<unit bldFile="/os/osrndtools/analyzetool/group"/>
+</component>
+</collection>
 <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
 <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
@@ -2788,22 +2789,17 @@
 </component>
 </collection>
 <collection id="contextframework" name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
-		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component id="cfw" filter="s60" name="Context Framework">
 <meta rel="config">
 <defined condition="RD_CONTEXT_FRAMEWORK"/>
 </meta>
-<!--<unit bldFile="contextframework/cfw/group"/> -->
+<unit bldFile="/mw/appsupport/contextframework/cfw/group"/>
 </component>
 <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
 <meta rel="config">
 <defined condition="RD_CONTEXT_FRAMEWORK"/>
 </meta>
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component id="contextframework_build" filter="s60" name="Context Framework Build">
-<unit bldFile="/mw/appsupport/contextframework/group"/>
+<unit bldFile="/mw/appsupport/contextframework/cfwplugins/group"/>
 </component>
 </collection>
 <collection id="coreapplicationuis" name="Core Application UIs" level="server">
@@ -3051,18 +3047,12 @@
 <component id="pkcs12" filter="s60" name="PKCS #12">
 <unit bldFile="/mw/securitysrv/pkiutilities/pkcs12/group"/>
 </component>
-<component id="certmanui" filter="s60" name="Certificate Management UI">
-<unit bldFile="/mw/securitysrv/pkiutilities/certmanui/group"/>
-</component>
 <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
 <unit bldFile="/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
 </component>
 <component id="certsaver" filter="s60" name="Certificate Saver">
 <unit bldFile="/mw/securitysrv/pkiutilities/certsaver/group"/>
 </component>
-<component id="secmodui" filter="s60" name="Security Module UI">
-<unit bldFile="/mw/securitysrv/pkiutilities/secmodui/group"/>
-</component>
 <component id="devicetoken" filter="s60" name="Device Token">
 <unit bldFile="/mw/securitysrv/pkiutilities/devicetoken/group"/>
 </component>
@@ -3102,14 +3092,38 @@
 <component id="securitynotifier" filter="s60" name="Security Notifier">
 <unit bldFile="/mw/securitysrv/securitydialogs/securitynotifier/group"/>
 </component>
-<component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
-<unit bldFile="/mw/securitysrv/securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
+<component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
+<!-- This overwrites the bld.inf already in this dir. I'm pretty sure this will cause problems with the export -->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
 <unit bldFile="/mw/securitysrv/securitydialogs/lockapp/group"/>
 </component>
 <component id="secuinotifications" name="Security UI Notifications" introduced="^4" filter="s60">
-<unit bldFile="/mw/securitysrv/securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="indicatorautolockplugin" name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" class="plugin">
+<!-- directory at the wrong level to be a component-->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/AutolockSrv/indicatorplugin" qt:proFile="indicatorautolockplugin.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="autolockuseractivityservice" name="Auto Lock User Activity Service" introduced="^4" filter="s60">
+<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/AutolockSrv" qt:proFile="autolockuseractivityservice.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="autolocksrv" name="Auto Lock Server" introduced="^4" filter="s60">
+<!-- directory at the wrong level to be a component-->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/AutolockSrv" qt:proFile="AutolockSrv.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="cpsecplugins" name="Security Settings Plugins" level="plugin">
+<component id="devicelockplugin" name="Device Lock Plugin" introduced="^4" filter="s60">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/cpsecplugins/devicelockplugin" qt:proFile="devicelockplugin.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="simpincodeplugin" name="SIM PIN Code Plugin" introduced="^4" filter="s60">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/cpsecplugins/simpincodeplugin" qt:proFile="pincodeplugin.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="cpadvancedsecplugin" name="Advanced Security Plugin" introduced="^4" filter="s60">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/cpsecplugins/cpadvancedsecplugin/group" qt:proFile="advancedsecplugin.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
@@ -3231,9 +3245,6 @@
 <component id="drmencryptor" filter="s60" name="DRM Encryptor">
 <!-- this should have its own bld.inf or be removed as a component -->
 </component>
-<component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
-<!-- this should have its own bld.inf or be removed as a component -->
-</component>
 <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
 <unit bldFile="/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
 </component>
@@ -3292,6 +3303,12 @@
 <component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
 <unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
 </component>
+<component id="supl_pos_message_plugin_api" name="SUPL POS Message Plugin API" class="api" filter="s60">
+<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+	 -->
+</component>
 <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
 <unit bldFile="/mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
 </component>
@@ -3347,6 +3364,9 @@
 <component id="locationsysui" filter="s60" name="Location System UI">
 <unit bldFile="/mw/locationsrv/locationsystemui/locationsysui/group"/>
 </component>
+<component id="locationsysui" filter="s60" name="Location System Qt UI">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/locationsrv/locationsystemui/locationsysui" qt:proFile="locsysui.pro"/>
+</component>
 </collection>
 <collection id="supl" name="SUPL" level="fw">
 <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
@@ -3396,7 +3416,29 @@
 </component>
 </collection>
 </package>
-<package id="accesssec" level="generic" tech-domain="dc"/>
+<package id="accesssec" level="generic" tech-domain="dc" name="Access Security" levels="plugin framework server generic specific">
+<collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
+<component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+</component>
+<component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
+<unit bldFile="/mw/accesssec/accesssec_plat/eap_type_api/group"/>
+</component>
+</collection>
+<collection id="securitysettings" name="WLAN Security Settings" level="specific">
+<component id="accesssec_qtconfigutils" filter="s60" name="Access Security Config Utils" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/accesssec/securitysettings/qtconfigutils" qt:proFile="qtconfigutils.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="cpwlansecurityuiplugins" filter="s60" name="Control Panel WLAN Security UI Plugins" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/accesssec/securitysettings/cpwlansecurityuiplugins" qt:proFile="cpwlansecurityuiplugins.pro" qt:qmakeArgs="-r"/>
+</component>
+</collection>
+<collection id="eapol" name="EAPOL" level="framework">
+<component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
+<unit bldFile="/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+</component>
+</collection>
+</package>
 <package id="ipconnmgmt" level="generic" tech-domain="dc" name="IP Connectivity Management" levels="plugin framework server utils api">
 <collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="api">
 <component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
@@ -3462,11 +3504,6 @@
 <unit bldFile="/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
 </component>
 </collection>
-<collection id="accesspointcontrol" name="Access Point Control" level="plugin">
-<component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
-<unit bldFile="/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-</component>
-</collection>
 <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
 <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
 <unit bldFile="/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
@@ -3520,10 +3557,9 @@
 </component>
 <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
 <meta rel="config">
-<not-defined condition="WINSCW"/>
+<not-defined xmlns:qt="http://www.nokia.com/qt" condition="WINSCW"/>
 </meta>
-<!-- uncomment when config is turned on -->
-<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
 </component>
 <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -3538,11 +3574,11 @@
 </collection>
 <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
 <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
-<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
+<!-- need to move exports to another component, or make this a config component and revmove the #includes -->
 <unit bldFile="/mw/ipconnmgmt/group"/>
 </component>
 <component id="ipcm_qt_build" name="IP Connectivity Management Qt Build" introduced="^4">
-<unit bldFile="/mw/ipconnmgmt" qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/ipconnmgmt" qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
@@ -3661,7 +3697,7 @@
 <unit bldFile="/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
 </component>
 <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
-<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+<!--<unit bldFile="sipplugins/sippsipsettingsui/group"/> -->
 </component>
 <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
 <unit bldFile="/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
@@ -3730,7 +3766,7 @@
 <collection id="wlanutilities" name="WLAN Utilities" level="generic">
 <component id="wlanutilities_build" name="WLAN Utilities Qt" introduced="^4" filter="s60">
 <!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit bldFile="/mw/wirelessacc/wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/wirelessacc/wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
 <!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
@@ -3750,7 +3786,6 @@
 </collection>
 </package>
 <package id="vpnclient" level="specific" tech-domain="dc" name="VPN Client" levels="engine ui api">
-<!-- is the !oem_build filter needed? -->
 <collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
 <component id="vpnapi" filter="s60" class="api" name="VPN API">
 <unit bldFile="/mw/vpnclient/vpnc_plat/vpnapi/group"/>
@@ -3762,8 +3797,8 @@
 </component>
 </collection>
 <collection id="vpnengine" name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
 <unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group"/>
@@ -4095,7 +4130,7 @@
 </collection>
 <collection id="phonesrv_info" name="Phone Server Info" level="generic">
 <component id="phonesrv_build" name="Phone Server Build" filter="s60">
-<unit bldFile="/mw/phonesrv" qt:proFile="phonesrv.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/phonesrv" qt:proFile="phonesrv.pro"/>
 </component>
 </collection>
 </package>
@@ -4263,7 +4298,7 @@
 <component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+<component id="presence_avabilitytext" name="Presence Availability Text" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -4345,12 +4380,6 @@
 <unit bldFile="/mw/legacypresence/xdmengine/group"/>
 </component>
 </collection>
-<collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
-<!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
-<component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
-<unit bldFile="/mw/legacypresence/xdmsettingsui/group"/>
-</component>
-</collection>
 <collection id="xdmprotocols" name="XDM Protocols" level="fw">
 <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
 <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
@@ -4363,12 +4392,6 @@
 <unit bldFile="/mw/legacypresence/msgconnmanager/group"/>
 </component>
 </collection>
-<collection id="presencesettingsui" name="Presence Settings UI" level="ui">
-<!-- collection is really a component. Need to move down a directory-->
-<component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
-<unit bldFile="/mw/legacypresence/presencesettingsui/group"/>
-</component>
-</collection>
 <collection id="simpleengine" name="SIMPLE Engine" level="engine">
 <!-- collection is really a component. Need to move down a directory-->
 <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
@@ -4438,7 +4461,7 @@
 </collection>
 <collection id="qcpix" name="Qt CPIX" level="engine">
 <component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
-<unit bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
 </component>
 </collection>
 <collection id="searchsrv_info" name="Search Services Info">
@@ -4525,21 +4548,6 @@
 <component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
 <unit bldFile="/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
 </component>
-<component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
-<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-</component>
-<component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
-<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-</component>
-<component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
-<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-</component>
-<component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
-<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-</component>
-<component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
-<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-</component>
 <component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
 <unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
 </component>
@@ -4623,23 +4631,6 @@
 <unit bldFile="/mw/remotemgmt/omaprovisioning/provisioning/group"/>
 </component>
 </collection>
-<collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
-<component id="diagframework" filter="s60" name="Diagnostics Framework">
-<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-</component>
-<component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
-<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-</component>
-<component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
-<!--  can only have one unit, merge or split into two components -->
-<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-</component>
-<component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
-<!--  need to distribute exports, etc into the other components and remove this-->
-<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/group"/>
-</component>
-</collection>
 <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
 <component id="dcmoclient" filter="s60" name="DCMO Client">
 <unit bldFile="/mw/remotemgmt/dcmofw/dcmoclient/group"/>
@@ -4656,20 +4647,25 @@
 </component>
 </collection>
 <collection id="fotaapplication" name="FOTA Application" level="generic">
-<component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
-<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-<unit bldFile="/mw/remotemgmt/fotaapplication/group"/>
-</component>
 <component id="fotaserver" filter="s60" name="FOTA Server">
 <meta rel="config">
 <defined condition="__SYNCML_DM_FOTA"/>
 </meta>
-<!-- uncomment when #ifdefs are resolved -->
-<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+<unit bldFile="/mw/remotemgmt/fotaapplication/fotaserver/group"/>
 </component>
 <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
-<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+<meta rel="config">
+<defined condition="__SYNCML_DM"/>
+<not-defined condition="__PLUG_AND_PLAY_MOBILE_SERVICES"/>
+</meta>
+<unit bldFile="/mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
+</component>
+<!-- really need to find a better way to do this -->
+<component id="fotacustcmds-alt" filter="s60" name="FOTA Custom Commands">
+<meta rel="config">
+<defined condition="__PLUG_AND_PLAY_MOBILE_SERVICES"/>
+</meta>
+<unit bldFile="/mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
 </component>
 </collection>
 </package>
@@ -4844,31 +4840,31 @@
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
 </component>
 <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
 </component>
 <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpcommonui/group"/>
 </component>
 <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
 </component>
 <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
 </component>
 <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
 <unit bldFile="/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
@@ -4877,7 +4873,7 @@
 <unit bldFile="/mw/dlnasrv/upnpframework/upnpcommand/group"/>
 </component>
 <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one of above components -->
+<!-- move exports content into one or more of above components -->
 <unit bldFile="/mw/dlnasrv/upnpframework/group"/>
 </component>
 </collection>
@@ -4889,21 +4885,24 @@
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpsettings/multiselectionui/group"/>
 </component>
 <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpsettings/appwizard/group"/>
 </component>
 <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
 </component>
 <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+<meta rel="config">
+<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+</meta>
 <unit bldFile="/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
 </component>
 <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
@@ -4944,20 +4943,20 @@
 </meta>
 <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
 <!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
-        <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
+<unit bldFile="/mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
+<unit bldFile="/mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
+<unit bldFile="/mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
 </component>
 <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+<unit bldFile="/mw/dlnasrv/upnpharvester/cdssync/common"/>
 </component>
 <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpharvester/mdhserver/group"/>
 </component>
 <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
 <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<!--<unit bldFile="upnpharvester/group"/>-->
+<unit bldFile="/mw/dlnasrv/upnpharvester/group"/>
 </component>
 </collection>
 <collection id="homesync" name="Home Sync" level="plugin">
@@ -4965,7 +4964,7 @@
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
 <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="homesync/group"/>-->
+<unit bldFile="/mw/dlnasrv/homesync/group"/>
 <!-- move bld.inf into contentmanager dir -->
 </component>
 </collection>
@@ -4975,14 +4974,10 @@
 </meta>
 <!-- collection is really just a component. Move down a directory -->
 <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
-<!-- <unit bldFile="homemedia/group"/> -->
+<unit bldFile="/mw/dlnasrv/homemedia/group"/>
 </component>
 </collection>
 <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
-<component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
-<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
-<unit bldFile="/mw/dlnasrv/group"/>
-</component>
 
 </collection>
 </package>
@@ -5037,12 +5032,22 @@
 </component>
 </collection>
 <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+<component id="btnotifclient" filter="s60" name="Bluetooth Notification Client" introduced="^4">
+<!-- cannot put a component under another component. Move up a directory -->
+<unit bldFile="/mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
+</component>
 <component id="bteng" filter="s60" name="Bluetooth Engine">
 <unit bldFile="/mw/btservices/bluetoothengine/bteng/group"/>
 </component>
+<component id="btserviceutil" filter="s60" name="Bluetooth Service Utils" introduced="^4">
+<unit bldFile="/mw/btservices/bluetoothengine/btserviceutil/group"/>
+</component>
 <component id="btnotif" filter="s60" name="Bluetooth Notifier">
 <unit bldFile="/mw/btservices/bluetoothengine/btnotif/group"/>
 </component>
+<component id="btdevicedialogplugin" filter="s60" name="Bluetooth Device Dialog Plugin" class="plugin" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/btservices/bluetoothengine/btnotif/btdevicedialogplugin" qt:proFile="btdevicedialogplugin.pro"/>
+</component>
 <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
 <unit bldFile="/mw/btservices/bluetoothengine/btaudioman/group"/>
 </component>
@@ -5059,7 +5064,7 @@
 <unit bldFile="/mw/btservices/bluetoothengine/btsap/group"/>
 </component>
 <component id="btui" filter="s60" name="Bluetooth UI">
-<unit bldFile="/mw/btservices/bluetoothengine/btui/group"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/btservices/bluetoothengine/btui" qt:proFile="btui.pro"/>
 </component>
 <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
 <unit bldFile="/mw/btservices/bluetoothengine/btpbap/group"/>
@@ -5070,12 +5075,6 @@
 <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
 <unit bldFile="/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
 </component>
-<component id="btserviceutil" filter="s60" name="Bluetooth Service Utils">
-<unit bldFile="/mw/btservices/bluetoothengine/btserviceutil/group"/>
-</component>
-<component id="btnotifclient" filter="s60" name="Bluetooth Notifier Client">
-<unit bldFile="/mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
-</component>
 </collection>
 <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
 <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
@@ -5162,15 +5161,15 @@
 <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
 <unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
 <unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5180,9 +5179,6 @@
 </component>
 </collection>
 <collection id="usbuis" name="USB UIs" level="specific">
-<component id="usbui" filter="s60" name="USB UI">
-<unit bldFile="/mw/usbservices/usbuis/usbui/group"/>
-</component>
 <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
 <unit bldFile="/mw/usbservices/usbuis/usbuinotif/group"/>
 </component>
@@ -5192,8 +5188,11 @@
 <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
 <unit bldFile="/mw/usbservices/usbuis/imageprintui/group"/>
 </component>
-<component id="usbuiqt" name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="/mw/usbservices/usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
+<component id="usbsettingsapp" name="USB Settings Application" introduced="^4" filter="s60">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/usbservices/usbuis/usbsettingsapp" qt:proFile="usbsettingsapp.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="usbindicatorplugin" name="USB Indicator Plugin" introduced="^4" filter="s60" class="plugin">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/usbservices/usbuis/usbindicatorplugin" qt:proFile="usbindicatorplugin.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="usbservices_test" name="USB Services Test" level="server">
@@ -5238,6 +5237,10 @@
 <component id="obexsendservices" name="OBEX Send Services">
 <unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
 </component>
+<component id="obexhighway" name="OBEX Highway" introduced="^4">
+<!-- component must be moved to its own directory. Components cannot live in others component's directories -->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/shortlinkconn/localconnectivityservice/obexsendservices/obexhighway" qt:proFile="obexhighway.pro"/>
+</component>
 <component id="obexreceiveservices" name="OBEX Receive Services">
 <unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
 </component>
@@ -5277,7 +5280,7 @@
 <unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
 </component>
 <component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
-<unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
 
 </component>
 </collection>
@@ -5427,8 +5430,7 @@
 <defined condition="RD_MDS_2_5"/>
 </meta>
 <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
-<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-<!--<unit bldFile="clfwrapper/group"/>-->
+<unit bldFile="/mw/mds/clfwrapper/group"/>
 </component>
 </collection>
 <collection id="mds_info" name="Metadata Services Info" level="int">
@@ -5462,12 +5464,6 @@
 <component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
 </component>
-<component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
-<unit bldFile="/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-</component>
-<component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
-<unit bldFile="/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-</component>
 <component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
 </component>
@@ -5483,9 +5479,6 @@
 <component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
 </component>
-<component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
-<unit bldFile="/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-</component>
 <component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
 </component>
@@ -5535,10 +5528,18 @@
 <component id="openmax_al_api" name="OpenMAX AL API" class="api" filter="s60" introduced="^4">
 <unit bldFile="/mw/mmmw/mmmw_plat/openmax_al_api/group"/>
 </component>
+<component id="openmax_al_ext_api" name="OpenMAX AL Extensions API" class="api" filter="s60" introduced="^4">
+<unit bldFile="/mw/mmmw/mmmw_plat/openmax_al_ext_api/group"/>
+</component>
 <component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
 <unit bldFile="/mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
 </component>
 </collection>
+<collection id="khronosfws" name="Khronos Frameworks" level="framework">
+<component id="openmax_al" filter="s60" name="OpenMAX AL" introduced="^4">
+<unit bldFile="/mw/mmmw/khronosfws/openmax_al/group"/>
+</component>
+</collection>
 <collection id="mmfenh" name="MMF Enhancements" level="generic">
 <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
 <unit bldFile="/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
@@ -5558,19 +5559,9 @@
 <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
 <unit bldFile="/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
 </component>
-<component id="progressivedownload" filter="s60" name="Progressive Download">
-<unit bldFile="/mw/mmmw/mmfenh/progressivedownload/group"/>
-</component>
-
-</collection>
-<collection id="mm_fw" name="Multimedia Frameworks" level="framework">
-<!-- Id needs to be unique, mmfw already in use -->
-<!-- Placeholder for OpenAX AL and other stuff -->
+
 </collection>
 <collection id="mmserv" name="Multimedia Services" level="specific">
-<component id="audioeffectsui" filter="s60" name="Audio Effects UI">
-<unit bldFile="/mw/mmmw/mmserv/audioeffectsui/group"/>
-</component>
 <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
 <unit bldFile="/mw/mmmw/mmserv/callaudiocontrol/group"/>
 </component>
@@ -5623,7 +5614,8 @@
 </component>
 <component id="gst_plugins_symbian" filter="s60" name="GStreamer Sybmian Plugins" introduced="^3">
 <!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
-<!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
+
+<!-- add ,pref_test,TA_GSTREAMER filters later -->
 </component>
 </collection>
 <collection id="gstregistrygenerator" name="GStreamer Registry Generator" level="core">
@@ -5745,13 +5737,13 @@
 </component>
 <component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
 <meta rel="config">
-<defined condition="IAD_INCLUDE_BACKSTEPPING"/>
+<defined xmlns:qt="http://www.nokia.com/qt" condition="IAD_INCLUDE_BACKSTEPPING"/>
 </meta>
 <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
 </component>
 <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
 <meta rel="config">
-<defined condition="__WINDOWS_MEDIA"/>
+<defined xmlns:qt="http://www.nokia.com/qt" condition="__WINDOWS_MEDIA"/>
 </meta>
 <unit bldFile="/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
 </component>
@@ -5761,6 +5753,9 @@
 <component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
 <unit bldFile="/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
 </component>
+<component id="qt_telephony_multimedia_service_api" name="Qt Telephony Multimedia Service API" introduced="^4" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/qt_telephony_multimedia_service_api/group"/>
+</component>
 </collection>
 <collection id="mpx" name="Multimedia Player" level="fw">
 <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
@@ -5775,8 +5770,8 @@
 <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
 <unit bldFile="/mw/mmappfw/mpx/viewframework/group"/>
 </component>
-<component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introducde="^4">
-<unit bldFile="/mw/mmappfw/mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
+<component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/mmappfw/mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
 <!--  Move the export to another component or remove the #includes from this one -->
@@ -5785,7 +5780,7 @@
 </collection>
 <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
 <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- 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>
@@ -5806,17 +5801,15 @@
 </component>
 <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
 <meta rel="config">
-<defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
+<defined xmlns:qt="http://www.nokia.com/qt" condition="IAD_INCLUDE_AUDIOFETCHER"/>
 </meta>
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+<unit bldFile="/mw/mmappfw/mmappcomponents/audiofetcher/group"/>
 </component>
 <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
 <meta rel="config">
-<defined condition="__WINDOWS_MEDIA"/>
+<defined xmlns:qt="http://www.nokia.com/qt" condition="__WINDOWS_MEDIA"/>
 </meta>
-<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+<unit bldFile="/mw/mmappfw/mmappcomponents/asxparser/group"/>
 </component>
 <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
 <unit bldFile="/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
@@ -5828,6 +5821,12 @@
 <unit bldFile="/mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
 </component>
 </collection>
+<collection id="qtms" name="Qt Telephony Multimedia Services" level="fw">
+<component id="qtms_build" filter="s60" name="Qt Telephony Multimedia Services Build" introduced="^4">
+<!--  Collection is really a component. Move down a dir -->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/mmappfw/qtms" qt:proFile="qtmsapi.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
 <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
 <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
 <!--  Move the export to another component or remove the #includes from this one -->
@@ -5838,22 +5837,29 @@
 </component>
 </collection>
 </package>
-<package id="hgwidgets" level="specific" tech-domain="mm" name="HG Widgets" levels="framework service api">
-<collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
+<package id="hgwidgets" level="specific" tech-domain="mm" name="Multimedia Widgets" levels="framework service api">
+<collection id="hgwidgets_plat" name="Multimedia Widgets Platform Interfaces" level="api">
 <component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
 <!-- should separate out unit -->
 </component>
-</collection>
-<collection id="hgwidgets_pub" name="HG Widgets Public Interfaces" level="api"/>
+<component id="hgcacheproxymodel_api" name="Hg Cache Proxy Model API" class="api" introduced="^4">
+<!-- should separate out unit -->
+</component>
+<component id="hgwidgets_plat_build" name="Multimedia Widgets Platform Interfaces Build" class="api" introduced="^4">
+<!-- break this up into separate components -->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hgwidgets/hgwidgets_plat" qt:proFile="hgwidgets_plat.pro"/>
+</component>
+</collection>
 <collection id="ganeswidgets" name="Ganes Widgets" level="service">
 <!-- really a component, should move down a dir level and have a unit -->
 <component id="ganeswidgets_build" name="Ganes Widgets Build" introduced="^4">
-<!-- should separate out unit -->
-</component>
-</collection>
-<collection id="hgwidgets_info" name="HG Widgets Info" level="framework">
-<component id="hgwidgets_build" name="HG Widgets Build" introduced="^4">
-<unit bldFile="/mw/hgwidgets" qt:proFile="hgwidgets.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hgwidgets/ganeswidgets" qt:proFile="ganeswidgets.pro"/>
+</component>
+</collection>
+<collection id="hgcacheproxymodel" name="Hurriganes Cache Proxy Model" level="framework">
+<!-- really a component, should move down a dir level and have a unit -->
+<component id="hgcacheproxymodel_build" name="Hurriganes Cache Proxy Model Build" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hgwidgets/hgcacheproxymodel" qt:proFile="hgcacheproxymodel.pro"/>
 </component>
 </collection>
 </package>
@@ -5912,8 +5918,7 @@
 <meta rel="config">
 <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
 </meta>
-<!--uncomment when configuration is turned on and textinput_build is removed-->
-<!--  <unit bldFile="textinput/ptienginev2/group"/>-->
+<unit bldFile="/mw/inputmethods/textinput/ptienginev2/group"/>
 </component>
 <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
 <unit bldFile="/mw/inputmethods/textinput/akninputlanguage/group"/>
@@ -5921,19 +5926,6 @@
 <component id="peninputarc" filter="s60" name="Pen Input Arc">
 <unit bldFile="/mw/inputmethods/textinput/peninputarc/group"/>
 </component>
-<component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
-<unit bldFile="/mw/inputmethods/textinput/peninputcommonctrls/group"/>
-</component>
-<component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
-<unit bldFile="/mw/inputmethods/textinput/peninputcommonlayout/group"/>
-</component>
-<component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
-<unit bldFile="/mw/inputmethods/textinput/peninputhwrtrui/group"/>
-</component>
-<component id="textinput_build" filter="s60" name="Text Input Build">
-<!--needed for #ifdef, can be removed when configuration is implemented -->
-<unit bldFile="/mw/inputmethods/textinput/group"/>
-</component>
 </collection>
 <collection id="fep" name="FEP" level="engine">
 <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
@@ -5958,18 +5950,14 @@
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<unit bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r -config sgimagelite_support"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
 </component>
 </collection>
 <collection id="qtdemos" name="Qt Demos" level="app">
-<component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
-</component>
+
 </collection>
 <collection id="qtexamples" name="Qt Examples" level="app">
-<component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
-</component>
+
 </collection>
 <collection id="qt_tests" name="Qt Tests" level="app">
 
@@ -5979,50 +5967,50 @@
 <package id="qtextensions" level="generic" tech-domain="ui" name="Qt Extensions" levels="tool mw app">
 <collection id="qtecomplugins" name="Qt ECom Plugins" level="app">
 <component id="qtecomplugins_build" filter="qtecomplugins" name="Qt ECom Plugin" purpose="development" introduced="^4" class="plugin">
-<unit bldFile="/mw/qtextensions/qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="qtextensions_examples" filter="qtextensionsexamples" name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit bldFile="/mw/qtextensions/qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="qthighway" name="Qt Highway" level="app">
 <component id="qthighway_build" filter="qthighway" name="Qt Highway" purpose="development" introduced="^4">
-<unit bldFile="/mw/qtextensions/qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="qthighway_examples" filter="qtextensionsexamples" name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit bldFile="/mw/qtextensions/qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 
 </collection>
 <collection id="qtmobileextensions" name="Qt Mobile Extensions" level="app">
 <component id="qtmobileextensions_build" filter="qtextension" name="Qt Mobile Extensions" purpose="development" introduced="^4">
-<unit bldFile="/mw/qtextensions/qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="qtmobileextensions_examples" filter="qtextensionsexamples" name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit bldFile="/mw/qtextensions/qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="qtmobility" name="Qt Mobility" level="mw">
 <component id="qtmobility_build" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
-<unit bldFile="/mw/qtextensions/qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="qtmobility_examples" filter="qtextensionsexamples" name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit bldFile="/mw/qtextensions/qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 
 </collection>
 <collection id="qhbstyle" level="mw" name="Qt Orbit Style">
 <component id="qhbstyle_build" name="Qt Orbit Style Build" introduced="^4">
-<unit bldFile="/mw/qtextensions/qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
 </component>
 </collection>
 <collection id="qtextensions_info" name="Qt Extensions Info" level="app">
-<component id="qtextensions_conf" name="Qt Extensions Confgure" class="conf" introduced="^4" filter="qt_tools">
+<component id="qtextensions_conf" name="Qt Extensions Confgure" class="config" introduced="^4" filter="qt_tools">
 <unit bldFile="/mw/qtextensions/group"/>
 </component>
 <component id="qtextensions_build" name="Qt Extensions Build" introduced="^4">
 <!-- break this up into the above collections-->
-<unit bldFile="/mw/qtextensions" qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions" qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
@@ -6030,15 +6018,12 @@
 <collection id="hb_info" name="Orbit Info" level="api">
 <component id="hb_build" name="Orbit Build" introduced="^4">
 <!-- should break this down into actual components -->
-<unit bldFile="/mw/hb" qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hb" qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
 </component>
 </collection>
 </package>
 <package id="classicui" level="generic" tech-domain="ui" name="Classic UI" levels="base support server generic specific">
 <collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
-<component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
-<unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/group"/>
-</component>
 <component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
 
@@ -6063,16 +6048,10 @@
 <unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
 
 </component>
-<component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
-<unit bldFile="/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-</component>
 <component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
 
 </component>
-<component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
-<unit bldFile="/mw/classicui/classicui_plat/personalisation_application_api/group"/>
-</component>
 <component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
 
@@ -6113,9 +6092,6 @@
 <unit bldFile="/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
 
 </component>
-<component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
-<unit bldFile="/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-</component>
 <component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
 </component>
@@ -6175,9 +6151,6 @@
 <component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
 </component>
-<component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
-<unit bldFile="/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-</component>
 <component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
 
@@ -6355,6 +6328,12 @@
 <unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
 
 </component>
+<component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/directory_localizer_api/group"/>
+</component>
+<component id="findutil_api" class="api" name="Find Util API" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/findutil_api/group"/>
+</component>
 </collection>
 <collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
 <component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
@@ -6638,12 +6617,6 @@
 <unit bldFile="/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
 </component>
 </collection>
-<collection id="psln" name="Personalization" level="specific">
-<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-<component id="psln_build" filter="s60" name="Personalization Build">
-<unit bldFile="/mw/classicui/psln/group"/>
-</component>
-</collection>
 <collection id="commonadapter" name="Common Adapter" level="support">
 <!-- the collection is really a component. Move down a directory.-->
 <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
@@ -6913,10 +6886,10 @@
 <component id="fontprovider" filter="s60" name="Font Provider">
 <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component id="fontutils" filter="sf_build" name="Font Utils">
 <unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -6979,7 +6952,7 @@
 <collection id="platformthemes_info" name="Platform Themes Info">
 <component id="platformthemes_build" name="Platform Themes Build">
 <!-- no real structure in this package. Should break into collections / components -->
-<unit bldFile="/mw/platformthemes" qt:proFile="platformthemes.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/platformthemes" qt:proFile="platformthemes.pro"/>
 </component>
 </collection>
 </package>
@@ -6994,47 +6967,37 @@
 </collection>
 <collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
 <component id="ftuwizardmodel_api" name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 <component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
 <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
 </component>
-<component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
-<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-</component>
-<component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
-<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
-</component>
-<component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
-<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
-</component>
-<component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
-<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
-</component>
-<component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
-<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
-</component>
 <component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
 <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
 </component>
 </collection>
-<collection id="gssettingsuis" name="General Settings UIs" level="framework">
-<component id="gs" filter="s60" name="General Settings" introduced="9.2">
-<unit bldFile="/mw/gsprofilesrv/gssettingsuis/gs/group"/>
-</component>
-</collection>
 <collection id="ftuwizardmodel" name="FTU Wizard Model" level="generic">
 <component id="ftuwizardmodel_build" name="FTU Wizardmodel Build" filter="bldfirst">
-<unit bldFile="/mw/gsprofilesrv/ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/gsprofilesrv/ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 <collection id="controlpanel" name="Control Panel" level="generic">
 
 <component id="controlpanel_rom" name="Control Panel ROM" filter="s60">
-<unit bldFile="/mw/gsprofilesrv/controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
+<!-- Need to create a real .pro file for this 
+	  <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component id="controlpanel_config" name="Control Panel Config" filter="s60" class="config" introduced="^4">
+<!-- Need to create a real .pro file for this 
+	  <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 <component id="controlpanel_source" name="Control Panel Source" filter="s60">
-<unit bldFile="/mw/gsprofilesrv/controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
+<!-- Uncomment when controlpanel_build is removed
+	  <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
+</component>
+<component id="controlpanel_build" name="Control Panel Build" filter="s60">
+<!-- need to make included .pri file into a real .pro file -->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/gsprofilesrv/controlpanel" qt:qmakeArgs="-r -config rom" qt:proFile="controlpanel.pro"/>
 </component>
 </collection>
 <collection id="profilesservices" name="Profiles Services" level="server">
@@ -7046,46 +7009,37 @@
 <package id="homescreensrv" level="specific" tech-domain="ui" name="Home Screen Services" levels="plugin framework server generic specific">
 <collection id="appfoundation" name="App Foundation" level="generic">
 <component id="appfoundation_build" name="App Foundation Build" introduced="^4">
-<unit bldFile="/mw/homescreensrv/appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
 </component>
 </collection>
 <collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
 <component id="hswidgetmodel_build" name="Home Screen Widget Model Build" introduced="^4">
-<unit bldFile="/mw/homescreensrv/hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
 </component>
 </collection>
 <collection id="contentstorage" name="Content Storage" level="framework">
 <component id="cautils" name="Content Arsenal Utils" introduced="^4">
-<unit bldFile="/mw/homescreensrv/contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
 </component>
 <component id="contentstorage_build" name="Content Storage Build" introduced="^4">
-<unit bldFile="/mw/homescreensrv/contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
 </component>
 <component id="casrv/calocalizerscanner" name="Content Arsenal Server Localizer Scanner" introduced="^4">
-<unit bldFile="/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
 </component>
 <component id="cahandler" name="Content Arsenal Handler" introduced="^4">
-<unit bldFile="/mw/homescreensrv/contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
 </component>
 <component id="caclient" name="Content Arsenal Client" introduced="^4">
-<unit bldFile="/mw/homescreensrv/contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
+</component>
+<component id="casoftwareregistry" name="Content Arsenal Software Registry" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/casoftwareregistry" qt:qmakeArgs="-r" qt:proFile="casoftwareregistry.pro"/>
 </component>
 </collection>
 <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
 <component id="homescreensrv_plat_build" name="Home Screen Services Platform Interfaces build" introduced="^4">
-<unit bldFile="/mw/homescreensrv/homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
-</component>
-<component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
-<unit base="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api"/>
-</component>
-<component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
-<unit base="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api"/>
-</component>
-<component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
-<unit base="/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing"/>
-</component>
-<component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
-<unit base="/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
 </component>
 <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
 <unit base="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api"/>
@@ -7106,19 +7060,25 @@
 <unit base="/mw/homescreensrv/homescreensrv_plat/homescreen_information_api"/>
 </component>
 </collection>
-<collection id="hsactivityfw" name="Activity Framework" level="activityfw">
+<collection id="hsactivityfw" name="Activity Framework" level="fw">
 <component id="hsactivityfw_build" name="Activity Framework Build" introduced="^4">
-<unit bldFile="/mw/homescreensrv/activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
+</component>
+</collection>
+<collection id="tstaskmonitor" name="Task Switcher Task Monitor" level="fw">
+<!-- move collection down to a component directory or split up into component .pro files -->
+<component id="tstaskmonitor_build" name="Task Switcher Task Monitor Build" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/tstaskmonitor" qt:qmakeArgs="-r" qt:proFile="tstaskmonitor.pro"/>
 </component>
 </collection>
 <collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
 <component id="hsappkeyhandler_build" name="Appplication Key Handler Build" introduced="^4">
-<unit bldFile="/mw/homescreensrv/hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
 </component>
 </collection>
 <collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
 <component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
-<unit bldFile="/mw/homescreensrv" qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv" qt:qmakeArgs="-r" qt:proFile="homescreensrv_exports_to_rom.pri"/>
 </component>
 <component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
 <unit bldFile="/mw/homescreensrv/group"/>
@@ -7129,10 +7089,13 @@
 <package id="homescreensrvlegacy" level="generic" tech-domain="ui" name="Legacy Home Screen Services" levels="plugin framework server generic specific">
 <collection id="homescreensrvlegacy_plat" name="Legacy Home Screen Services Platform Interfaces" level="specific">
 <component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
-<unit bldFile="/mw/homescreensrvlegacy/ai_content_model_api/group" qt:proFile="group.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrvlegacy/ai_content_model_api/group" qt:proFile="group.pro"/>
 </component>
 <component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
-<unit bldFile="/mw/homescreensrvlegacy/ai_plugin_information_api/group" qt:proFile="group.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrvlegacy/ai_plugin_information_api/group" qt:proFile="group.pro"/>
+</component>
+<component id="content_harvester_plugin_api" name="Content Harvester Plugin API " class="api" filter="s60">
+<unit bldFile="/mw/homescreensrvlegacy/content_harvester_plugin_api/group"/>
 </component>
 </collection>
 </package>
@@ -7162,9 +7125,6 @@
 <component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
 <unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
 </component>
-<component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
-<unit bldFile="/mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-</component>
 <component id="sifui_api" name="STIF UI API" class="api" filter="s60">
 <unit bldFile="/mw/appinstall/appinstall_plat/sifui_api/group"/>
 </component>
@@ -7175,13 +7135,7 @@
 </component>
 </collection>
 <collection id="ncdengine" name="Nokia Content Discover" level="framework">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
-<unit bldFile="/mw/appinstall/ncdengine/engine/group"/>
-</component>
-<component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
-<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-</component>
+<!-- collection is really just a component. Move down one diretcory -->
 <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
 <unit bldFile="/mw/appinstall/ncdengine/group"/>
 </component>
@@ -7190,6 +7144,9 @@
 <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
 <unit bldFile="/mw/appinstall/appinstaller/appinstui/group"/>
 </component>
+<component id="appinstui_qt" filter="s60" name="Application Installer Qt UI" introduced="^2">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/appinstall/appinstaller/appinstui" qt:proFile="appinstui.pro" qt:qmakeArgs="-r"/>
+</component>
 </collection>
 <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
 <!-- the collection is really a component. Move down a directory.-->
@@ -7198,12 +7155,9 @@
 </component>
 </collection>
 <collection id="iaupdate" name="Independent Apps Update" level="api">
-<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component id="iad" name="Software Update" filter="s60" introduced="^2">
-<unit bldFile="/mw/appinstall/iaupdate/iad/group"/>
-</component>
-<component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
-<unit bldFile="/mw/appinstall/iaupdate/help/group"/>
+<!-- Should reorganise into actual components -->
+<component id="iad" name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/appinstall/iaupdate" qt:proFile="iaupdate.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
 <unit bldFile="/mw/appinstall/iaupdate/group"/>
@@ -7252,7 +7206,6 @@
 </collection>
 <collection id="appinstall_info" name="Application Installation Info" level="api">
 
-
 <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
 </component>
@@ -7313,8 +7266,9 @@
 <package id="serviceapi" level="specific" tech-domain="rt" name="Service API" levels="os mw1 mw2 app">
 <!-- should break up this collection into something meaningful -->
 <collection id="serviceproviders" name="Service Providers" level="mw1">
+<!-- are commented out components to be removed? -->
 <component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI" filter="s60" class="plugin">
-<unit bldFile="/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+<!--<unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>-->
 </component>
 <component id="sapi_location" name="Location SAPI" filter="s60" class="plugin">
 <unit bldFile="/mw/serviceapi/serviceproviders/sapi_location/group"/>
@@ -7326,13 +7280,13 @@
 <unit bldFile="/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
 </component>
 <component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
-<unit bldFile="/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+<!-- <unit bldFile="serviceproviders/sapi_messaging/group"/> -->
 </component>
 <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
-<unit bldFile="/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+<!--  <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>-->
 </component>
 <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
-<unit bldFile="/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+<!-- <unit bldFile="serviceproviders/sapi_calendar/group"/> -->
 </component>
 <component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
 <unit bldFile="/mw/serviceapi/serviceproviders/sapi_logging/group"/>
@@ -7358,7 +7312,7 @@
 <package id="browser" level="specific" tech-domain="rt" name="Browser" levels="plugin utils support main">
 <collection id="bookmarksengine" name="Bookmarks Engine" level="support">
 <component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4">
-<unit bldFile="/mw/browser/bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/browser/bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
 </component>
 </collection>
 </package>
@@ -7439,12 +7393,6 @@
 <unit bldFile="/mw/web/web_plat/xml_parser_api/group"/>
 </component>
 </collection>
-<collection id="web_info" name="Web Info" level="specific">
-<component id="web_build" filter="s60" 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 id="browserutilities" name="Browser Utilities" level="utils">
 <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
 <unit bldFile="/mw/web/browserutilities/browserdialogsprovider/group"/>
@@ -7477,8 +7425,7 @@
 <meta rel="config">
 <defined condition="BRDO_MULTIPART_PARSER_FF"/>
 </meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+<unit bldFile="/mw/web/browserutilities/multipartparser/group"/>
 </component>
 <component id="schemehandler" filter="s60" name="Scheme Handler">
 <unit bldFile="/mw/web/browserutilities/schemehandler/group"/>
@@ -7489,10 +7436,6 @@
 <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
 <unit bldFile="/mw/web/browserutilities/aiwbrowserprovider/group"/>
 </component>
-<component id="browserutilities_build" filter="s60" 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 id="webengine" name="Web Engine" level="server">
 <component id="osswebengine" filter="s60" name="OSS Web Engine">
@@ -7567,7 +7510,7 @@
 <unit bldFile="/mw/web/codhandler/roapapp/group"/>
 </component>
 <component id="codhandler_build" filter="s60" name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- 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>
@@ -7577,35 +7520,29 @@
 <defined condition="RD_BROWSER_WIDGETS"/>
 <defined condition="__WEB_WIDGETS"/>
 </meta>
-<!-- the following units can be uncommented when configuration is put in place -->
 <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
-<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+<unit bldFile="/mw/web/widgets/widgetrecognizer/group"/>
 </component>
 <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
-<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+<unit bldFile="/mw/web/widgets/widgetinstaller/group"/>
 </component>
 <component id="widgetlauncher" filter="s60" name="Widget Launcher">
-<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+<unit bldFile="/mw/web/widgets/widgetlauncher/group"/>
 </component>
 <component id="widgetapp" filter="s60" name="Widget UI">
-<!--<unit bldFile="widgets/widgetapp/group"/>-->
+<unit bldFile="/mw/web/widgets/widgetapp/group"/>
 </component>
 <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
 <meta rel="config">
 <defined condition="RD_WIDGET_PREINSTALLER"/>
 </meta>
-<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+<unit bldFile="/mw/web/widgets/widgetpreinstaller/group"/>
 </component>
 <component id="widgetstartup" filter="s60" name="Widget Startup">
 <meta rel="config">
 <defined condition="RD_WIDGET_PREINSTALLER"/>
 </meta>
-<!--<unit bldFile="widgets/widgetstartup/group"/>-->
-</component>
-<component id="widgets_build" filter="s60" name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
-      		#included .hrh file needs to be #included in each of the other components -->
-<unit bldFile="/mw/web/widgets/group"/>
+<unit bldFile="/mw/web/widgets/widgetstartup/group"/>
 </component>
 </collection>
 </package>
@@ -7729,17 +7666,17 @@
 </collection>
 </package>
 <package id="webruntime" level="specific" tech-domain="rt" name="Web Runtime">
-<!-- need to break up this package nito collections and components -->
+<!-- need to break up this package into collections and components -->
 <collection id="webruntime_info" name="Web Runtime Info">
 <component id="webruntime_build" name="Web Runtime Build" introduced="^4">
-<unit bldFile="/mw/webruntime" qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/webruntime" qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=qtsfw&quot; &quot;what+=qt_unstable&quot; &quot;what+=tenone&quot; &quot;what+=usif&quot; &quot;what+=services&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
 </component>
 </collection>
 </package>
 <package id="platformtools" level="generic" tech-domain="to" name="Platform Tools">
 <collection id="gfxconversion" name="Graphics Conversion">
 <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
-<unit bldFile="/mw/platformtools/gfxconversion/bmconv_s60/group"/>
+<!-- Removed bmconv from builds     <unit bldFile="gfxconversion/bmconv_s60/group"/>   -->
 </component>
 <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
 <unit bldFile="/mw/platformtools/gfxconversion/mifconv/group"/>
@@ -7806,19 +7743,19 @@
 <package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc api">
 <collection id="location_plat" name="Location Apps Platform Interfaces" level="api">
 <component id="location_picker_service_api" name="Location Picker Service API" introduced="^4" class="api" filter="s60">
-<unit bldFile="/app/location/location_plat" qt:proFile="location_plat.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/location_plat" qt:proFile="location_plat.pro"/>
 </component>
 </collection>
 <collection id="locationpickerservice" name="Location Picker Service" level="loc">
 <!--collection is really a component. Should move down a directory -->
 <component id="locationpickerservice_build" filter="s60" name="Location Picker Service Build" introduced="^4">
-<unit bldFile="/app/location/locationpickerservice" qt:proFile="locationpickerservice.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/locationpickerservice" qt:proFile="locationpickerservice.pro"/>
 </component>
 </collection>
 <collection id="locationdataharvester" name="Location Data Harvester" level="events">
 <!--collection is really a component. Should move down a directory -->
 <component id="locationdataharvester_build" name="Location Data Harvester Build" filter="s60" introduced="^4">
-<unit bldFile="/app/location/locationdataharvester" qt:proFile="locationdataharvester.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/locationdataharvester" qt:proFile="locationdataharvester.pro"/>
 </component>
 </collection>
 </package>
@@ -7844,21 +7781,21 @@
 <unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
 </component>
 <component id="phoneuiview2" filter="s60" name="Phone UI View">
-<unit bldFile="/app/phone/phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
 </component>
 <component id="phoneuiqtviewadapter" filter="s60" name="Phone UI Qt View Adapter" introduced="^4" class="plugin">
-<unit bldFile="/app/phone/phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
 </component>
 <component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
-<unit bldFile="/app/phone/phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
 </component>
 <component id="phoneui2" filter="s60" name="Phone UI">
-<unit bldFile="/app/phone/phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
 </component>
 </collection>
 <collection id="phoneengine" name="Phone Engine" level="engine">
 <component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
-<unit bldFile="/app/phone/phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
 </component>
 <component id="audiohandling" filter="s60" name="Phone Audio Handling">
 <unit bldFile="/app/phone/phoneengine/audiohandling/group"/>
@@ -7876,21 +7813,21 @@
 <unit bldFile="/app/phone/phoneengine/engineinfo/group"/>
 </component>
 <component id="phonemodel" filter="s60" name="Phone Model">
-<unit bldFile="/app/phone/phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
 </component>
 <component id="servicehandling" filter="s60" name="Phone Service Handling">
 <unit bldFile="/app/phone/phoneengine/servicehandling/group"/>
 </component>
 <component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
-<unit bldFile="/app/phone/phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
 </component>
 <component id="parserrecognizer" filter="s60" name="Parser Recognizer" introduced="^4" class="plugin">
-<unit bldFile="/app/phone/phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
 </component>
 </collection>
 <collection id="phoneuis" name="Phone UIs" level="ui">
 <component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
-<unit bldFile="/app/phone/phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
 </component>
 <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
 <unit bldFile="/app/phone/phoneuis/telephonydevicemode/group"/>
@@ -7945,15 +7882,15 @@
 <unit bldFile="/app/phone/phoneplugins/csplugin/group"/>
 </component>
 <component id="hsdialerwidgetplugin" filter="s60" name="Home Screen Dialer Widget Plugin" class="plugin" introduced="^4">
-<unit bldFile="/app/phone/phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
 </component>
 <component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
-<unit bldFile="/app/phone/phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
 </component>
 </collection>
 <collection id="phonesettings" name="Phone Settings" level="plugin">
 <component id="cpphonesettingsplugins" filter="s60" name="CP Phone Settings Plugins" class="plugin" introduced="^4">
-<unit bldFile="/app/phone/phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
 </component>
 </collection>
 </package>
@@ -7973,22 +7910,34 @@
 </component>
 </collection>
 <collection id="logsui" name="Logs UI" level="ui">
+<!-- split into actual components -->
+<component id="logsservices" filter="s60" name="Logs Services" introduced="^4">
+<!-- <unit bldFile="logsui/logsservices" qt:proFile="logsui.pro"/> -->
+</component>
+<component id="logscntfinder" filter="s60" name="Logs Contact finder">
+<!--<unit bldFile="logsui/logscntfinder" qt:proFile="logscntfinder.pro"/> -->
+</component>
+<component id="logsengine" filter="s60" name="Logs Engine" introduced="^4">
+<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+</component>
+<component id="logsapp" filter="s60" name="Logs Application">
+<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+</component>
 <component id="logsui_build" filter="s60" name="Logs UI Build">
-<!-- component at too high a rank, should move down one directory -->
-<unit bldFile="/app/recents/logsui" qt:proFile="logsui.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/recents/logsui" qt:proFile="logsui.pro"/>
 </component>
 </collection>
 </package>
 <package id="settingsuis" level="services" tech-domain="dm" name="Settings UIs" levels="plugin ui">
 <collection id="controlpanelplugins" name="Control Panel Plugins" level="plugin">
 <component id="themeplugin" filter="s60" name="Theme Plugin" introduced="^4">
-<unit bldFile="/app/settingsuis/controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/settingsuis/controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 <collection id="controlpanelui" name="Control Panel UI" level="ui">
 <!-- collection is really a component, move down a dir -->
 <component id="controlpanelui_build" filter="s60" name="Control Panel UI Build" introduced="^4">
-<unit bldFile="/app/settingsuis/controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/settingsuis/controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
@@ -8021,7 +7970,7 @@
 <unit bldFile="/app/contentcontrol/omads/omadsextensions/group"/>
 </component>
 <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
-<unit bldFile="/app/contentcontrol/omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contentcontrol/omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
 </component>
 </collection>
 </package>
@@ -8034,7 +7983,7 @@
 <collection id="runtimeproviders" name="Runtime Providers" level="support"/>
 <collection id="firsttimeuse_info" name="First Time Use Info" level="ui">
 <component id="firsttimeuse_build" name="First Time Use Build">
-<unit bldFile="/app/firsttimeuse" qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/firsttimeuse" qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
@@ -8044,19 +7993,19 @@
 <unit bldFile="/app/devicecontrol/deviceupdatesui/adapters/bld"/>
 </component>
 <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
-<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
 </component>
 <component id="deviceupdatesplugin" name="Device Updates Plugin" filter="s60" introduced="^4" class="plugin">
-<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
 </component>
 <component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
 </component>
 <component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="/app/devicecontrol/deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
 </component>
 <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
-<unit bldFile="/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
 </component>
 </collection>
 </package>
@@ -8066,13 +8015,17 @@
 <component id="filemanager_plat" name="File Manager Platform Interfaces" class="api" filter="s60" introduced="^4">
 <unit base="/app/files/filemanager/filemanager_plat"/>
 </component>
-<component id="fmbkupengine" filter="s60" name="File Manager Backup Engine" introduced="^4">
+<component id="fmbkupengine" filter="s60,bldfirst" name="File Manager Backup Engine" introduced="^4">
 <unit bldFile="/app/files/filemanager/src/fmbkupengine/group"/>
 </component>
+<component id="fmfiledialog" filter="s60,bldfirst" name="File Manager File Dialog" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/files/filemanager/src/fmfiledialog" qt:proFile="fmfiledialog.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
 <component id="filemanager_build" filter="s60" name="File Manager Build">
 <!-- break this up into components or move down a directory -->
-<unit bldFile="/app/files/filemanager" qt:qmakeArgs="-r" qt:proFile="filemanager.pro"/>
-</component>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/files/filemanager" qt:qmakeArgs="-r" qt:proFile="filemanager.pro"/>
+</component>
+
 </collection>
 </package>
 <package id="search" level="apps" tech-domain="pr" name="Search Apps" levels="eng base app api">
@@ -8083,7 +8036,7 @@
 </collection>
 <collection id="searchui" name="Search UI">
 <component id="searchui_build" name="Search UI Build" introduced="^4">
-<unit bldFile="/app/search/searchui" qt:proFile="searchui.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/search/searchui" qt:proFile="searchui.pro"/>
 </component>
 </collection>
 </package>
@@ -8094,8 +8047,8 @@
 </component>
 </collection>
 <collection id="phonebookui" name="Phonebook UI" level="ui">
-<component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
-<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
+<component id="cnthistorymodel" filter="s60" name="Contacts History Model" introduced="^4">
+<!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
 </component>
 <component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
 <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
@@ -8108,39 +8061,37 @@
 </component>
 <component id="phonebookui_build" filter="s60" name="Phonebook UI Build" introduced="^4">
 <!-- break up into components -->
-<unit bldFile="/app/contacts/phonebookui" qt:proFile="phonebookui.pro"/>
-</component>
-</collection>
-<collection id="qtcontactsmobility" name="Qt Contacts Mobility" level="support">
-<component id="qtcontactsmobility_build" filter="s60" name="Qt Contacts Mobility Build" class="plugin" introduced="^4">
-<!-- not really a component, move down a dir? Break up into compnents? -->
-<unit bldFile="/app/contacts/qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookui" qt:proFile="phonebookui.pro"/>
 </component>
 </collection>
 <collection id="phonebookengines" name="Phonebook Engines" level="engine">
 <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
-<unit bldFile="/app/contacts/phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
 </component>
 <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
 <unit version="2" bldFile="/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
 </component>
 <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
-<unit bldFile="/app/contacts/phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
+</component>
+<component id="qtcontactsmobility" filter="s60" name="Qt Contacts Mobility" class="plugin" introduced="^4">
+<!-- need to move to this actual dir rather than including something from another collection -->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
 </component>
 <component id="mobcntmodel" filter="s60" name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="/app/contacts/phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
 </component>
 <component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="/app/contacts/phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
 </component>
 <component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
-<unit bldFile="/app/contacts/phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
 </component>
 <component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
-<unit bldFile="/app/contacts/phonebookengines/simutility" qt:proFile="simutility.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/simutility" qt:proFile="simutility.pro"/>
 </component>
 <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
-<unit bldFile="/app/contacts/phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
 </component>
 </collection>
 <collection id="pimprotocols" name="PIM Protocols" level="services">
@@ -8161,13 +8112,13 @@
 <collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
 <component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
 <!-- move into own .pro file -->
-<unit bldFile="/app/organizer/organizer_pub" qt:proFile="organizer_pub.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/organizer_pub" qt:proFile="organizer_pub.pro"/>
 </component>
 </collection>
 <collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
 <component id="organizer_plat_build" name="Organizer Application Suite Platform Interface Build" class="api" filter="s60">
-<!-- break up into individual .pro files -->
-<unit bldFile="/app/organizer/organizer_plat" qt:proFile="organizer_plat.pro"/>
+<!-- break up into individual .pro files, move the above metaxmls to those components -->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/organizer_plat" qt:proFile="organizer_plat.pro"/>
 </component>
 <component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
 <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
@@ -8194,45 +8145,45 @@
 <collection id="agendainterface" name="Agenda Interface" level="services">
 <!-- collection is really a component, should move down a directory -->
 <component id="agendainterface_build" filter="s60" name="Agenda Interface Build">
-<unit bldFile="/app/organizer/agendainterface" qt:proFile="agendainterface.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/agendainterface" qt:proFile="agendainterface.pro"/>
 </component>
 </collection>
 <collection id="calendarui" name="Calendar UI" level="ui">
 <component id="commonutils" filter="s60" name="Calendar Common Utils">
-<unit bldFile="/app/organizer/calendarui/commonutils" qt:proFile="commonutils.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/commonutils" qt:proFile="commonutils.pro"/>
 </component>
 <component id="calenlauncher" filter="s60" name="Calendar Launcher">
-<unit bldFile="/app/organizer/calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
 </component>
 <component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
-<unit bldFile="/app/organizer/calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
 </component>
 <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4">
-<unit bldFile="/app/organizer/calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
 </component>
 <component id="globaldata" filter="s60" name="Calendar Global Data">
-<unit bldFile="/app/organizer/calendarui/globaldata" qt:proFile="globaldata.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/globaldata" qt:proFile="globaldata.pro"/>
 </component>
 <component id="settings" filter="s60" name="Calendar Settings">
-<unit bldFile="/app/organizer/calendarui/settings" qt:proFile="settings.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/settings" qt:proFile="settings.pro"/>
 </component>
 <component id="calenplugins" filter="s60" name="Calendar Plugins" introduced="^4" class="plugin">
-<unit bldFile="/app/organizer/calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
 </component>
 <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
-<unit bldFile="/app/organizer/calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
 </component>
 <component id="views" filter="s60" name="Calendar Views">
-<unit bldFile="/app/organizer/calendarui/views" qt:proFile="views.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/views" qt:proFile="views.pro"/>
 </component>
 <component id="calendarui_controller" filter="s60" name="Calendar Controller">
-<unit bldFile="/app/organizer/calendarui/controller" qt:proFile="controller.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/controller" qt:proFile="controller.pro"/>
 </component>
 <component id="calendarui_application" filter="s60" name="Calendar Application">
-<unit bldFile="/app/organizer/calendarui/application" qt:proFile="application.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/application" qt:proFile="application.pro"/>
 </component>
 <component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
-<unit bldFile="/app/organizer/calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
 </component>
 <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
 <!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
@@ -8240,10 +8191,10 @@
 </collection>
 <collection id="notes" name="Notes" level="ui">
 <component id="noteseditor" filter="s60" name="Notes Editor" introduced="^4">
-<unit bldFile="/app/organizer/notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
 </component>
 <component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
-<unit bldFile="/app/organizer/notes" qt:proFile="notes.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/notes" qt:proFile="notes.pro"/>
 </component>
 </collection>
 <collection id="calendarengines" name="Calendar Engines" level="engine">
@@ -8274,12 +8225,9 @@
 <component id="clockui" filter="s60" name="Clock UI">
 <!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
 </component>
-<component id="ftudatetimewizard" filter="s60" name="First Time Use Date/Time Wizard" introduced="^4">
-<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-</component>
 <component id="clock_build" filter="s60" name="Clock Build">
 <!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit bldFile="/app/organizer/clock" qt:proFile="clock.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/clock" qt:proFile="clock.pro"/>
 </component>
 </collection>
 <collection id="pimappservices" name="PIM Application Services" level="services">
@@ -8307,7 +8255,7 @@
 <collection id="alarmui" name="Alarm UI" level="app">
 <!-- collection is really a component, should move down a directory -->
 <component id="alarmui_build" filter="s60" name="Alarm UI Build">
-<unit bldFile="/app/organizer/alarmui" qt:proFile="alarmui.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/alarmui" qt:proFile="alarmui.pro"/>
 </component>
 </collection>
 <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
@@ -8353,7 +8301,7 @@
 </component>
 <component id="msg_plat_build" name="Messaging Apps Platform APIs Build" class="api" filter="s60" introduced="^4">
 <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-<unit base="/app/messaging/msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" base="/app/messaging/msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="msg_pub" name="Messaging Apps Public APIs" level="api">
@@ -8365,7 +8313,7 @@
 </component>
 <component id="msg_pub_build" name="Messaging Apps Public APIs Build" class="api" filter="s60" introduced="^4">
 <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-<unit base="/app/messaging/msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" base="/app/messaging/msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="mobilemessaging" name="Mobile Messaging" level="plugin">
@@ -8376,7 +8324,7 @@
 <collection id="messagingappbase" name="Messaging App Base" level="base">
 <component id="messagingappbase_build" filter="s60" name="Messaging App Base Build" introduced="^4">
 <!-- break this up into the below components -->
-<unit bldFile="/app/messaging/messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgmedia" filter="s60" name="Message Media">
 <unit base="/app/messaging/messagingappbase/msgmedia"/>
@@ -8433,34 +8381,36 @@
 </component>
 <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
 <!-- this should be broken up into the individual other components -->
-<unit bldFile="/app/messaging/mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="messagingapp" name="Messaging Application" level="app">
-<component id="messagingapp_build" filter="s60" name="MMS Engine Build">
-<!-- this should be broken up into the individual other components -->
-<unit bldFile="/app/messaging/messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
+<component id="messaging_conf" filter="s60" name="Messaging Application Configuration" class="config" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/conf" qt:proFile="messaging_conf.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
-<unit bldFile="/app/messaging/messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgappfw" filter="s60" name="Messaging Application Framework" introduced="^4">
-<unit bldFile="/app/messaging/messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgsettings" filter="s60" name="Messaging Settings" introduced="^4">
-<unit bldFile="/app/messaging/messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgnotifications" filter="s60" name="Messaging Notifications" introduced="^4">
-<unit bldFile="/app/messaging/messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="smartmessaging" filter="s60" name="Smart Messaging">
-<unit bldFile="/app/messaging/messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="shareui" filter="s60" name="Shared UI" introduced="^4">
-<unit bldFile="/app/messaging/messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
-<unit bldFile="/app/messaging/messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
+</component>
+<component id="msgservices" filter="s60" name="Messaging Services" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgservices" qt:proFile="msgservices.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="email" name="Email" level="plugin">
@@ -8504,6 +8454,9 @@
 <component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
 <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
 </component>
+<component id="nmutilities" filter="s60" name="Nmail Utilities" introduced="^4">
+<!-- <unit bldFile="emailservices/nmutilities" qt:proFile="nmutilities.pro"/> -->
+</component>
 </collection>
 <collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
 <component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
@@ -8554,7 +8507,7 @@
 <collection id="commonemail_info" name="Email Apps Info" level="app">
 <component id="commonemail_build" name="Email Apps Build" introduced="^4">
 <!-- split into actual components -->
-<unit bldFile="/app/commonemail" qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/commonemail" qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
@@ -8562,15 +8515,15 @@
 <collection id="camerauis" name="Camera UIs">
 <component id="cameraxui" filter="s60" name="CameraX UIs">
 <meta rel="testbuild">
-<group name="camera_unit_tests"/>
+<group xmlns:qt="http://www.nokia.com/qt" name="camera_unit_tests"/>
 </meta>
-<unit bldFile="/app/camera/camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/camera/camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
 
 </component>
 </collection>
 </package>
-<!-- <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition.xml"/> -->
-<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
+<package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor"/>
+<package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor"/>
 <package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
 <collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
 <component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
@@ -8585,15 +8538,15 @@
 <unit bldFile="/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
 </component>
 <component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
-<unit bldFile="/app/videoplayer/videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
 </component>
 
 <component id="videocollectionview" filter="s60" name="Video Collection View" introduced="^4">
-<unit bldFile="/app/videoplayer/videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
 </component>
 
 <component id="videofiledetailsview" filter="s60" name="Video File Details View" introduced="^4">
-<unit bldFile="/app/videoplayer/videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="mediasettings" name="Media Settings" level="support">
@@ -8604,18 +8557,18 @@
 </collection>
 <collection id="videoplayerapp" name="Video Player App" level="apps">
 <component id="videoplayerengine" name="Video Player Engine" filter="s60" introduced="^4">
-<unit bldFile="/app/videoplayer/videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="hbvideoplayer" filter="s60" name="HB Video Player" introduced="^4">
-<unit bldFile="/app/videoplayer/videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
 <component id="hbvideoplaybackview" filter="s60" name="HB Video Playback View" class="plugin" introduced="^4">
-<unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="hbvideoplaybackviewplugin" filter="s60" name="HB Video Playback View Plugin" introduced="^4" class="plugin">
-<unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
 <unit bldFile="/app/videoplayer/videoplayback/videohelix/group"/>
@@ -8660,6 +8613,11 @@
 <!--<unit bldFile="main" qt:proFile="main.pro"/> -->
 </component>
 </collection>
+<collection id="gallery" name="Gallery" level="ui">
+<component id="gallery_build" filter="s60" name="Gallery Build" introduced="^4">
+<!--<unit bldFile="gallery" qt:proFile="gallery.pro"/> -->
+</component>
+</collection>
 <collection id="imageviewerapp" name="Image Viewer App" level="support">
 <component id="imageviewerapp_build" filter="s60" name="Image Viewer App Build" introduced="^4">
 <!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
@@ -8668,12 +8626,12 @@
 <collection id="photos_info" name="Photos Info" level="support">
 <component id="photos_build" filter="s60" name="Photos Build" introduced="^4">
 <!--  split this up into the above components  -->
-<unit bldFile="/app/photos" qt:proFile="photos.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/photos" qt:proFile="photos.pro"/>
 </component>
 </collection>
 </package>
-<package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
-<!-- move the export .pri files into their components and uncomment the units -->
+<package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support engine app">
+<!-- move the rom .pri files into their components and uncomment the units -->
 <collection id="musicplayer_utilities " name="Music Player Utilities" level="support">
 <component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
 <!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
@@ -8682,10 +8640,10 @@
 <!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection id="musicfetcher " name="Music Fetcher" level="support">
+<collection id="musicservices " name="Music Services" level="support">
 <!-- collection is really a component, move down a directory -->
-<component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
-<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+<component id="musicservices_build" filter="s60" name="Music Services Build" introduced="^4">
+<!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection id="musicplayer_app " name="Music Player Application" level="app">
@@ -8694,12 +8652,33 @@
 <!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
+<collection id="mpdata " name="Music Player Data" level="support">
+<!-- collection is really a component, move down a directory -->
+<component id="mpdata_build" filter="s60" name="Music Player Data Build" introduced="^4">
+<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection id="mpengine " name="Music Player Engine" level="engine">
+<!-- collection is really a component, move down a directory -->
+<component id="mpengine_build" filter="s60" name="Music Player Engine Build" introduced="^4">
+<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection id="mpviewplugins" name="Music Player View Plugins" level="plugins">
 <component id="mpcollectionviewplugin" filter="s60" name="MP Collection View Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 <component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component id="mpsettingsviewplugin" filter="s60" name="MP Settings View Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpviewplugins/mpsettingsviewplugin" qt:proFile="mpsettingsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component id="mpdetailsviewplugin" filter="s60" name="MP Details View Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpviewplugins/mpdetailsviewplugin" qt:proFile="mpdetailsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+<component id="mpmediawallviewplugin" filter="s60" name="MP Media Wall View Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
@@ -8713,24 +8692,30 @@
 <component id="mpxsqlitedbcommon" filter="s60" name="MPX SQLite Database Common" introduced="^4">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
 </component>
+<component id="mpxsqlitedbhgplugin" filter="s60" name="MPX SQLite Database Hg Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/mpxsqlitedbhgplugin/group"/>-->
+</component>
 <component id="mpxsqlitedbplugin" filter="s60" name="MPX SQLite Database Plugin" introduced="^4" class="plugin">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
 </component>
 <component id="mpxsqlitepodcastdbplugin" filter="s60" name="MPX SQLlite Podcast Database Plugin" introduced="^4" class="plugin">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
 </component>
+<component id="mpxinmemoryplugin" filter="s60" name="MPX In-Memory Plugin" introduced="^4" class="plugin">
+<!--<unit bldFile="mpserviceplugins/mpxinmemoryplugin/group"/>-->
+</component>
 <component id="m3uplaylistplugin" filter="s60" name="M3U Playlist Plugin" introduced="^4" class="plugin">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
 </component>
 </collection>
 <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
 <component id="musicplayer_build" filter="s60" name="Music Player Build">
-<!-- should brak up into individual components  -->
-<unit bldFile="/app/musicplayer" qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
+<!-- break up into individual components. ROM includes should be in their components -->
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/musicplayer" qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
-<package id="radio" level="apps" tech-domain="ma" name="Radio Apps" levels="engine ui">
+<package id="radio" level="apps" tech-domain="ma" name="Radio Apps" levels="engine plugin ui">
 <collection id="radioengine" name="Radio Engine" level="engine">
 <component id="radioengineutils" filter="s60" name="Radio Engine Utils" introduced="^4">
 <unit bldFile="/app/radio/radioengine/utils/group"/>
@@ -8744,24 +8729,35 @@
 </collection>
 <collection id="radioapp" name="Radio App" level="ui">
 <component id="radioenginewrapper" filter="s60" name="Radio Engine Wrapper" introduced="^4">
-<unit bldFile="/app/radio/radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
 </component>
 <component id="radiopresetstorage" filter="s60" name="Radio Preset Storage" introduced="^4">
-<unit bldFile="/app/radio/radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
 </component>
 <component id="radiouiengine" filter="s60" name="Radio UI Engine" introduced="^4">
-<unit bldFile="/app/radio/radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
 </component>
 <component id="radiowidgets" filter="s60" name="Radio Widgets" introduced="^4">
-<unit bldFile="/app/radio/radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
 </component>
 <component id="radioapplication" filter="s60" name="Radio Application" introduced="^4">
-<unit bldFile="/app/radio/radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
 </component>
 <component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4">
 <unit bldFile="/app/radio/rom"/>
 </component>
 </collection>
+<collection id="radio_hswidgetplugin" name="FM Radio Homescreen Widget Plugin" level="plugin">
+<component id="fmradiohswidgetplugin" filter="s60" name="FM Radio HS Widget Plugin" class="plugin" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/hswidgetplugin/fmradiohswidgetplugin" qt:proFile="fmradiohswidgetplugin.pro"/>
+</component>
+<component id="fmradiohswidgetplugininstaller" filter="s60" name="FM Radio HS Widget Plugin Installer" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/hswidgetplugin/fmradiohswidgetplugininstaller" qt:proFile="fmradiohswidgetplugininstaller.pro"/>
+</component>
+<component id="fmradiohswidgetplugin_exports_to_rom" filter="s60" name="FM Radio HS Widget Plugin ROM" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/hswidgetplugin" qt:proFile="fmradiohswidgetplugin_exports_to_rom.pri"/>
+</component>
+</collection>
 </package>
 <package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps" levels="engine server ui">
 <collection id="internetradio2_0" name="Internet Radio 2.0" level="ui">
@@ -8779,7 +8775,7 @@
 <collection id="qtinternetradio" name="Qt Internet Radio">
 <component id="qtinternetradio_build" name="Qt Internet Radio Build">
 <!--  Move down a dir or break into components-->
-<unit bldFile="/app/internetradio/qtinternetradio" qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/internetradio/qtinternetradio" qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 
 </collection>
@@ -8799,40 +8795,50 @@
 </collection>
 </package>
 <package id="homescreen" level="apps" tech-domain="ui" name="Home Screen Apps" levels="support task ss hs">
-<collection id="homescreen_info" name="Home Screen Info" level="support">
-<component id="homescreen_build" name="Homescreen Build">
-<!-- break this up properly into components -->
-<unit bldFile="/app/homescreen" qt:proFile="homescreen.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-</collection>
 <collection id="homescreen_test" name="Home Screen Test" level="support">
 
 </collection>
-<!-- fiill in details with broken up homescreen_build -->
 <collection id="homescreenapp" name="Home Screen Application" level="hs">
-<component id="hsutils" name="Home Screen Utils" introduced="^4"/>
-<component id="hsdomainmodel" name="HS Domain Model" introduced="^4"/>
-<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin"/>
-<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin"/>
-<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin"/>
-<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin"/>
-<component id="hsapplication" name="Home Screen Application" introduced="^4"/>
-<component id="hshomescreenclientplugin" name="Home Screen Client Plugin" introduced="^4" class="plugin"/>
-<component id="hsmenucontentpublish" name="HS Menu Content Publish" introduced="^4"/>
-</collection>
-<collection id="screensaverapp" name="Screen Saver Application" level="ss">
-<component id="snsrutils" name="Screen Saver Utils" introduced="^4"/>
-<component id="snsr_serviceproviders" name="Screen Saver Service Providers" introduced="^4" class="plugin"/>
-<component id="snsr_stateproviders" name="Screen Saver State Providers" introduced="^4" class="plugin"/>
-<component id="snsr_runtimeproviders" name="Screen Saver Runtime Providers" introduced="^4" class="plugin"/>
-<component id="snsrapplication" name="Screen Saver Application" introduced="^4"/>
-<component id="screensaverproviders" name="Screen Saver Providers" introduced="^4" class="plugin"/>
+<component id="hsutils" name="Home Screen Utils" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsutils" qt:proFile="hsutils.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hsdomainmodel" name="HS Domain Model" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsdomainmodel" qt:proFile="hsdomainmodel.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/runtimeplugins" qt:proFile="runtimeplugins.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/serviceproviders" qt:proFile="serviceproviders.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/stateplugins" qt:proFile="stateplugins.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/widgetplugins" qt:proFile="widgetplugins.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hsapplication" name="Home Screen Application" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsapplication" qt:proFile="hsapplication.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hsmenuclientplugin" name="Home Screen Menu Client Plugin" introduced="^4" class="plugin">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsmenuclientplugin" qt:proFile="hsmenuclientplugin.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hshomescreenclientplugin" name="HS Menu Client Plugin" introduced="^4" class="plugin">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hshomescreenclientplugin" qt:proFile="hshomescreenclientplugin.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="hswidgetuninstaller" name="HS Widget Uninstaller" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hswidgetuninstaller" qt:proFile="hswidgetuninstaller.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="homescreenapp_rom" name="Home Screen App ROM" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp" qt:proFile="homescreenapp_exports_to_rom.pri" qt:qmakeArgs="-r -config rom"/>
+</component>
 </collection>
 <collection id="taskswitcherapp" name="Task Switcher Application" level="task">
-<component id="taskswitcherappecom" name="Task Switcher Application ECom" introduced="^4"/>
-<component id="tsserviceplugin" name="Task Switcher Service Plugin" introduced="^4" class="plugin"/>
-<component id="ts_runtimeplugins" name="TS Runtime Plugins" introduced="^4" class="plugin"/>
-<component id="tsapplication" name="Task Switcher Application" introduced="^4"/>
+<!-- break collection info components, or move down a dir and make it a component -->
+<component id="taskswitcherapp_build" name="Task Switcher Application Build">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/taskswitcherapp" qt:proFile="taskswitcherapp.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+<component id="tsdevicedialogplugin" name="Task Switcher Device Dialog Plugin" introduced="^4" class="plugin"/>
 </collection>
 </package>
 <package id="jrt" level="services" tech-domain="rt" name="Java Runtime" levels="util generic rt ui">
@@ -8847,53 +8853,58 @@
 <unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
 </component>
 </collection>
+<collection id="java_stubs" name="Java Stubs" level="rt">
+<component id="java_stubs_build" name="Build Native Java" filter="sf_build" introduced="^4">
+<unit bldFile="/app/jrt/java_stubs/group"/>
+</component>
+</collection>
 <collection id="build_nativejava" name="Build Native Java">
 <component id="nativejava" name="Build Native Java" filter="s60" introduced="^4">
-<unit bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javacommons" name="Java Commons" level="generic">
 <component id="javacommons_build" filter="s60" name="JRT Build">
-<unit bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javaruntimes" name="Java Runtimes" level="rt">
 <component id="javaruntimes_build" filter="s60" name="JRT Build">
-<unit bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javauis" name="Java UIs" level="ui">
 <component id="javauis_build" filter="s60" name="JRT Build">
-<unit bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javamanager" level="generic">
 <component id="javamanager_build" filter="s60" name="JRT Build">
-<unit bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javatools" name="Java Tools" level="util">
 <component id="javatools_build" filter="s60" name="JRT Build">
-<unit bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javaextensions" name="Java Extensions" level="generic">
 <component id="javaextensions_build" filter="s60" name="JRT Build">
-<unit bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 </package>
 <package id="browserui" level="services" tech-domain="rt" name="Browser UI" levels="utils support ui">
 <collection id="browserui_info" name="Browser UI Info" level="ui">
 <component id="browserui_build" name="Bookmarks Engine Build" introduced="^4">
-<unit bldFile="/app/browserui" qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/browserui" qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
 </component>
 </collection>
 </package>
@@ -8914,79 +8925,64 @@
 <collection id="creator" name="Creator" level="support">
 <!-- collection is really a component. Should move down a directory -->
 <component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
-<unit bldFile="/app/rndtools/creator" qt:qmakeArgs="-r" qt:proFile="creator.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/creator" qt:proFile="creator.pro"/>
 </component>
 </collection>
 <collection id="filebrowser" name="File Browser" level="util">
-<!-- consider collapsing into a single component -->
-<component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
-<meta rel="config">
-<not-defined condition="FILEBROWSER_LITE"/>
-</meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-</component>
-<component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
-<meta rel="config">
-<not-defined condition="FILEBROWSER_LITE"/>
-</meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-</component>
-<component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
-<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-<unit bldFile="/app/rndtools/filebrowser/group"/>
+<!-- collection is really a component. Should move down a directory -->
+<component id="filebrowser_build" filter="s60" name="File Browser Build" purpose="development" target="device" class="tool">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/filebrowser" qt:proFile="filebrowser.pro"/>
 </component>
 </collection>
 <collection id="launcher" name="Launcher" level="util">
 <!-- collection is really a component. Should move down a directory -->
 <component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
-<unit bldFile="/app/rndtools/launcher/group"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/launcher" qt:proFile="launcher.pro"/>
 </component>
 </collection>
 <collection id="loadgen" name="Load Generator" level="test">
 <!-- collection is really a component. Should move down a directory -->
 <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
-<unit bldFile="/app/rndtools/loadgen/group"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/loadgen" qt:proFile="loadgen.pro"/>
 </component>
 </collection>
 <collection id="perfmon" name="Performance Monitor" level="test">
 <!-- collection is really a component. Should move down a directory -->
 <component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
-<unit bldFile="/app/rndtools/perfmon" qt:proFile="perfmon.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/perfmon" qt:proFile="perfmon.pro"/>
+</component>
+</collection>
+<collection id="piprofilerui" name="Performance Investigator Profiler UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component id="piprofilerui_build" filter="s60" name="Performance Investigator Profiler UI Build" purpose="development" target="device" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/piprofilerui" qt:proFile="piprofilerui.pro"/>
 </component>
 </collection>
 <collection id="screengrabber" name="Screen Grabber" level="util">
 <!-- collection is really a component. Should move down a directory -->
 <component id="screengrabber_build" filter="s60" name="ScreenGrabber" purpose="development" target="device" class="tool">
-<unit bldFile="/app/rndtools/screengrabber" qt:proFile="screengrabber.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/screengrabber" qt:proFile="screengrabber.pro"/>
 </component>
 </collection>
 <collection id="stifui" name="STIF UI" level="generic">
-<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
-<unit bldFile="/app/rndtools/stifui/akvon/group"/>
+<component id="stifuiqt" filter="s60" name="STIF Qt UI" purpose="development" target="device" introduced="^4">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/stifui/qt" qt:proFile="stifqtui.pro"/>
+<!-- should use stifuiqt as the dir name -->
+</component>
+</collection>
+<collection id="memspyui" name="Memspy UI" level="generic">
+<!-- collection is really a component. Should move down a directory -->
+<component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/memspyui" qt:proFile="memspyui.pro"/>
 </component>
 </collection>
 <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
-<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
-</component>
-<component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
-<unit bldFile="/app/rndtools/htiui/htidevicereboot/group"/>
-</component>
-<component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
-<unit bldFile="/app/rndtools/htiui/htistartupwait/group"/>
-</component>
-<component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
-<unit bldFile="/app/rndtools/htiui/htiadmin/group"/>
+<component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development" target="device">
+<!-- should split up into individual components -->
+<unit bldFile="/app/rndtools/htiui/group"/>
+</component>
+<component id="htiadminqt" filter="s60" name="HTI Admin Qt" purpose="development" target="device">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/htiui/htiadminqt" qt:proFile="HtiAdmin.pro"/>
 </component>
 </collection>
 </package>
@@ -8994,7 +8990,7 @@
 <collection id="userguide" name="User Guide" level="if">
 <!-- collection is really a component. Move down a directory -->
 <component id="userguide_build" name="User Guide Build" filter="s60" introduced="^4">
-<unit bldFile="/app/helps/userguide" qt:proFile="Userguide.pro"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/helps/userguide" qt:proFile="Userguide.pro"/>
 </component>
 </collection>
 <collection id="symhelp" name="Symbian Help" level="eng">