MCL/sftools/fbf/projects/platforms: comparison symbian4/single/sysdefs/system_model

equal deleted inserted replaced

-:eddf9dc5369f
+:2a474e3bb10f
-<?xml version="1.0" encoding="UTF-8"?><SystemDefinition id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
+<?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">
 <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">
 <collection id="audiostubs" name="Audio Stubs" level="adaptation">
 <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
 </collection>
 <collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
 <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_docpub" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
+<component id="kernelhwsrv_metadata" 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>
 </package>
 <package id="boardsupport" level="hw" tech-domain="hb" name="Board Support" levels="bsp test 2 3 config">
 </component>
 <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
 <meta rel="config">
 <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
 </meta>
-<unit bldFile="/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/>
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build,
+		may need to  -->
+<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
 </component>
 <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
 <unit bldFile="/os/devicesrv/resourcemgmt/vibractrl/group"/>
 </component>
 <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
 <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
 </component>
 <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_data" filter="s60" name="Resource Management Data" class="config">
+<component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-<!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
+<!-- Move exports to a self-contained component.
+	This needs to be kept around until configuration is in place -->
 <unit bldFile="/os/devicesrv/resourcemgmt/group"/>
 </component>
 <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
 <unit bldFile="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
 </component>
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
 </component>
 <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="^3">
+<component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
 </component>
 </collection>
 <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
 <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
 </collection>
 <collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
 <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" filter="api_test">
+<component id="bitgdi" name="BitGDI" purpose="mandatory">
-<!-- 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">
 <unit bldFile="/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
 </component>
 </collection>
 </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>
 <component id="sortutil_api" class="api" name="Sort Util API" filter="s60">
 <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"/>
 </component>
 </collection>
 <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
 <component id="numbergrouping" name="Number Grouping">
-<unit bldFile="/os/textandloc/textandlocutils/numbergrouping/group" mrp="/os/textandloc/textandlocutils/numbergrouping/group/tls_numbergrouping.mrp"/>
+<unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
 </component>
 <component id="jplangutil" name="Japanese Language Utilities">
-<unit bldFile="/os/textandloc/textandlocutils/jplangutil/group" mrp="/os/textandloc/textandlocutils/jplangutil/group/tls_jplangutil.mrp"/>
+<unit bldFile="/os/textandloc/charconvfw/jplangutil/group"/>
 </component>
 <component id="sortutil" name="Sorting Utility">
-<unit bldFile="/os/textandloc/textandlocutils/sortutil/group" mrp="/os/textandloc/textandlocutils/sortutil/group/tls_sortutil.mrp"/>
+<unit bldFile="/os/textandloc/charconvfw/sortutil/group"/>
 </component>
 <component id="inlinetext" name="Inline Text">
-<unit bldFile="/os/textandloc/textandlocutils/inlinetext/group" mrp="/os/textandloc/textandlocutils/inlinetext/group/tls_inlinetext.mrp"/>
+<unit bldFile="/os/textandloc/charconvfw/inlinetext/group"/>
+</component>
+<component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+<!-- placeholder for split from bafl -->
 </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"/>
 </component>
 </collection>
 </package>
 <package id="deviceplatformrelease" level="services" tech-domain="to" name="Device Platform Release" levels="bld mid top">
 <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">
 <component id="cedarutils" name="Cedar Utils" purpose="development">
 <unit mrp="/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
 </collection>
 <collection id="foundation_system" name="Foundation System" level="top">
 <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" filter="s60" name="Foundation Config" introduced="^4">
+<component id="sf_config" 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">
 <unit base="/os/deviceplatformrelease/foundation_system/sf_config/config"/>
 </component>
 <component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
 </component>
 </collection>
 </package>
-<package id="osrndtools" level="services" tech-domain="to" name="OS R&amp;D tools" levels="fw trace analysis">
+<package id="osrndtools" level="services" tech-domain="to" name="OS R&amp;D tools" levels="fw trace">
 <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"/>
 </component>
 <component id="testinterface" filter="s60" name="Test Interface" purpose="development">
 </component>
 <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
 <meta rel="config">
 <defined condition="__S60_"/>
 </meta>
-<unit bldFile="/os/osrndtools/stif/stifkerneltestclassbase/group"/>
+<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-</component>
+<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
-<component id="stif_data" filter="s60" name="STIF Data" purpose="development" class="config">
+</component>
-<!--  This is a component. Should move down a directory. or move into other STIF components-->
+<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/group"/>
 </component>
 </collection>
-<collection id="memspy" name="MemSpy" level="trace">
+<collection id="memspy" name="Memspy" level="trace">
-<component id="memspy_plat" filter="s60" name="MemSpy Platform Interfaces" class="api" purpose="development">
+<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="memspyserver" filter="s60" name="MemSpy Server" purpose="development" introduced="^4">
+<component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
-<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>
 </collection>
 <collection id="hti" name="Harmonized Test Interface" level="trace">
 <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
 <!--  move exports into self-contained component.-->
 <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"/>
 </component>
 </collection>
 <component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60,!sf_build" introduced="^2">
 <unit bldFile="/mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
 </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="/mw/appsupport/contextframework/cfw/group"/>
+<!--<unit bldFile="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="/mw/appsupport/contextframework/cfwplugins/group"/>
+<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+</component>
+<component id="contextframework_build" filter="s60" name="Context Framework Build">
+<unit bldFile="/mw/appsupport/contextframework/group"/>
 </component>
 </collection>
 <collection id="coreapplicationuis" name="Core Application UIs" level="server">
 <component id="dbrecovery" filter="s60" name="Database Recovery">
 <unit bldFile="/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
 <unit bldFile="/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
 </component>
 <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>
 <component id="certificates" filter="s60" name="Certificates">
 <unit bldFile="/mw/securitysrv/securitydialogs/secui/group"/>
 </component>
 <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="^3">
+<component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
-<!-- 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" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
-<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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
+<unit 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">
 <!-- collection is really a component. Need to move down a directory-->
 <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
 <collection id="commondrm" name="Common DRM" level="generic">
 <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
 <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>
 <component id="drmutility" filter="s60" name="DRM Utility">
 <unit bldFile="/mw/drm/commondrm/drmutility/group"/>
 </collection>
 <collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
 <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>
 <component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
 <unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
 </collection>
 <collection id="locationsystemui" name="Location System UI" level="if">
 <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">
 <unit bldFile="/mw/locationsrv/supl/locationsuplfw/group"/>
 </component>
 <!--  should remove #include from this and maybe put exports in the above components -->
 <unit bldFile="/mw/locationsrv/locationtriggering/group"/>
 </component>
 </collection>
 </package>
-<package id="accesssec" level="generic" tech-domain="dc" name="Access Security" levels="plugin framework server generic specific">
+<package id="accesssec" level="generic" tech-domain="dc"/>
-<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">
 <unit bldFile="/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
 </component>
 </component>
 <component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
 <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"/>
 </component>
 </collection>
 <component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
 <unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
 </component>
 <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
 <meta rel="config">
-<not-defined xmlns:qt="http://www.nokia.com/qt" condition="WINSCW"/>
+<not-defined condition="WINSCW"/>
 </meta>
-<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
 </component>
 <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
 </component>
 <component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
 <unit bldFile="/mw/ipconnmgmt/dbcreator/group"/>
 </component>
 </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 make this a config component and revmove the #includes -->
+<!-- need to move exports to another component, or maek 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/ipconnmgmt" qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/ipconnmgmt" qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
 <package id="netprotocols" level="generic" tech-domain="dc" name="High-level Internet Protocols" levels="plugin framework server generic specific">
 <collection id="netprotocols_plat" name="High-level Internet Protocols Platform Interfaces" level="specific">
 <collection id="sipplugins" name="SIP Plugins" level="plugin">
 <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
 <unit bldFile="/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
 </component>
 <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
-<!--<unit bldFile="sipplugins/sippsipsettingsui/group"/> -->
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
 </component>
 <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
 <unit bldFile="/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
 </component>
 <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
 </component>
 </collection>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/wirelessacc/wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
+<unit 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"/>-->
 </component>
 <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
 <!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
 </component>
 </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"/>
 </component>
 </collection>
 </component>
 </collection>
 <collection id="phonesrv_info" name="Phone Server Info" level="generic">
 <component id="phonesrv_build" name="Phone Server Build" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/phonesrv" qt:proFile="phonesrv.pro"/>
+<unit bldFile="/mw/phonesrv" qt:proFile="phonesrv.pro"/>
 </component>
 </collection>
 </package>
 <package id="messagingmw" level="specific" tech-domain="pr" name="Messaging Middleware" levels="stack support fw api">
 <collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
 <unit bldFile="/mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
 </component>
 <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 Availability Text" class="api" filter="s60">
+<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
 <collection id="ximpfw" name="XIMP Framework" level="framework">
 <!-- collection is really a component. Needs to be moved down a directory -->
 <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
 <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
 <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">
 <unit bldFile="/mw/legacypresence/xdmprotocols/group"/>
 </component>
 <!-- collection is really a component. Need to move down a directory-->
 <component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
 <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">
 <unit bldFile="/mw/legacypresence/simpleengine/group"/>
 </component>
 <unit bldFile="/mw/searchsrv/WatchDog/group"/>
 </component>
 </collection>
 <collection id="qcpix" name="Qt CPIX" level="engine">
 <component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
+<unit bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
 </component>
 </collection>
 <collection id="searchsrv_info" name="Search Services Info">
 <component id="searchsrv_build" name="Search Services Build" introduced="^4">
 <!-- move exports to own component and remove this -->
 <component id="oma_ds_extensions_api" name="OMA DS Extensions API" class="api" filter="s60">
 <unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
 </component>
 <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>
 <component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
 </component>
 <component id="provisioning" filter="s60" name="Provisioning">
 <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"/>
 </component>
 <component id="dcmoserver" filter="s60" name="DCMO Server">
 <!--  need to distribute exports, etc into the other components and remove this-->
 <unit bldFile="/mw/remotemgmt/dcmofw/group"/>
 </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>
-<unit bldFile="/mw/remotemgmt/fotaapplication/fotaserver/group"/>
+<!-- uncomment when #ifdefs are resolved -->
+<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
 </component>
 <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
-<meta rel="config">
+<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-<defined condition="__SYNCML_DM"/>
+<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
-<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>
 <package id="remoteconn" level="generic" tech-domain="de" name="Remote Connectivity" levels="plugin framework server generic specific">
 <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
 </component>
 <component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
+<!-- <unit bldFile="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="/mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
+<!-- <unit bldFile="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="/mw/dlnasrv/upnpframework/upnpcommonui/group"/>
+<!--<unit bldFile="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="/mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
+<!--<unit bldFile="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="/mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
+<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
 </component>
 <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
 <unit bldFile="/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
 </component>
 <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
 <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 or more of above components -->
+<!-- move exports content into one of above components -->
 <unit bldFile="/mw/dlnasrv/upnpframework/group"/>
 </component>
 </collection>
 <collection id="upnpsettings" name="UPnP Settings" level="framework">
 <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
 </component>
 <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpsettings/multiselectionui/group"/>
+<!--<unit bldFile="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="/mw/dlnasrv/upnpsettings/appwizard/group"/>
+<!--<unit bldFile="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="/mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
+<!--<unit bldFile="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">
 <!-- move exports content into one of above components -->
 <unit bldFile="/mw/dlnasrv/upnpsettings/group"/>
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </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="/mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-<unit bldFile="/mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
+<unit bldFile="upnpharvester/common/cmsettings/group"/>
-<unit bldFile="/mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
+<unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
-<unit bldFile="/mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
+<unit bldFile="upnpharvester/common/dbmanager/group"/>-->
 </component>
 <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
-<unit bldFile="/mw/dlnasrv/upnpharvester/cdssync/common"/>
+<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
 </component>
 <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-<unit bldFile="/mw/dlnasrv/upnpharvester/mdhserver/group"/>
+<!--<unit bldFile="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="/mw/dlnasrv/upnpharvester/group"/>
+<!--<unit bldFile="upnpharvester/group"/>-->
 </component>
 </collection>
 <collection id="homesync" name="Home Sync" level="plugin">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
 <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
-<unit bldFile="/mw/dlnasrv/homesync/group"/>
+<!-- <unit bldFile="homesync/group"/>-->
 <!-- move bld.inf into contentmanager dir -->
 </component>
 </collection>
 <collection id="homemedia" name="Home Media" level="framework">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </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="/mw/dlnasrv/homemedia/group"/>
+<!-- <unit bldFile="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>
 <package id="btservices" level="generic" tech-domain="de" name="Bluetooth Services" levels="framework server generic specific plugin">
 <collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
 <component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
 <unit bldFile="/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
 </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>
 <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
 <unit bldFile="/mw/btservices/bluetoothengine/btmac/group"/>
 </component>
 <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
 <unit bldFile="/mw/btservices/bluetoothengine/btsap/group"/>
 </component>
 <component id="btui" filter="s60" name="Bluetooth UI">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/btservices/bluetoothengine/btui" qt:proFile="btui.pro"/>
+<unit bldFile="/mw/btservices/bluetoothengine/btui/group"/>
 </component>
 <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
 <unit bldFile="/mw/btservices/bluetoothengine/btpbap/group"/>
 </component>
 <component id="bthid" filter="s60" name="Bluetooth HID">
 <unit bldFile="/mw/btservices/bluetoothengine/bthid/group"/>
 </component>
 <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">
 <unit bldFile="/mw/btservices/bluetoothappprofiles/avrcp" mrp="/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
 <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
 <unit bldFile="/mw/usbservices/usbclasses/usbphoneasmodem/group"/>
 </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>
 <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
 <unit bldFile="/mw/usbservices/usbuis/imageprintuiprovider/group"/>
 </component>
 <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
 <unit bldFile="/mw/usbservices/usbuis/imageprintui/group"/>
 </component>
-<component id="usbsettingsapp" name="USB Settings Application" introduced="^4" filter="s60">
+<component id="usbuiqt" name="USB UI Qt" introduced="^4" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/usbservices/usbuis/usbsettingsapp" qt:proFile="usbsettingsapp.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/usbservices/usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
-</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">
 </collection>
 <unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
 </component>
 <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>
 <component id="dun" name="Dial Up Networking">
 <unit bldFile="/mw/shortlinkconn/localconnectivityservice/dun/group"/>
 <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
 <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
 <unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
 </component>
 <component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
+<unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
 </component>
 </collection>
 </package>
 <package id="metadatasrv" level="specific" tech-domain="mm" name="Legacy Metadata Services" levels="plugin framework server generic specific">
 <!-- collection is really a component. Move down a directory -->
 <meta rel="config">
 <defined condition="RD_MDS_2_5"/>
 </meta>
 <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
-<unit bldFile="/mw/mds/clfwrapper/group"/>
+<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+<!--<unit bldFile="clfwrapper/group"/>-->
 </component>
 </collection>
 <collection id="mds_info" name="Metadata Services Info" level="int">
 <component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
 <!-- consider distributiing this into the rest of the components in the package -->
 <package id="mmmw" level="generic" tech-domain="mm" name="Multimedia Middleware" levels="plugin framework server generic specific">
 <collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
 <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>
 <component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
 <unit bldFile="/mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
 </component>
 <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>
 <component id="emc_balance_effect_api" name="EMC Balance Effect API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
 </component>
 <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"/>
 <unit bldFile="/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
 </component>
 <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>
 <component id="metadatautility" filter="s60" name="Metadata Utility">
 <unit bldFile="/mw/mmmw/mmserv/metadatautility/group"/>
 <component id="gst_plugins_good" name="GStreamer Good Plugins" introduced="^3">
 <!--<unit bldFile="gst_plugins_good/group"/>-->
 </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">
 <!-- collection is really a component. Move down an directory -->
 <component id="gstregistrygenerator_build" filter="s60" name="GStreamer Registry Generator Build" introduced="^3">
 <component id="media_player_settings_engine_api" name="Media Player Settings Engine API" introduced="^1" class="api" filter="s60">
 <unit bldFile="/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
 </component>
 <component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
 <meta rel="config">
-<defined xmlns:qt="http://www.nokia.com/qt" condition="IAD_INCLUDE_BACKSTEPPING"/>
+<defined 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 xmlns:qt="http://www.nokia.com/qt" condition="__WINDOWS_MEDIA"/>
+<defined condition="__WINDOWS_MEDIA"/>
 </meta>
 <unit bldFile="/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
 </component>
 <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
 <unit bldFile="/mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
 </component>
 <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">
 <unit bldFile="/mw/mmappfw/mpx/commonframework/group"/>
 <unit bldFile="/mw/mmappfw/mpx/collectionframework/group"/>
 </component>
 <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" introduced="^4">
+<component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introducde="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/mmappfw/mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
+<unit 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 -->
 <unit bldFile="/mw/mmappfw/mpx/group"/>
 </component>
 <component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
 <unit bldFile="/mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
 </component>
 <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
 <meta rel="config">
-<defined xmlns:qt="http://www.nokia.com/qt" condition="IAD_INCLUDE_AUDIOFETCHER"/>
+<defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
 </meta>
-<unit bldFile="/mw/mmappfw/mmappcomponents/audiofetcher/group"/>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
 </component>
 <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
 <meta rel="config">
-<defined xmlns:qt="http://www.nokia.com/qt" condition="__WINDOWS_MEDIA"/>
+<defined condition="__WINDOWS_MEDIA"/>
 </meta>
-<unit bldFile="/mw/mmappfw/mmappcomponents/asxparser/group"/>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
 </component>
 <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
 <unit bldFile="/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
 </component>
 <component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
 <unit bldFile="/mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
 </component>
 <component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
 <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 -->
 <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
 </component>
 </collection>
 </package>
-<package id="hgwidgets" level="specific" tech-domain="mm" name="Multimedia Widgets" levels="framework service api">
+<package id="hgwidgets" level="specific" tech-domain="mm" name="HG Widgets" levels="framework service api">
-<collection id="hgwidgets_plat" name="Multimedia Widgets Platform Interfaces" level="api">
+<collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
 <component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
 <!-- should separate out unit -->
 </component>
-<component id="hgcacheproxymodel_api" name="Hg Cache Proxy Model API" class="api" introduced="^4">
+</collection>
-<!-- should separate out unit -->
+<collection id="hgwidgets_pub" name="HG Widgets Public Interfaces" level="api"/>
-</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">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hgwidgets/ganeswidgets" qt:proFile="ganeswidgets.pro"/>
+<!-- should separate out unit -->
 </component>
 </collection>
-<collection id="hgcacheproxymodel" name="Hurriganes Cache Proxy Model" level="framework">
+<collection id="hgwidgets_info" name="HG Widgets Info" level="framework">
-<!-- really a component, should move down a dir level and have a unit -->
+<component id="hgwidgets_build" name="HG Widgets Build" introduced="^4">
-<component id="hgcacheproxymodel_build" name="Hurriganes Cache Proxy Model Build" introduced="^4">
+<unit bldFile="/mw/hgwidgets" qt:proFile="hgwidgets.pro"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hgwidgets/hgcacheproxymodel" qt:proFile="hgcacheproxymodel.pro"/>
 </component>
 </collection>
 </package>
 <package id="inputmethods" level="generic" tech-domain="ui" name="Input Methods" levels="plugin engine framework api">
 <collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
 <collection id="textinput" name="Text Input" level="framework">
 <component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
 <meta rel="config">
 <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
 </meta>
-<unit bldFile="/mw/inputmethods/textinput/ptienginev2/group"/>
+<!--uncomment when configuration is turned on and textinput_build is removed-->
+<!--  <unit bldFile="textinput/ptienginev2/group"/>-->
 </component>
 <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
 <unit bldFile="/mw/inputmethods/textinput/akninputlanguage/group"/>
 </component>
 <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">
 <unit bldFile="/mw/inputmethods/fep/aknfep/group"/>
 <unit bldFile="/mw/qt/src/s60installs/deviceconfiguration"/>
 </component>
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<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"/>
+<unit bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r -config sgimagelite_support"/>
 </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">
 </collection>
 </package>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
+<unit 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="config" introduced="^4" filter="qt_tools">
+<component id="qtextensions_conf" name="Qt Extensions Confgure" class="conf" 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions" qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions" qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
 <package id="hb" level="generic" tech-domain="ui" name="Orbit" levels="engine test api">
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hb" qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+<unit 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"/>
 </component>
 <component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
 </component>
 <component id="extended_utilities_api" name="Extended Utilities API" class="api" filter="s60">
 <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"/>
 </component>
 <component id="avkon_secondary_display_support_api" name="AVKON Secondary Display Support API" class="api" filter="s60">
 </component>
 <component id="task_list_api" name="Task List API" class="api" filter="s60">
 <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>
 <component id="emergency_call_support_api" name="Emergency Call Support API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
 <unit bldFile="/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
 </component>
 <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"/>
 </component>
 <!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
 </component>
 <component id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
 <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">
 <unit bldFile="/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
 </component>
 </collection>
 <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
 <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
 <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">
 </package>
 <package id="platformthemes" level="specific" tech-domain="ui" name="Platform Themes" levels="framework generic ui">
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/platformthemes" qt:proFile="platformthemes.pro"/>
+<unit bldFile="/mw/platformthemes" qt:proFile="platformthemes.pro"/>
 </component>
 </collection>
 </package>
 <package id="gsprofilesrv" level="generic" tech-domain="ui" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
 <collection id="gsprofilesrv_pub" name="GS and Profiles Services Public Interfaces" level="specific">
 <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
 </component>
 </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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/gsprofilesrv/ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
+<unit 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">
-<!-- Need to create a real .pro file for this
+<unit bldFile="/mw/gsprofilesrv/controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
-	  <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">
-<!-- Uncomment when controlpanel_build is removed
+<unit bldFile="/mw/gsprofilesrv/controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
-	  <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">
 <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
 <unit bldFile="/mw/gsprofilesrv/profilesservices/profileengine/group"/>
 </collection>
 </package>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
+<unit bldFile="/mw/homescreensrv/contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
 </component>
 <component id="contentstorage_build" name="Content Storage Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
+<unit bldFile="/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
 </component>
 <component id="cahandler" name="Content Arsenal Handler" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
+<unit bldFile="/mw/homescreensrv/contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
 </component>
 <component id="caclient" name="Content Arsenal Client" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
+<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"/>
 </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"/>
 </component>
 <component id="appruntimemodel_api" name="Appliction Run-Time Model API" class="api" filter="s60" introduced="^4">
 </component>
 <component id="homescreen_information_api" name="Homescreen Information API" class="api" filter="s60" introduced="^4">
 <unit base="/mw/homescreensrv/homescreensrv_plat/homescreen_information_api"/>
 </component>
 </collection>
-<collection id="hsactivityfw" name="Activity Framework" level="fw">
+<collection id="hsactivityfw" name="Activity Framework" level="activityfw">
 <component id="hsactivityfw_build" name="Activity Framework Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv" qt:qmakeArgs="-r" qt:proFile="homescreensrv_exports_to_rom.pri"/>
+<unit bldFile="/mw/homescreensrv" qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
 </component>
 <component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
 <unit bldFile="/mw/homescreensrv/group"/>
 </component>
 </collection>
 </package>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrvlegacy/ai_content_model_api/group" qt:proFile="group.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrvlegacy/ai_plugin_information_api/group" qt:proFile="group.pro"/>
+<unit 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>
 <package id="appinstall" level="generic" tech-domain="rt" name="Application Installation" levels="tool framework generic api">
 <collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
 <unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
 </component>
 <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>
 </collection>
 <collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
 <component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
 <unit bldFile="/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
 </component>
 </collection>
 <collection id="ncdengine" name="Nokia Content Discover" level="framework">
-<!-- collection is really just a component. Move down one diretcory -->
+<!-- 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>
 <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
 <unit bldFile="/mw/appinstall/ncdengine/group"/>
 </component>
 </collection>
 <collection id="appinstaller" name="Application Installer" level="generic">
 <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.-->
 <component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
 <unit bldFile="/mw/appinstall/iaupdateapi_stub/group"/>
 </component>
 </collection>
 <collection id="iaupdate" name="Independent Apps Update" level="api">
-<!-- Should reorganise into actual components -->
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-<component id="iad" name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+<component id="iad" name="Software Update" filter="s60" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/appinstall/iaupdate" qt:proFile="iaupdate.pro" qt:qmakeArgs="-r"/>
+<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"/>
 </component>
 <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
 <unit bldFile="/mw/appinstall/iaupdate/group"/>
 </component>
 </collection>
 <component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
 <unit bldFile="/mw/appinstall/secureswitools/swisistools/group" mrp="/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
 </component>
 </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>
 </collection>
 </collection>
 </package>
 <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="serviceproviders/sapi_contacts_vpbk/group"/>-->
+<unit bldFile="/mw/serviceapi/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"/>
 </component>
 <component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
 </component>
 <component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
 <unit bldFile="/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
 </component>
 <component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
-<!-- <unit bldFile="serviceproviders/sapi_messaging/group"/> -->
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
 </component>
 <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
-<!--  <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>-->
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
 </component>
 <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
-<!-- <unit bldFile="serviceproviders/sapi_calendar/group"/> -->
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
 </component>
 <component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
 <unit bldFile="/mw/serviceapi/serviceproviders/sapi_logging/group"/>
 </component>
 <component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
 </collection>
 </package>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/browser/bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+<unit bldFile="/mw/browser/bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
 </component>
 </collection>
 </package>
 <package id="web" level="specific" tech-domain="rt" name="Web" levels="plugin utils server generic specific">
 <collection id="web_pub" name="Web Public Interfaces" level="specific">
 </component>
 <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
 <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"/>
 </component>
 <component id="recenturlstore" filter="s60" name="Recent URL Store">
 </component>
 <component id="multipartparser" filter="s60" name="Multipart Parser">
 <meta rel="config">
 <defined condition="BRDO_MULTIPART_PARSER_FF"/>
 </meta>
-<unit bldFile="/mw/web/browserutilities/multipartparser/group"/>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
 </component>
 <component id="schemehandler" filter="s60" name="Scheme Handler">
 <unit bldFile="/mw/web/browserutilities/schemehandler/group"/>
 </component>
 <component id="webutils" filter="s60" name="Web Utils">
 <unit bldFile="/mw/web/browserutilities/webutils/group"/>
 </component>
 <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">
 <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
 <collection id="widgets" name="Web Widget Framework" level="generic">
 <meta rel="config">
 <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="/mw/web/widgets/widgetrecognizer/group"/>
+<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
 </component>
 <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
-<unit bldFile="/mw/web/widgets/widgetinstaller/group"/>
+<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
 </component>
 <component id="widgetlauncher" filter="s60" name="Widget Launcher">
-<unit bldFile="/mw/web/widgets/widgetlauncher/group"/>
+<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
 </component>
 <component id="widgetapp" filter="s60" name="Widget UI">
-<unit bldFile="/mw/web/widgets/widgetapp/group"/>
+<!--<unit bldFile="widgets/widgetapp/group"/>-->
 </component>
 <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
 <meta rel="config">
 <defined condition="RD_WIDGET_PREINSTALLER"/>
 </meta>
-<unit bldFile="/mw/web/widgets/widgetpreinstaller/group"/>
+<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
 </component>
 <component id="widgetstartup" filter="s60" name="Widget Startup">
 <meta rel="config">
 <defined condition="RD_WIDGET_PREINSTALLER"/>
 </meta>
-<unit bldFile="/mw/web/widgets/widgetstartup/group"/>
+<!--<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"/>
 </component>
 </collection>
 </package>
 <package id="websrv" level="generic" tech-domain="rt" name="Web Services" levels="plugin framework server generic specific">
 <collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
 <unit bldFile="/mw/websrv/group"/>
 </component>
 </collection>
 </package>
 <package id="webruntime" level="specific" tech-domain="rt" name="Web Runtime">
-<!-- need to break up this package into collections and components -->
+<!-- need to break up this package nito collections and components -->
 <collection id="webruntime_info" name="Web Runtime Info">
 <component id="webruntime_build" name="Web Runtime Build" introduced="^4">
-<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;"/>
+<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;"/>
 </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">
-<!-- Removed bmconv from builds     <unit bldFile="gfxconversion/bmconv_s60/group"/>   -->
+<unit bldFile="/mw/platformtools/gfxconversion/bmconv_s60/group"/>
 </component>
 <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
 <unit bldFile="/mw/platformtools/gfxconversion/mifconv/group"/>
 </component>
 </collection>
 </layer>
 <layer id="app" name="Applications" levels="services apps">
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/location_plat" qt:proFile="location_plat.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/locationpickerservice" qt:proFile="locationpickerservice.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/locationdataharvester" qt:proFile="locationdataharvester.pro"/>
+<unit bldFile="/app/location/locationdataharvester" qt:proFile="locationdataharvester.pro"/>
 </component>
 </collection>
 </package>
 <!-- pending removal -->
 <package id="phone" level="apps" span="2" tech-domain="vc" name="Phone Apps" levels="engine plugin ui app">
 </component>
 <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
 <unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
 </component>
 <component id="phoneuiview2" filter="s60" name="Phone UI View">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
+<unit bldFile="/app/phone/phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
 </component>
 <component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
+<unit bldFile="/app/phone/phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
 </component>
 <component id="phoneui2" filter="s60" name="Phone UI">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
+<unit 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"/>
 </component>
 <component id="callhandling" filter="s60" name="Call Handling">
 </component>
 <component id="engineinfo" filter="s60" name="Phone Engine Info">
 <unit bldFile="/app/phone/phoneengine/engineinfo/group"/>
 </component>
 <component id="phonemodel" filter="s60" name="Phone Model">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
+<unit bldFile="/app/phone/phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
 </component>
 <component id="parserrecognizer" filter="s60" name="Parser Recognizer" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
+<unit 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"/>
 </component>
 </collection>
 <collection id="phoneplugins" name="Phone Plugins" level="plugin">
 <component id="csplugin" filter="s60" name="Circuit Switched Plugin" class="plugin" introduced="^4">
 <unit bldFile="/app/phone/phoneplugins/csplugin/group"/>
 </component>
 <component id="hsdialerwidgetplugin" filter="s60" name="Home Screen Dialer Widget Plugin" class="plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
+<unit bldFile="/app/phone/phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
 </component>
 <component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
+<unit bldFile="/app/phone/phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
 </component>
 </collection>
 </package>
 <package id="recents" level="apps" tech-domain="vc" name="Recent Events" levels="engine support ui api">
 <collection id="recents_plat" name="Recent Events Platform Interfaces" level="api">
 <component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
 <unit base="/app/recents/recents_plat/logs_engine_api_extensions"/>
 </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">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/recents/logsui" qt:proFile="logsui.pro"/>
+<!-- component at too high a rank, should move down one directory -->
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/settingsuis/controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/settingsuis/controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/app/settingsuis/controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
 <package id="contentcontrol" level="services" tech-domain="dm" name="Content Control Daemons" levels="plugin framework app">
 <collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
 </component>
 <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
 <unit bldFile="/app/contentcontrol/omads/omadsextensions/group"/>
 </component>
 <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contentcontrol/omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+<unit bldFile="/app/contentcontrol/omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
 </component>
 </collection>
 </package>
 <package id="firsttimeuse" level="apps" tech-domain="dm" name="First Time Use" levels="support services ui app">
 <!-- these empty collections are really components. Move down a directory and supply units -->
 <collection id="wizardproviders" name="Wizard Providers" level="support"/>
 <collection id="stateproviders" name="State Providers" level="support"/>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/firsttimeuse" qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/app/firsttimeuse" qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
 <package id="devicecontrol" level="services" tech-domain="dm" name="Device Control Daemons" levels="oma mid app">
 <collection id="deviceupdatesui" name="Device Updates UI" level="app">
 <component id="deviceupdatesui_adapters" name="Device Updates Adapters" filter="s60" class="plugin" introduced="^4">
 <unit bldFile="/app/devicecontrol/deviceupdatesui/adapters/bld"/>
 </component>
 <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
 </component>
 <component id="deviceupdatesplugin" name="Device Updates Plugin" filter="s60" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
 </component>
 <component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
 </component>
 <component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
 </component>
 </collection>
 </package>
 <package id="printing" level="services" tech-domain="de" name="Printing"/>
 <package id="files" level="apps" tech-domain="pr" name="File Manager Apps" levels="support apps">
 <collection id="filemanager" name="File Manager" level="apps">
 <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,bldfirst" name="File Manager Backup Engine" introduced="^4">
+<component id="fmbkupengine" filter="s60" 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/files/filemanager" qt:qmakeArgs="-r" qt:proFile="filemanager.pro"/>
+<unit 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">
 <collection id="search_info" name="Search Info">
 <component id="search_build" name="Search Build" introduced="^4">
 <unit bldFile="/app/search/group"/>
 </component>
 </collection>
 <collection id="searchui" name="Search UI">
 <component id="searchui_build" name="Search UI Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/search/searchui" qt:proFile="searchui.pro"/>
+<unit bldFile="/app/search/searchui" qt:proFile="searchui.pro"/>
 </component>
 </collection>
 </package>
 <package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
 <collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
 <component id="qt_mobility_contacts_api" name="Qt Mobility Contacts API" class="api" filter="s60" introduced="^4">
 <unit base="/app/contacts/contacts_plat/qt_mobility_contacts_api"/>
 </component>
 </collection>
 <collection id="phonebookui" name="Phonebook UI" level="ui">
-<component id="cnthistorymodel" filter="s60" name="Contacts History Model" introduced="^4">
+<component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
-<!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
+<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
 </component>
 <component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
 <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
 </component>
 <component id="phonebookapp" filter="s60" name="Phonebook Application" introduced="^4">
 <component id="phonebookservices" filter="s60" name="Phonebook Services" introduced="^4">
 <!--<unit bldFile="phonebookui/phonebookservices" qt:proFile="phonebookservices.pro"/> -->
 </component>
 <component id="phonebookui_build" filter="s60" name="Phonebook UI Build" introduced="^4">
 <!-- break up into components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookui" qt:proFile="phonebookui.pro"/>
+<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"/>
 </component>
 </collection>
 <collection id="phonebookengines" name="Phonebook Engines" level="engine">
 <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
 </component>
 <component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
 </component>
 <component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
 </component>
 <component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/simutility" qt:proFile="simutility.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/simutility" qt:proFile="simutility.pro"/>
 </component>
 <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
 </component>
 </collection>
 <collection id="pimprotocols" name="PIM Protocols" level="services">
 <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
 <unit bldFile="/app/contacts/pimprotocols/phonebooksync/group" mrp="/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
 </package>
 <package id="organizer" level="apps" span="2" tech-domain="pr" name="Organizer Application Suite" levels="support services engine ui app">
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/organizer_pub" qt:proFile="organizer_pub.pro"/>
+<unit 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, move the above metaxmls to those components -->
+<!-- break up into individual .pro files -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/organizer_plat" qt:proFile="organizer_plat.pro"/>
+<unit 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"/>-->
 </component>
 <component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
 </component>
 </collection>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/agendainterface" qt:proFile="agendainterface.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/commonutils" qt:proFile="commonutils.pro"/>
+<unit bldFile="/app/organizer/calendarui/commonutils" qt:proFile="commonutils.pro"/>
 </component>
 <component id="calenlauncher" filter="s60" name="Calendar Launcher">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
+<unit bldFile="/app/organizer/calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
 </component>
 <component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
+<unit bldFile="/app/organizer/calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
 </component>
 <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
+<unit bldFile="/app/organizer/calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
 </component>
 <component id="globaldata" filter="s60" name="Calendar Global Data">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/globaldata" qt:proFile="globaldata.pro"/>
+<unit bldFile="/app/organizer/calendarui/globaldata" qt:proFile="globaldata.pro"/>
 </component>
 <component id="settings" filter="s60" name="Calendar Settings">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/settings" qt:proFile="settings.pro"/>
+<unit bldFile="/app/organizer/calendarui/settings" qt:proFile="settings.pro"/>
 </component>
 <component id="calenplugins" filter="s60" name="Calendar Plugins" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
+<unit bldFile="/app/organizer/calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
 </component>
 <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
+<unit bldFile="/app/organizer/calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
 </component>
 <component id="views" filter="s60" name="Calendar Views">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/views" qt:proFile="views.pro"/>
+<unit bldFile="/app/organizer/calendarui/views" qt:proFile="views.pro"/>
 </component>
 <component id="calendarui_controller" filter="s60" name="Calendar Controller">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/controller" qt:proFile="controller.pro"/>
+<unit bldFile="/app/organizer/calendarui/controller" qt:proFile="controller.pro"/>
 </component>
 <component id="calendarui_application" filter="s60" name="Calendar Application">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/application" qt:proFile="application.pro"/>
+<unit bldFile="/app/organizer/calendarui/application" qt:proFile="application.pro"/>
 </component>
 <component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
+<unit 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"/>-->
 </component>
 </collection>
 <collection id="notes" name="Notes" level="ui">
 <component id="noteseditor" filter="s60" name="Notes Editor" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
+<unit bldFile="/app/organizer/notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
 </component>
 <component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/notes" qt:proFile="notes.pro"/>
+<unit bldFile="/app/organizer/notes" qt:proFile="notes.pro"/>
 </component>
 </collection>
 <collection id="calendarengines" name="Calendar Engines" level="engine">
 <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
 <unit bldFile="/app/organizer/calendarengines/versit2/group"/>
 <!--<unit bldFile="clock/clockmw" qt:proFile="clockmw.pro"/>-->
 </component>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/clock" qt:proFile="clock.pro"/>
+<unit bldFile="/app/organizer/clock" qt:proFile="clock.pro"/>
 </component>
 </collection>
 <collection id="pimappservices" name="PIM Application Services" level="services">
 <component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
 <unit version="2" bldFile="/app/organizer/pimappservices/calendar/group" mrp="/app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp"/>
 </component>
 </collection>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/alarmui" qt:proFile="alarmui.pro"/>
+<unit bldFile="/app/organizer/alarmui" qt:proFile="alarmui.pro"/>
 </component>
 </collection>
 <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
 <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
 <component id="messaging_history_api" name="Messaging History API" class="api" filter="s60" introduced="^4">
 <unit base="/app/messaging/msg_plat/messaging_history_api"/>
 </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 xmlns:qt="http://www.nokia.com/qt" base="/app/messaging/msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
+<unit 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">
 <component id="mms_client_mtm_api" name="MMS Client MTM API" class="api" filter="s60">
 <unit base="/app/messaging/msg_pub/mms_client_mtm_api"/>
 <component id="msg_smil_dtd_api" name="Messaging SMIL DTD API" class="api" filter="s60" introduced="^4">
 <unit base="/app/messaging/msg_pub/msg_smil_dtd_api"/>
 </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 xmlns:qt="http://www.nokia.com/qt" base="/app/messaging/msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
+<unit base="/app/messaging/msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="mobilemessaging" name="Mobile Messaging" level="plugin">
 <component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
 <unit bldFile="/app/messaging/mobilemessaging/smsmtm/group" mrp="/app/messaging/mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
 </component>
 </collection>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
+<unit 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"/>
 </component>
 <component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
 <component id="mmsconf" name="MMS Configuration" purpose="optional">
 <unit bldFile="/app/messaging/mmsengine/mmsconf" mrp="/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
 </component>
 <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
 <!-- this should be broken up into the individual other components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="messagingapp" name="Messaging Application" level="app">
-<component id="messaging_conf" filter="s60" name="Messaging Application Configuration" class="config" introduced="^4">
+<component id="messagingapp_build" filter="s60" name="MMS Engine Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/conf" qt:proFile="messaging_conf.pro" qt:qmakeArgs="-r"/>
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="/app/messaging/messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgsettings" filter="s60" name="Messaging Settings" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgnotifications" filter="s60" name="Messaging Notifications" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="smartmessaging" filter="s60" name="Smart Messaging">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="shareui" filter="s60" name="Shared UI" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
+<unit 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">
 <!-- use commonemail instead -->
 <component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
 <!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
 </component>
 <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">
 <!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
 <!--<unit bldFile="ipsservices/ipssosplugin" qt:proFile="ipssosplugin.pro" />-->
 </collection>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/commonemail" qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/commonemail" qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
 <package id="camera" level="apps" tech-domain="ma" name="Camera Apps">
 <collection id="camerauis" name="Camera UIs">
 <component id="cameraxui" filter="s60" name="CameraX UIs">
 <meta rel="testbuild">
-<group xmlns:qt="http://www.nokia.com/qt" name="camera_unit_tests"/>
+<group name="camera_unit_tests"/>
 </meta>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/camera/camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
+<unit bldFile="/app/camera/camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
 </component>
 </collection>
 </package>
-<package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor"/>
+<!-- <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition.xml"/> -->
-<package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor"/>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
 <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">
 <unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group"/>
 </component>
 <collection id="videocollection" name="Video Collection" level="util">
 <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
 <unit bldFile="/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
 </component>
 <component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/videoplayer/videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="mediasettings" name="Media Settings" level="support">
 <!--  this is really a component. Should be moved down a directory -->
 <component id="mediasettings_build" filter="s60" name="Media Settings Build">
 <unit bldFile="/app/videoplayer/mediasettings/group"/>
 </component>
 </collection>
 <collection id="videoplayerapp" name="Video Player App" level="apps">
 <component id="videoplayerengine" name="Video Player Engine" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
+<unit 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"/>
 </component>
 </collection>
 <collection id="photos_main" name="Photos Main" level="support">
 <component id="photos_main_build" filter="s60" name="Photos Main Build" introduced="^4">
 <!--<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"/> -->
 </component>
 </collection>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/photos" qt:proFile="photos.pro"/>
+<unit 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 engine app">
+<package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
-<!-- move the rom .pri files into their components and uncomment the units -->
+<!-- move the export .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"/> -->
 </component>
 <component id="mpsettingsmanager" filter="s60" name="MP Settings Manager" introduced="^4">
 <!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection id="musicservices " name="Music Services" level="support">
+<collection id="musicfetcher " name="Music Fetcher" level="support">
 <!-- collection is really a component, move down a directory -->
-<component id="musicservices_build" filter="s60" name="Music Services Build" introduced="^4">
+<component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
-<!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
+<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection id="musicplayer_app " name="Music Player Application" level="app">
 <!-- collection is really a component, move down a directory -->
 <component id="musicplayer_app_build" filter="s60" name="Music Player Application Build" introduced="^4">
 <!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection id="mpdata " name="Music Player Data" level="support">
+<collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
-<!-- 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" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
 </component>
 <component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
-</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">
 <component id="audioeffects" filter="s60" name="Audio Effects" introduced="^4" class="plugin">
 <!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
 </component>
 <!-- Note: it's called SQLite, not SQLLite, just the one "L" -->
 <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">
-<!-- break up into individual components. ROM includes should be in their components -->
+<!-- should brak up into individual components  -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/musicplayer" qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
+<unit 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 plugin ui">
+<package id="radio" level="apps" tech-domain="ma" name="Radio Apps" levels="engine 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"/>
 </component>
 <component id="radioenginesettings" filter="s60" name="Radio Engine Settings" introduced="^4">
 <unit bldFile="/app/radio/radioengine/engine/group"/>
 </component>
 </collection>
 <collection id="radioapp" name="Radio App" level="ui">
 <component id="radioenginewrapper" filter="s60" name="Radio Engine Wrapper" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
+<unit bldFile="/app/radio/radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
 </component>
 <component id="radiopresetstorage" filter="s60" name="Radio Preset Storage" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
+<unit bldFile="/app/radio/radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
 </component>
 <component id="radiouiengine" filter="s60" name="Radio UI Engine" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
+<unit bldFile="/app/radio/radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
 </component>
 <component id="radiowidgets" filter="s60" name="Radio Widgets" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
+<unit bldFile="/app/radio/radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
 </component>
 <component id="radioapplication" filter="s60" name="Radio Application" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
+<unit 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">
 </component>
 </collection>
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/internetradio/qtinternetradio" qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/app/internetradio/qtinternetradio" qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
 <package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
 <unit bldFile="/app/podcatcher/engine/group"/>
 </component>
 </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="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 id="hsdomainmodel" name="HS Domain Model" introduced="^4"/>
-</component>
+<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin"/>
-<component id="hsdomainmodel" name="HS Domain Model" introduced="^4">
+<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsdomainmodel" qt:proFile="hsdomainmodel.pro" qt:qmakeArgs="-r -config rom"/>
+<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin"/>
-</component>
+<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin"/>
-<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin">
+<component id="hsapplication" name="Home Screen Application" introduced="^4"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/runtimeplugins" qt:proFile="runtimeplugins.pro" qt:qmakeArgs="-r -config rom"/>
+<component id="hshomescreenclientplugin" name="Home Screen Client Plugin" introduced="^4" class="plugin"/>
-</component>
+<component id="hsmenucontentpublish" name="HS Menu Content Publish" introduced="^4"/>
-<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin">
+</collection>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/serviceproviders" qt:proFile="serviceproviders.pro" qt:qmakeArgs="-r -config rom"/>
+<collection id="screensaverapp" name="Screen Saver Application" level="ss">
-</component>
+<component id="snsrutils" name="Screen Saver Utils" introduced="^4"/>
-<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin">
+<component id="snsr_serviceproviders" name="Screen Saver Service Providers" 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 id="snsr_stateproviders" name="Screen Saver State Providers" introduced="^4" class="plugin"/>
-</component>
+<component id="snsr_runtimeproviders" name="Screen Saver Runtime Providers" introduced="^4" class="plugin"/>
-<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin">
+<component id="snsrapplication" name="Screen Saver Application" introduced="^4"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/widgetplugins" qt:proFile="widgetplugins.pro" qt:qmakeArgs="-r -config rom"/>
+<component id="screensaverproviders" name="Screen Saver Providers" introduced="^4" class="plugin"/>
-</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">
-<!-- break collection info components, or move down a dir and make it a component -->
+<component id="taskswitcherappecom" name="Task Switcher Application ECom" introduced="^4"/>
-<component id="taskswitcherapp_build" name="Task Switcher Application Build">
+<component id="tsserviceplugin" name="Task Switcher Service Plugin" introduced="^4" class="plugin"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/taskswitcherapp" qt:proFile="taskswitcherapp.pro" qt:qmakeArgs="-r -config rom"/>
+<component id="ts_runtimeplugins" name="TS Runtime Plugins" introduced="^4" class="plugin"/>
-</component>
+<component id="tsapplication" name="Task Switcher Application" introduced="^4"/>
-<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">
 <collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
 <component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
 </component>
 <component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
 <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 xmlns:qt="http://www.nokia.com/qt" 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" 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"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" 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" 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"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" 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" 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"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" 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" 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"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" 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" 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"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" 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" 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"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" 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" 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"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/browserui" qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+<unit bldFile="/app/browserui" qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
 </component>
 </collection>
 </package>
 <package id="conntools" level="services" tech-domain="dc" name="Connectivity Tools" levels="config app">
 <collection id="nettools" name="Net Tools" level="app">
 </package>
 <package id="rndtools" level="services" tech-domain="to" name="R&amp;D tools" levels="support generic test util">
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/creator" qt:proFile="creator.pro"/>
+<unit bldFile="/app/rndtools/creator" qt:qmakeArgs="-r" qt:proFile="creator.pro"/>
 </component>
 </collection>
 <collection id="filebrowser" name="File Browser" level="util">
-<!-- collection is really a component. Should move down a directory -->
+<!-- consider collapsing into a single component -->
-<component id="filebrowser_build" filter="s60" name="File Browser Build" purpose="development" target="device" class="tool">
+<component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/filebrowser" qt:proFile="filebrowser.pro"/>
+<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"/>
 </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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/launcher" qt:proFile="launcher.pro"/>
+<unit bldFile="/app/rndtools/launcher/group"/>
 </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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/loadgen" qt:proFile="loadgen.pro"/>
+<unit bldFile="/app/rndtools/loadgen/group"/>
 </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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/perfmon" qt:proFile="perfmon.pro"/>
+<unit 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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/screengrabber" qt:proFile="screengrabber.pro"/>
+<unit bldFile="/app/rndtools/screengrabber" qt:proFile="screengrabber.pro"/>
 </component>
 </collection>
 <collection id="stifui" name="STIF UI" level="generic">
-<component id="stifuiqt" filter="s60" name="STIF Qt UI" purpose="development" target="device" introduced="^4">
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/stifui/qt" qt:proFile="stifqtui.pro"/>
+<unit bldFile="/app/rndtools/stifui/akvon/group"/>
-<!-- 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="htiui_build" filter="s60" name="HTI UI Build" purpose="development" target="device">
+<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
-<!-- should split up into individual components -->
+<!-- can only have a single unit. Should #include from a common bld.inf file -->
-<unit bldFile="/app/rndtools/htiui/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-</component>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-<component id="htiadminqt" filter="s60" name="HTI Admin Qt" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/htiui/htiadminqt" qt:proFile="HtiAdmin.pro"/>
+<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>
 </collection>
 </package>
 <package id="helps" level="apps" span="2" tech-domain="ui" name="Help Apps" levels="eng tools if ui">
 <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 xmlns:qt="http://www.nokia.com/qt" bldFile="/app/helps/userguide" qt:proFile="Userguide.pro"/>
+<unit bldFile="/app/helps/userguide" qt:proFile="Userguide.pro"/>
 </component>
 </collection>
 <collection id="symhelp" name="Symbian Help" level="eng">
 <component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
 <unit bldFile="/app/helps/symhelp/helpmodel/group" mrp="/app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>

changeset 692	2a474e3bb10f
parent 679	e9aa1e11b96b
child 739	a8b07977fbe2