--- a/foundation/sysdefs/system_model.xml	Fri Aug 07 11:18:52 2009 +0100
+++ b/foundation/sysdefs/system_model.xml	Fri Aug 07 11:47:33 2009 +0100
@@ -130,729 +130,168 @@
    </block>
   </layer>
   <layer name="app" long-name="Applications" levels="services apps">
-   <block name="location" long-name="Location Apps" tech_domain="lo" level="apps" levels="engine ui apps">
-    <collection name="landmarksui" long-name="Landmarks UI" level="ui">
-     <component name="landmarksui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/location/landmarksui/help/group"/>
-     </component>
-     <component name="landmarksui_engine" long-name="Engine" origin-model="foundation">
-      <unit bldFile="app/location/landmarksui/engine/group"/>
-     </component>
-     <component name="uicontrols" long-name="UI Controls" origin-model="foundation">
-      <unit bldFile="app/location/landmarksui/uicontrols/group"/>
-     </component>
-     <component name="landmarksui_commonui" long-name="Common UI" origin-model="foundation">
-      <unit bldFile="app/location/landmarksui/commonui/group"/>
-     </component>
-     <component name="landmarksui_app" long-name="Application" origin-model="foundation">
-      <unit bldFile="app/location/landmarksui/app/group"/>
-     </component>
-     <component name="msgviewer" long-name="Message Viewer" origin-model="foundation">
-      <unit bldFile="app/location/landmarksui/msgviewer/group"/>
-     </component>
-     <component unofficial="yes" name="landmarksui_build" long-name="Landmarks UI Build" origin-model="foundation">
-      <unit bldFile="app/location/landmarksui/group"/>
-     </component>
-    </collection>
-    <collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-     <component name="blid" long-name="Blid" origin-model="foundation">
-      <unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
-     </component>
-     <component unofficial="yes" name="basiclocationinfodisplay_build" long-name="Basic Location Info Display Build" origin-model="foundation">
-      <unit bldFile="app/location/basiclocationinfodisplay/group"/>
-     </component>
-    </collection>
-    <collection name="eventsui" long-name="Events UI" level="ui">
-     <component name="eventsui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/location/eventsui/help/group"/>
-     </component>
-     <component name="eventsutils" long-name="Events Utils" origin-model="foundation">
-      <unit bldFile="app/location/eventsui/eventsutils/group"/>
-     </component>
-     <component name="eventsengine" long-name="Events Engine" origin-model="foundation">
-      <unit bldFile="app/location/eventsui/eventsengine/group"/>
-     </component>
-     <component name="eventshandlerui" long-name="Events Handler UI" origin-model="foundation">
-      <unit bldFile="app/location/eventsui/eventshandlerui/group"/>
-     </component>
-     <component name="eventseditor" long-name="Events Editor" origin-model="foundation">
-      <unit bldFile="app/location/eventsui/eventseditor/group"/>
-     </component>
-     <component name="eventsmgmtui" long-name="Events Mgmt UI" origin-model="foundation">
-      <unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
-     </component>
-     <component unofficial="yes" name="eventsui_build" long-name="Events UI Build" origin-model="foundation">
-      <unit bldFile="app/location/eventsui/group"/>
-     </component>
-    </collection>
-    <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-     <component name="lmrefapp" origin-model="foundation">
-      <unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
-     </component>
-    </collection>
-    <collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-     <component name="lmuirefapp" origin-model="foundation">
-      <unit bldFile="app/location/locationlandmarksuirefapp/group"/>
-     </component>
-    </collection>
-    <collection name="locationsatviewrefapp" long-name="Location Sat View Reference App" level="apps">
-     <component name="satellitereference" origin-model="foundation">
-      <unit bldFile="app/location/locationsatviewrefapp/group"/>
-     </component>
-    </collection>
-    <collection name="simpsyconfigurator" long-name="SIM PSY Configurator" level="engine">
-     <component name="simpsyui" origin-model="foundation">
-      <unit bldFile="app/location/simpsyconfigurator/group"/>
-     </component>
-    </collection>
-    <collection name="mapnavproviderrefapp" long-name="Map Nav Provider Reference App" level="apps">
-     <component unofficial="yes" name="mapnavproviderrefapp_build" long-name="Map Nav Provider Reference App Build" origin-model="foundation">
-      <unit bldFile="app/location/mapnavproviderrefapp/group"/>
-     </component>
-    </collection>
-    <collection name="location_info" long-name="Location Apps Info" level="apps">
-     <component unofficial="yes" name="location_build" long-name="Location Apps Build" origin-model="foundation">
-      <unit bldFile="app/location/group"/>
-     </component>
-     <component unofficial="yes" name="location_test" long-name="Location Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="app/location/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="loc_pub" class="api" origin-model="foundation">
-      <unit bldFile="app/location/loc_pub/group"/>
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block name="mmsharinguis" long-name="Multimedia Sharing UIs" tech_domain="vc" level="services" levels="base plugin">
-    <collection name="mmsharing" long-name="MM Sharing" level="base">
-     <component name="mmshavailability" long-name="Multimedia Sharing Availability" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
-     </component>
-     <component name="mmshindicator" long-name="Multimedia Sharing Indicator" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
-     </component>
-     <component name="mmshmanagercli" long-name="Multimedia Sharing Manager Client" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
-     </component>
-     <component name="mmshmanagersrv" long-name="Multimedia Sharing Manager Server" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
-     </component>
-     <component name="mmshengine" long-name="Multimedia Sharing Engine" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
-     </component>
-     <component name="mmshui" long-name="Multimedia Sharing UI" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
-      <unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshui/tsrc/ut_ui/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmsharing_build" long-name="MM Sharing Build" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmsharing/group"/>
-     </component>
-    </collection>
-    <collection name="mmshplugins" long-name="MM Sharing Plugins" level="plugin">
-     <component name="mmshaoplugin" long-name="Multimedia Sharing Always Online Plugin" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
-     </component>
-     <component name="mmshaiwplugin" long-name="Multimedia Sharing AIW Plugin" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group"/> -->
-     </component>
-     <component name="mmshsipcrplugin" long-name="Multimedia Sharing SIP Client Resolver Plugin" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
-     </component>
-     <component name="mmshsettingsuiplugin" long-name="Multimedia Sharing Settings UI Plugin" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-     </component>
-     <component name="mmshwpadapterplugin" long-name="Multimedia Sharing WP Adapter Plugin" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
-     </component>
-     <component name="mmcctranscoder" long-name="MMCC Transcoder" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmshplugins_build" long-name="MM Sharing Plugins Build" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmshplugins/group"/>
-     </component>
-    </collection>
-    <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="plugin">
-     <component unofficial="yes" name="scripts" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/scripts"/> -->
-     </component>
-     <component unofficial="yes" name="mceclientstub" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/mceclientstub/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmsharinguis_build" long-name="Multimedia Sharing UIs Build" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/group"/>
-     </component>
-     <component unofficial="yes" name="musenginestub" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/musenginestub/group"/> -->
-     </component>
-     <component unofficial="yes" name="ututils" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/ututils/group"/> -->
-     </component>
-     <component unofficial="yes" name="cenrepeditor" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/cenrepeditor/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mustestapp" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/mustestapp/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block name="phone" long-name="Phone Apps" tech_domain="vc" level="apps" span="2" levels="engine plugin ui apps">
-    <collection name="phoneapp" long-name="Phone App" level="apps">
-     <component name="blacklist" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/blacklist/group"/>
-     </component>
-     <component name="phoneui" long-name="Phone UI" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/phoneui/group"/>
-      <!-- <unit bldFile="app/phone/phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group"/> -->
-      <!-- <unit bldFile="app/phone/phoneapp/phoneui/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="phoneuicontrol" long-name="Phone UI Control" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
-     </component>
-     <component name="phoneuistates" long-name="Phone UI States" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
-     </component>
-     <component name="phoneuiutils" long-name="Phone UI Utils" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
-     </component>
-     <component name="phoneuiview" long-name="Phone UI View" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
-     </component>
-     <component name="phoneuivoipextension" long-name="Phone UI VOIP Extension" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
-     </component>
-     <component name="silenceactionplugin" long-name="Silence Action Plugin" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
-     </component>
-     <component name="phonemediatorcenter" long-name="Phone Mediator Center" origin-model="foundation">
-      <unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
-     </component>
-    </collection>
-    <collection name="phoneengine" long-name="Phone Engine" level="engine">
-     <component name="phonecntfinder" long-name="Phone Contact Finder" origin-model="foundation">
-      <unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
-     </component>
-     <component name="audiohandling" long-name="Audio Handling" origin-model="foundation">
-      <unit bldFile="app/phone/phoneengine/audiohandling/group"/>
-     </component>
-     <component name="callhandling" long-name="Call Handling" origin-model="foundation">
-      <unit bldFile="app/phone/phoneengine/callhandling/group"/>
-     </component>
-     <component name="contacthandling" long-name="Contact Handling" origin-model="foundation">
-      <unit bldFile="app/phone/phoneengine/contacthandling/group"/>
-     </component>
-     <component name="loghandling" long-name="Log Handling" origin-model="foundation">
-      <unit bldFile="app/phone/phoneengine/loghandling/group"/>
-     </component>
-     <component name="engineinfo" long-name="Engine Info" origin-model="foundation">
-      <unit bldFile="app/phone/phoneengine/engineinfo/group"/>
-     </component>
-     <component name="phonemodel" long-name="Phone Model" origin-model="foundation">
-      <unit bldFile="app/phone/phoneengine/phonemodel/group"/>
-     </component>
-     <component name="servicehandling" long-name="Service Handling" origin-model="foundation">
-      <unit bldFile="app/phone/phoneengine/servicehandling/group"/>
-     </component>
-    </collection>
-    <collection name="phonesettings" long-name="Phone Settings" level="ui">
-     <component name="aiwcallimageplugin" long-name="Aiw Call Image Plugin" origin-model="foundation">
-      <unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
-     </component>
-     <component name="pslncallimageplugin" long-name="Personalization Call Image Plugin" origin-model="foundation">
-      <unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
-     </component>
-    </collection>
-    <collection name="phoneuis" long-name="Phone UIs" level="ui">
-     <component name="dialer" long-name="Dialer" origin-model="foundation">
-      <unit bldFile="app/phone/phoneuis/dialer/group"/>
-      <!-- <unit bldFile="app/phone/phoneuis/dialer/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="bubblemanager" long-name="Bubble Manager" origin-model="foundation">
-      <unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
-     </component>
-     <component name="connectutil" long-name="Connect Util" origin-model="foundation">
-      <unit bldFile="app/phone/phoneuis/connectutil/group"/>
-     </component>
-     <component name="sfiutils" long-name="SFI Utils" origin-model="foundation">
-      <unit bldFile="app/phone/phoneuis/sfiutils/group"/>
-      <!-- <unit bldFile="app/phone/phoneuis/sfiutils/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="ussd" long-name="USSD" origin-model="foundation">
-      <unit bldFile="app/phone/phoneuis/ussd/group"/>
-     </component>
-     <component name="vmbx" long-name="Vmbx" origin-model="foundation">
-      <unit bldFile="app/phone/phoneuis/vmbx/group"/>
-     </component>
-     <component name="telephonydevicemode" long-name="Telephony Device Mode" origin-model="foundation">
-      <unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
-     </component>
-    </collection>
-    <collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-     <component name="telbranding" long-name="Tel Branding" origin-model="foundation">
-      <unit bldFile="app/phone/phoneplugins/telbranding/group"/>
-     </component>
-    </collection>
-    <collection name="phone_info" long-name="Phone Apps Info" level="apps">
-     <component unofficial="yes" name="phone_build" long-name="Phone Apps Build" origin-model="foundation">
-      <unit bldFile="app/phone/group"/>
-     </component>
-     <component unofficial="yes" name="phone_plat" long-name="Phone Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/phone/phone_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="videotelephony" long-name="Video Telephony Apps" tech_domain="vc" level="apps" levels="engine plugin prot ui">
-    <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
-     <component name="packetvideoenginebinaries" long-name="Packet Video Engine Binaries" origin-model="foundation"/>
-    </collection>
-    <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-     <component name="videoteleng" long-name="Videotel Engine" origin-model="foundation">
-      <!-- <unit bldFile="app/videotelephony/vtengines/videoteleng/callctrl/group"/> -->
-      <unit bldFile="app/videotelephony/vtengines/videoteleng/group"/>
-      <!-- <unit bldFile="app/videotelephony/vtengines/videoteleng/logger/group"/> -->
-     </component>
-     <component name="vtmediatorplugin" long-name="VT Mediator Plugin" origin-model="foundation">
-      <unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
-     </component>
-     <component unofficial="yes" name="vtengines_build" long-name="Video Telephony Engines Build" origin-model="foundation">
-      <unit bldFile="app/videotelephony/vtengines/group"/>
-     </component>
-    </collection>
-    <collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-     <component name="videotelui" long-name="Video Telephony UI" origin-model="foundation">
-      <unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
-     </component>
-     <component unofficial="yes" name="vtuis_build" long-name="Video Telephony UIs Build" origin-model="foundation">
-      <unit bldFile="app/videotelephony/vtuis/group"/>
-     </component>
-    </collection>
-    <collection name="vtprotocolplugins" long-name="Video Telephony Protocol Plugins" level="plugin">
-     <component name="displaysink" long-name="Display Sink" origin-model="foundation">
-      <unit bldFile="app/videotelephony/vtprotocolplugins/displaysink/group"/>
-     </component>
-     <component name="videosource" long-name="Video Source" origin-model="foundation">
-      <unit bldFile="app/videotelephony/vtprotocolplugins/videosource/group"/>
-     </component>
-     <component unofficial="yes" name="vtprotocolplugins_build" long-name="Video Telephony Protocol Plugins Build" origin-model="foundation">
-      <unit bldFile="app/videotelephony/vtprotocolplugins/group"/>
-     </component>
-    </collection>
-    <collection name="vtprotocols" long-name="Video Telephony Protocols" level="prot">
-     <!-- Empty duplicate component videotelproto.dll=binary removed -->
-    </collection>
-    <collection name="vtprotocolsstub" long-name="Video Telephony Protocols Stub" level="prot">
-     <component name="videotelproto" origin-model="foundation">
-      <unit bldFile="app/videotelephony/vtprotocolsstub/group"/>
-     </component>
-    </collection>
-    <collection name="videotelephony_info" long-name="Video Telephony Apps Info" level="ui">
-     <component unofficial="yes" name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/videotelephony/videotelephony_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="poc" long-name="PoC" tech_domain="vc" level="apps" levels="engine ui">
-    <collection name="pocengine" long-name="PoC Engine" level="engine">
-     <component name="sipclientresolver" long-name="SIP Client Resolver" origin-model="foundation">
-      <!-- <unit bldFile="app/poc/pocengine/sipclientresolver/group"/> -->
-     </component>
-     <component unofficial="yes" name="pocengine_build" long-name="PoC Engine Build" origin-model="foundation">
-      <unit bldFile="app/poc/pocengine/group"/>
-     </component>
-     <component unofficial="yes" name="pocengine_test" long-name="PoC Engine Test" origin-model="foundation">
-      <!-- <unit bldFile="app/poc/pocengine/tsrc/public/basic/group"/> -->
-     </component>
-    </collection>
-    <collection name="pocui" long-name="PoC Ui" level="ui">
-     <component name="pocuiintgr" long-name="PoC UI Intgr" origin-model="foundation">
-      <unit bldFile="app/poc/pocui/pocuiintgr/group"/>
-      <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
-      <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiecomplugin/group"/> -->
-      <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiintegrationservices/group"/> -->
-     </component>
-     <component name="pocui_app" long-name="Application" origin-model="foundation">
-      <unit bldFile="app/poc/pocui/app/group"/>
-     </component>
-     <component unofficial="yes" name="pocui_build" long-name="PoC Ui Build" origin-model="foundation">
-      <unit bldFile="app/poc/pocui/group"/>
-     </component>
-    </collection>
-    <collection name="poc_info" long-name="PoC Info" level="ui">
-     <component unofficial="yes" name="poc_build" long-name="PoC Build" origin-model="foundation">
-      <unit bldFile="app/poc/group"/>
-     </component>
-     <component unofficial="yes" name="poc_plat" long-name="PoC Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/poc/poc_plat/group"/>
-     </component>
-     <component unofficial="yes" name="poc_help" long-name="PoC Help" origin-model="foundation">
-      <unit bldFile="app/poc/help/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="iptelephony" long-name="IP Telephony" tech_domain="vc" level="apps" levels="plugin eng ui">
-    <!-- Collection renamed to avoid duplicates -->
-    <collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-     <component name="cscgsplugin" long-name="CSCGS Plugin" origin-model="foundation">
-      <unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
-     </component>
-     <component name="cscsipvoipcleanupplugin" long-name="CSC SIP VOIP Cleanup Plugin" origin-model="foundation">
-      <unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-     </component>
-     <component name="cscengine" long-name="CSC Engine" origin-model="foundation">
-      <unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
-     </component>
-     <component name="cscsettingsui" long-name="CSC Settings UI" origin-model="foundation">
-      <unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
-     </component>
-     <component name="cscapplicationui" long-name="CSC Application UI" origin-model="foundation">
-      <unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
-     </component>
-     <component unofficial="yes" name="commsconfig_build" long-name="Comms Config Build" origin-model="foundation">
-      <unit bldFile="app/iptelephony/commsconfig/group"/>
-     </component>
-    </collection>
-    <collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="ui">
-     <component name="cchserver" long-name="CCH Server" origin-model="foundation">
-      <unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-     </component>
-     <component name="cchclient" long-name="CCH Client" origin-model="foundation">
-      <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-     </component>
-     <component name="cchclientapi" long-name="CCH Clientapi" origin-model="foundation">
-      <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-     </component>
-     <component unofficial="yes" name="convergedconnectionhandler_build" long-name="Converged Connection Handler Build" origin-model="foundation">
-      <unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
-     </component>
-    </collection>
-    <collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-     <component name="rcse2" long-name="Rcse2" origin-model="foundation">
-      <unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
-     </component>
-    </collection>
-    <collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="eng">
-     <component name="svp" origin-model="foundation">
-      <unit bldFile="app/iptelephony/sipvoipprovider/group"/>
-     </component>
-    </collection>
-    <collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-     <component name="sipmxresolver" long-name="SIP MX Resolver" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
-     </component>
-     <component name="sipconnectionprovider" long-name="SIP Connection Provider" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-      <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-     </component>
-     <component name="ipapputils" long-name="IP App Utils" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
-     </component>
-     <component name="voipadapters" long-name="VOIP Adapters" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
-     </component>
-     <component name="accountcreationplugin" long-name="Account Creation Plugin" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
-     </component>
-     <component name="dhcppositionprovider" long-name="DHCP Position Provider" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-     </component>
-     <component name="svtmatching" long-name="SVT Matching" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
-     </component>
-     <component name="svtlogging" long-name="SVT Logging" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
-     </component>
-     <component name="svtcallmenu" long-name="SVT Call Menu" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
-     </component>
-     <component unofficial="yes" name="voipplugins_build" long-name="VoIP Plugins Build" origin-model="foundation">
-      <unit bldFile="app/iptelephony/voipplugins/group"/>
-     </component>
-    </collection>
-    <collection name="callcontinuity" long-name="Call Continuity" level="eng">
-     <component name="vccutils" long-name="VCC Utils" origin-model="foundation">
-      <unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
-     </component>
-     <component name="nsmldmvccadapter" long-name="NSML DM VCC Adapter" origin-model="foundation">
-      <unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-     </component>
-     <component name="vccclientprovisioningadapter" long-name="VCC Client Provisioning Adapter" origin-model="foundation">
-      <unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-     </component>
-     <component name="vccpropertyhandler" long-name="VCC Property Handler" origin-model="foundation">
-      <unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-     </component>
-     <component name="vcchotrigger" long-name="VCC Hotrigger" origin-model="foundation">
-      <unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
-     </component>
-     <component name="vcc" long-name="VCC" origin-model="foundation">
-      <unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
-     </component>
-     <component name="settingsreader" long-name="Settings Reader" origin-model="foundation">
-      <!-- <unit bldFile="app/iptelephony/callcontinuity/settingsreader/group"/> -->
-     </component>
-     <component unofficial="yes" name="callcontinuity_build" long-name="Call Continuity Build" origin-model="foundation">
-      <unit bldFile="app/iptelephony/callcontinuity/group"/>
-     </component>
-    </collection>
-    <collection name="iptelephony_info" long-name="IP Telephony Info" level="ui">
-     <component unofficial="yes" name="iptelephony_build" long-name="IP Telephony Build" origin-model="foundation">
-      <unit bldFile="app/iptelephony/group"/>
-     </component>
-     <component unofficial="yes" name="iptel_plat" class="api" origin-model="foundation">
-      <unit bldFile="app/iptelephony/iptel_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="settingsuis" long-name="Settings UIs" tech_domain="dm" level="services" levels="empty rsc ui">
-    <collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-     <component name="services_db" long-name="Services Db" origin-model="foundation">
-      <unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
-     </component>
-     <component name="defaultapplicationsettings_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
-     </component>
-     <component name="service" long-name="Service" origin-model="foundation">
-      <unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
-     </component>
-     <component name="dasgsplugin" long-name="GS Plugin" origin-model="foundation">
-      <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-     </component>
-     <component unofficial="yes" name="defaultapplicationsettings_build" long-name="Default Application Settings Build" origin-model="foundation">
-      <unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
-     </component>
-    </collection>
-    <collection name="systemswuis" long-name="System SW UIs" level="ui">
-     <component name="touchscreencalib" long-name="Touchscreen Calib" origin-model="foundation">
-      <unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
-     </component>
-    </collection>
-    <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
-     <component unofficial="yes" name="devmngt_pub" class="api" origin-model="foundation">
-      <unit bldFile="app/settingsuis/devmngt_pub/group"/>
-     </component>
-     <component unofficial="yes" name="settingsuis_build" long-name="Settings UIs Build" origin-model="foundation">
-      <unit bldFile="app/settingsuis/group"/>
-     </component>
-     <component unofficial="yes" name="settingsuis_test" long-name="Settings UIs Test" origin-model="foundation">
-      <!-- <unit bldFile="app/settingsuis/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="devmngt_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
-      <unit bldFile="app/settingsuis/devmngt_plat/group"/>
-      <!-- <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/tsrc/servicesdbapitest/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block name="contentcontrol" long-name="Content Control Daemons" tech_domain="dm" level="services" levels="1 2">
-    <collection name="applicationmanagement" long-name="Application Management" level="1">
-     <component name="options" long-name="Options" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-     </component>
-     <component name="applicationmanagement_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
-     </component>
-     <component name="applicationmanagement_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
-     </component>
-     <component name="rfsplugin" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-     </component>
-     <component name="amadapter2" long-name="AM Adapter2" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
-     </component>
-    </collection>
-    <collection name="customization" long-name="Customization" level="2">
-     <component name="dmutils" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-     </component>
-     <component name="uisettingssrv" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-     </component>
-     <component name="isadapter" long-name="IS Adapter" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-     </component>
-     <component name="supadapter" long-name="SUPAdapter" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
-     </component>
-     <component name="wallpaperadapter" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
-     </component>
-     <component name="operatorlogoadapter" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
-     </component>
-     <component name="screensaveradapter" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
-     </component>
-     <component name="themesadapter" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
-     </component>
-     <component name="embeddedlinkadapter" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-     </component>
-    </collection>
-    <collection name="omads" long-name="OMA DS" level="1">
-     <component name="omadsappui" long-name="OMA DS App UI" origin-model="foundation">
-      <unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
-     </component>
-     <component name="omadsextensions" long-name="OMA DS Extensions" origin-model="foundation">
-      <!-- <unit bldFile="app/contentcontrol/omads/omadsextensions/dsutils/emailxmlutils/bld"/> -->
-      <unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
-     </component>
-    </collection>
-    <collection name="contentcontrol_info" long-name="Content Control Daemons Info" level="2">
-     <component unofficial="yes" name="contentcontrol_build" long-name="Content Control Daemons Build" origin-model="foundation">
-      <unit bldFile="app/contentcontrol/group"/>
-     </component>
-     <component unofficial="yes" name="contentctrl_plat" class="api" origin-model="foundation">
-      <unit bldFile="app/contentcontrol/contentctrl_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="devicecontrol" long-name="Device Control Daemons" tech_domain="dm" level="services" levels="oma mid app">
-    <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
-     <component name="devdiagapp" long-name="Dev Diag App" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-     </component>
-     <component name="devdiaggsplugin" long-name="Dev Diag GS Plugin" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-     </component>
-     <component name="diagplugins" long-name="Diag Plugins" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
-     </component>
-     <component name="diagsuites" long-name="Diag Suites" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
-     </component>
-     <component unofficial="yes" name="devicediagnostics_build" long-name="Device Diagnostics Build" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/devicediagnostics/group"/>
-     </component>
-    </collection>
-    <collection name="fotaapplication" long-name="FOTA Application" level="app">
-     <component name="fotaserver" long-name="FOTA Server" origin-model="foundation">
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmsclient/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmserver/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotarfsplugin/group"/> -->
-      <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
-      <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
-     </component>
-     <component unofficial="yes" name="fotaapp" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-     </component>
-    </collection>
-    <collection name="omadm" long-name="OMA Device Management" level="oma">
-     <component name="omadmappui" long-name="OMA DM App UI" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmappui/tsrc/group"/> -->
-     </component>
-     <component name="omadmextensions" long-name="OMA DM Extensions" origin-model="foundation">
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/email/tsrc/group"/> -->
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/mms/tsrc/group"/> -->
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmldm/tsrc/group"/> -->
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmldm12/tsrc/group"/> -->
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmlds/tsrc/group"/> -->
-      <unit bldFile="app/devicecontrol/omadm/omadmextensions/group"/>
-     </component>
-    </collection>
-    <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-     <component name="pnpms" long-name="PnP MS" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
-      <!-- <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-     <component name="omacpadapters" long-name="OMA CP Adapters" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
-     </component>
-    </collection>
-    <collection name="devicecontrol_info" long-name="Device Control Daemons Info" level="app">
-     <component unofficial="yes" name="devicecontrol_build" long-name="Device Control Daemons Build" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/group"/>
-     </component>
-     <component unofficial="yes" name="customization_test" origin-model="foundation">
-      <!-- <unit bldFile="app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
-     </component>
-     <component unofficial="yes" name="applicationmanagement_build" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/applicationmanagement/group"/>
-     </component>
-     <component unofficial="yes" name="customization_build" origin-model="foundation">
-      <unit bldFile="app/devicecontrol/customization/group"/>
-     </component>
-     <component unofficial="yes" name="applicationmanagement_test" origin-model="foundation">
-      <!-- <unit bldFile="app/devicecontrol/applicationmanagement/tsrc/tarmappmng/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block name="printing" long-name="Printing" tech_domain="de" level="services" levels="app">
-    <collection name="imageprint" long-name="ImagePrint" level="app">
-     <component name="clog" origin-model="foundation">
-      <unit bldFile="app/printing/imageprint/clog/group"/>
-     </component>
-     <component name="imageprintengine" origin-model="foundation">
-      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
-      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
-      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
-      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/upnpprotocolfw2/group"/> -->
-      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/xhtmlfilecomposer/group"/> -->
-      <unit bldFile="app/printing/imageprint/imageprintengine/group"/>
-      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/imageprintserver/group"/> -->
-     </component>
-     <component name="imageprintui" origin-model="foundation">
-      <unit bldFile="app/printing/imageprint/imageprintui/group"/>
-     </component>
-     <component unofficial="yes" name="imageprint_build" origin-model="foundation">
-      <unit bldFile="app/printing/imageprint/group"/>
-     </component>
-    </collection>
-    <collection name="printing_info" long-name="Printing Info" level="app">
-     <component unofficial="yes" name="printing_build" long-name="Printing Build" origin-model="foundation">
-      <unit bldFile="app/printing/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="files" long-name="File Manager Apps" tech_domain="pr" level="apps" levels="support apps">
-    <collection name="filemanager" long-name="File Manager" level="apps">
-     <component name="filemanager_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/files/filemanager/help/group"/>
-     </component>
-     <component name="filemanager_build" origin-model="foundation">
-      <unit bldFile="app/files/filemanager/group"/>
-     </component>
-    </collection>
-    <collection name="filesystemuis" long-name="File System UIs" level="support">
-     <component name="memscaneng" long-name="Mem Scan Eng" origin-model="foundation">
-      <unit bldFile="app/files/filesystemuis/memscaneng/group"/>
-     </component>
-     <component name="memstatepopup" long-name="Mem State Popup" origin-model="foundation">
-      <unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
-     </component>
-     <component unofficial="yes" name="filesystemuis_build" long-name="File System UIs Build" origin-model="foundation">
-      <unit bldFile="app/files/filesystemuis/group"/>
-     </component>
-    </collection>
-    <collection name="files_info" long-name="File Manager Apps Info" level="apps">
-     <component unofficial="yes" name="files_plat" long-name="File Manager Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/files/files_plat/group"/>
-     </component>
-     <component unofficial="yes" name="files_build" long-name="File Manager Apps Build" origin-model="foundation">
-      <unit bldFile="app/files/group"/>
+   <block name="camera" long-name="Camera Apps" tech_domain="ma" level="apps" levels="empty 1">
+    <collection name="camerauis" long-name="Camera UIs" level="1">
+     <component name="activepalette" long-name="Active Palette" origin-model="foundation">
+      <unit bldFile="app/camera/camerauis/activepalette/group"/>
+     </component>
+     <component name="cameraapp" long-name="Camera Application" origin-model="foundation">
+      <!-- <unit bldFile="app/camera/camerauis/cameraapp/generic/camerauiconfigmanager/group"/> -->
+      <!-- <unit bldFile="app/camera/camerauis/cameraapp/generic/gscamcorderplugin/group"/> -->
+      <unit bldFile="app/camera/camerauis/cameraapp/group"/>
+      <!-- <unit bldFile="app/camera/camerauis/cameraapp/help/group"/> -->
+     </component>
+    </collection>
+    <collection name="camera_info" long-name="Camera Apps Info" level="1">
+     <component unofficial="yes" name="camera_build" long-name="Camera Apps Build" origin-model="foundation">
+      <unit bldFile="app/camera/group"/>
+     </component>
+     <component unofficial="yes" name="camera_plat" long-name="Camera Apps Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/> -->
+      <unit bldFile="app/camera/camera_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="commonemail" long-name="Email Apps" tech_domain="pr" level="apps" levels="service support ui app">
+    <collection name="emailservices" long-name="Email Services" level="service">
+     <component name="emailframework" long-name="Email framework" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailservices/emailframework/group"/>
+     </component>
+     <component name="emailserver" long-name="Email Server" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailservices/emailserver/group"/>
+     </component>
+     <component name="psmruadapter" long-name="PSMRU Adapter" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
+     </component>
+     <component name="emailstore" long-name="Email Store" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailservices/emailstore/group"/>
+     </component>
+     <component name="emaildebug" long-name="Email Debug" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
+     </component>
+     <component unofficial="yes" name="emailservices_build" long-name="Email Services Build" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailservices/group"/>
+     </component>
+    </collection>
+    <collection name="ipsservices" long-name="IPS Services" level="service">
+     <component name="ipssossettings" long-name="IPSSOS Settings" origin-model="foundation">
+      <unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
+     </component>
+     <component name="ipssosplugin" long-name="IPSSOS Plugin" origin-model="foundation">
+      <unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
+     </component>
+     <component name="ipssosaoplugin" long-name="IPSSOS AO Plugin" origin-model="foundation">
+      <unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
+     </component>
+     <component unofficial="yes" name="ipsservices_build" long-name="IPS Services Build" origin-model="foundation">
+      <unit bldFile="app/commonemail/ipsservices/group"/>
+     </component>
+    </collection>
+    <collection name="emailcontacts" long-name="Email Contacts" level="support">
+     <component name="contactactionservice" long-name="Contact Action Service" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
+     </component>
+     <component name="contactactionmenu" long-name="Contact Action Menu" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
+     </component>
+     <component name="remotecontactlookup" long-name="Remote Contact Lookup" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailcontacts/remotecontactlookup/group"/>
+     </component>
+     <component unofficial="yes" name="emailcontacts_build" long-name="Email Contacts Build" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailcontacts/group"/>
+     </component>
+    </collection>
+    <collection name="meetingrequest" long-name="Meeting Request" level="ui">
+     <component name="mrcommon" long-name="MR Common" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
+     </component>
+     <component name="mrdb" long-name="MR Database" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
+     </component>
+     <component name="mrpolicy" long-name="MR Policy" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
+     </component>
+     <component name="mrservices" long-name="MR Services" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
+     </component>
+     <component name="mrgui" long-name="MR GUI" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
+     </component>
+     <component name="mrentry" long-name="MR Entry" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
+     </component>
+     <component name="mrtasks" long-name="MR Tasks" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
+     </component>
+     <component name="mrutils" long-name="MR Utils" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
+     </component>
+     <component name="mrutilscalplugin" long-name="MR Utils Cal Plugin" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
+     </component>
+     <component name="mrviewer" long-name="MR Viewer" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
+     </component>
+     <component name="mrviewercalplugin" long-name="MR Viewer Cal Plugin" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
+     </component>
+     <component name="mricalviewer" long-name="MR iCal Viewer" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
+     </component>
+     <component name="mrversit2" long-name="MR Versit2" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
+     </component>
+     <component name="mragnversit2" long-name="MR Agenda Versit2" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
+     </component>
+     <component name="mrcasplugin" long-name="MR CAS Plugin" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
+     </component>
+     <component name="mrurlparserplugin" long-name="MR URLParser Plugin" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
+     </component>
+     <component unofficial="yes" name="meetingrequest_build" long-name="Meeting Request Build" origin-model="foundation">
+      <unit bldFile="app/commonemail/meetingrequest/group"/>
+     </component>
+    </collection>
+    <collection name="emailuis" long-name="Email UIs" level="app">
+     <component name="emailui" long-name="Email UI" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailuis/emailui/group"/>
+     </component>
+     <component name="gsemailsettings" long-name="GSEmail Settings" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
+     </component>
+     <component name="uicomponents" long-name="UI Components" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
+     </component>
+     <component name="widget" long-name="Widget" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailuis/widget/group"/>
+     </component>
+     <component unofficial="yes" name="emailuis_build" long-name="Email UIs Build" origin-model="foundation">
+      <unit bldFile="app/commonemail/emailuis/group"/>
+     </component>
+    </collection>
+    <collection name="emailhelp" long-name="Email Help" level="support">
+     <component name="emailhelp_build" origin-model="foundation">
+      <!-- <unit bldFile="app/commonemail/emailhelp/group"/> -->
+     </component>
+    </collection>
+    <collection name="legacy" long-name="Legacy Email" level="support">
+     <component name="iad_rofs" long-name="IAD ROFS" origin-model="foundation"/>
+     <component name="ls_pt_hack" long-name="ls pt hack" origin-model="foundation"/>
+     <component name="settingwizard" long-name="Setting Wizard" origin-model="foundation"/>
+     <!-- Empty duplicate component starter removed -->
+    </collection>
+    <collection name="commonemail_help" long-name="Email Help" level="support">
+     <component name="help" origin-model="foundation"/>
+    </collection>
+    <collection name="commonemail_info" long-name="Email Apps Info" level="app">
+     <component unofficial="yes" name="email_plat" class="api" origin-model="foundation">
+      <unit bldFile="app/commonemail/email_plat/group"/>
+     </component>
+     <component unofficial="yes" name="commonemail_build" long-name="Email Apps Build" origin-model="foundation">
+      <unit bldFile="app/commonemail/group"/>
      </component>
     </collection>
    </block>
@@ -1012,228 +451,936 @@
      </component>
     </collection>
    </block>
-   <block name="organizer" long-name="Organizer Application Suite" tech_domain="pr" level="apps" span="2" levels="support services engine ui">
-    <collection name="alarmui" long-name="Alarm UI" level="ui">
-     <component unofficial="yes" name="alarmui_build" long-name="Alarm UI Build" origin-model="foundation">
-      <unit bldFile="app/organizer/alarmui/group"/>
-     </component>
-    </collection>
-    <collection name="calendarui" long-name="Calendar UI" level="ui">
-     <component name="calendarui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/help/group"/>
-     </component>
-     <component name="commonutils" long-name="Common Utils" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/commonutils/group"/>
-     </component>
-     <component name="globaldata" long-name="Global Data" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/globaldata/group"/>
-     </component>
-     <component name="settings" long-name="Settings" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
-      <unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
-     </component>
-     <component name="customisation" long-name="Customisation" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/customisation/group"/>
-     </component>
-     <component name="customisationmanager" long-name="Customisation Manager" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
-     </component>
-     <component name="views" long-name="Views" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/views/group"/>
-     </component>
-     <component name="calendarui_controller" long-name="Controller" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/controller/group"/>
-     </component>
-     <component name="editors" long-name=" Editors" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/editors/group"/>
-     </component>
-     <component name="application" long-name="Application" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/application/group"/>
-     </component>
-     <component name="missedalarmindicatorplugin" long-name="Missed Alarm Indicator Plugin" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-     </component>
-     <component name="calendarui_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
-      <unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
-     </component>
-     <component name="regionalplugins" long-name="Regional Plugins" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-      <unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-      <unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-      <unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
-     </component>
-     <!-- Empty duplicate component inc removed -->
-     <component unofficial="yes" name="calendarui_build" long-name="Calendar UI Build" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarui/group"/>
-     </component>
-    </collection>
-    <collection name="clock2" long-name="Clock2" level="ui">
-     <component name="clockengines" long-name="Clock Engines" origin-model="foundation">
-      <unit bldFile="app/organizer/clock2/clockengines/group"/>
-     </component>
-     <component name="clockui" long-name="Clock UI" origin-model="foundation">
-      <unit bldFile="app/organizer/clock2/clockui/group"/>
-      <!-- <unit bldFile="app/organizer/clock2/clockui/plugins/datetimeviewplugin/group"/> -->
-     </component>
-     <component name="clock2_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/organizer/clock2/help/group"/>
-     </component>
-     <component unofficial="yes" name="clock2_build" long-name="Clock2 Build" origin-model="foundation">
-      <unit bldFile="app/organizer/clock2/group"/>
-     </component>
-    </collection>
-    <collection name="meetingui" long-name="Meeting UI" level="ui">
-     <component name="attendeeview" long-name="Attendee View" origin-model="foundation">
-      <unit bldFile="app/organizer/meetingui/attendeeview/group"/>
-     </component>
-     <component name="agnentryui" long-name="Agn Entry UI" origin-model="foundation">
-      <unit bldFile="app/organizer/meetingui/agnentryui/group"/>
-     </component>
-     <component name="meetingrequestutils" long-name="Meeting Request Utils" origin-model="foundation">
-      <unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
-     </component>
-     <component name="meetingrequestviewers" long-name="Meeting Request Viewers" origin-model="foundation">
-      <unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
-     </component>
-     <component unofficial="yes" name="meetingui_build" long-name="Meeting UI Build" origin-model="foundation">
-      <unit bldFile="app/organizer/meetingui/group"/>
-     </component>
-    </collection>
-    <collection name="notepad" long-name="Notepad" level="ui">
-     <component name="notepad_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/organizer/notepad/help/group"/>
-     </component>
-     <component name="notepad1" long-name="Notepad1" origin-model="foundation">
-      <unit bldFile="app/organizer/notepad/notepad1/group"/>
-      <!-- <unit bldFile="app/organizer/notepad/notepad1/syncmladapter/group"/> -->
-     </component>
-     <component name="txtrecog" long-name="Txt Recog" origin-model="foundation">
-      <unit bldFile="app/organizer/notepad/txtrecog/group"/>
-     </component>
-     <component unofficial="yes" name="notepad_build" long-name="Notepad Build" origin-model="foundation">
-      <unit bldFile="app/organizer/notepad/group"/>
-     </component>
-    </collection>
-    <collection name="searchui" long-name="Search UI" level="ui">
-     <component name="searchui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/organizer/searchui/help/group"/>
-     </component>
-     <component name="searchapp" long-name="Search App" origin-model="foundation">
-      <unit bldFile="app/organizer/searchui/searchapp/group"/>
-      <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
-      <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="searchui_build" long-name="Search UI Build" origin-model="foundation">
-      <unit bldFile="app/organizer/searchui/group"/>
-     </component>
-    </collection>
-    <collection name="calendarengines" long-name="Calendar Engines" level="engine">
-     <component name="versit2" long-name="Versit 2" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarengines/versit2/group"/>
-     </component>
-     <component name="agnversit2" long-name="Agenda Versit2" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
-     </component>
-     <component name="caleninterimutils" long-name="Calen Interim Utils" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
-     </component>
-     <component name="calenimp" long-name="Calen Imp" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarengines/calenimp/group"/>
-     </component>
-     <component name="calenlauncher" long-name="Calen Launcher" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
-     </component>
-     <component unofficial="yes" name="calendarengines_build" long-name="Calendar Engines Build" origin-model="foundation">
-      <unit bldFile="app/organizer/calendarengines/group"/>
-     </component>
-    </collection>
-    <collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-     <component name="mrmailbox" long-name="MR Mailbox" origin-model="foundation">
-      <unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
-     </component>
-     <component name="mrmailboxutils" long-name="MR Mailbox Utils" origin-model="foundation">
-      <unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-     </component>
-    </collection>
-    <collection name="alarmengines" long-name="Alarm Engines" level="engine">
-     <component name="missedalarmstore" long-name="Missed Alarm Store" origin-model="foundation">
-      <unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
-     </component>
-     <component unofficial="yes" name="alarmengines_build" long-name="Alarm Engines Build" origin-model="foundation">
-      <unit bldFile="app/organizer/alarmengines/group"/>
-     </component>
-    </collection>
-    <collection name="searchfw" long-name="Search Framework" level="services">
-     <component name="coresearchfw" long-name="Core Search Framework" origin-model="foundation">
-      <unit bldFile="app/organizer/searchfw/coresearchfw/group"/>
-     </component>
-     <component name="searchfw_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="app/organizer/searchfw/plugins/group"/>
-     </component>
-     <component unofficial="yes" name="searchfw_build" long-name="Search Framework Build" origin-model="foundation">
-      <unit bldFile="app/organizer/searchfw/group"/>
-     </component>
-    </collection>
-    <collection name="pimappservices" long-name="PIM App Services" level="services">
-     <component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-     </component>
-     <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-     </component>
-     <component name="agendamodeltest" long-name="Agenda Model Test" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv" mrp="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv/app-engines_testagendasrv.mrp"/>
-     </component>
-     <component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="officeappeng" long-name="Office App Engines" level="engine">
-     <component name="datamodel" long-name="Data Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/organizer/officeappeng/datamodel/group" mrp="app/organizer/officeappeng/datamodel/group/app-engines_damodel.mrp"/>
-     </component>
-     <component name="sheeteng" long-name="Sheet Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/organizer/officeappeng/sheeteng/group" mrp="app/organizer/officeappeng/sheeteng/group/app-engines_sheng.mrp"/>
-     </component>
-     <component name="charteng" long-name="Chart" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="app/organizer/officeappeng/charteng/group/app-engines_chart.mrp"/>
-     </component>
-     <component name="wordeng" long-name="Word Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/organizer/officeappeng/wordeng/group" mrp="app/organizer/officeappeng/wordeng/group/app-engines_wpeng.mrp"/>
-     </component>
-    </collection>
-    <collection name="pimappsupport" long-name="PIM Application Support" level="support">
-     <component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-     </component>
-     <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-     </component>
-     <component name="n:chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
-     <component unofficial="yes" name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_pub/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_pub/notepad_library_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="organizer_build" long-name="Organizer Application Suite Build" origin-model="foundation">
-      <unit bldFile="app/organizer/group"/>
-     </component>
-     <component unofficial="yes" name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_plat/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
-     </component>
-    <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+   <block name="contentcontrol" long-name="Content Control Daemons" tech_domain="dm" level="services" levels="1 2">
+    <collection name="applicationmanagement" long-name="Application Management" level="1">
+     <component name="options" long-name="Options" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
+     </component>
+     <component name="applicationmanagement_client" long-name="Client" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
+     </component>
+     <component name="applicationmanagement_server" long-name="Server" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
+     </component>
+     <component name="rfsplugin" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
+     </component>
+     <component name="amadapter2" long-name="AM Adapter2" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
+     </component>
+    </collection>
+    <collection name="customization" long-name="Customization" level="2">
+     <component name="dmutils" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
+     </component>
+     <component name="uisettingssrv" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
+     </component>
+     <component name="isadapter" long-name="IS Adapter" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
+     </component>
+     <component name="supadapter" long-name="SUPAdapter" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
+     </component>
+     <component name="wallpaperadapter" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
+     </component>
+     <component name="operatorlogoadapter" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
+     </component>
+     <component name="screensaveradapter" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
+     </component>
+     <component name="themesadapter" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
+     </component>
+     <component name="embeddedlinkadapter" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
+     </component>
+    </collection>
+    <collection name="omads" long-name="OMA DS" level="1">
+     <component name="omadsappui" long-name="OMA DS App UI" origin-model="foundation">
+      <unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
+     </component>
+     <component name="omadsextensions" long-name="OMA DS Extensions" origin-model="foundation">
+      <!-- <unit bldFile="app/contentcontrol/omads/omadsextensions/dsutils/emailxmlutils/bld"/> -->
+      <unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
+     </component>
+    </collection>
+    <collection name="contentcontrol_info" long-name="Content Control Daemons Info" level="2">
+     <component unofficial="yes" name="contentcontrol_build" long-name="Content Control Daemons Build" origin-model="foundation">
+      <unit bldFile="app/contentcontrol/group"/>
+     </component>
+     <component unofficial="yes" name="contentctrl_plat" class="api" origin-model="foundation">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="conversations" long-name="Conversation Apps" tech_domain="pr" level="apps" levels="settings utils ui">
+    <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
+     <component name="vimpstsettings" origin-model="foundation">
+      <unit bldFile="app/conversations/uiservicetabsettings/group"/>
+     </component>
+    </collection>
+    <collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
+     <component name="imstutils_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/conversations/imstutils/help/group"/>
+     </component>
+     <component name="imconnectionprovider" long-name="IM Connection Provider" origin-model="foundation">
+      <unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
+      <!-- <unit bldFile="app/conversations/imstutils/imconnectionprovider/tsrc/imconnectionprovider_test/group"/> -->
+     </component>
+     <component name="xmppadapter" long-name="XMPP Adapter" origin-model="foundation">
+      <unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
+      <!-- <unit bldFile="app/conversations/imstutils/xmppadapter/tsrc/xmppadapter_test/group"/> -->
+     </component>
+     <component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
+      <unit bldFile="app/conversations/imstutils/imconversationview/group"/>
+      <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
+      <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
+     </component>
+     <component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="foundation">
+      <unit bldFile="app/conversations/imstutils/group"/>
+     </component>
+    </collection>
+    <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
+     <component name="vimpstutils" long-name="VIMP ST Utilities" origin-model="foundation">
+      <unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
+     </component>
+     <component name="vimpststorage" long-name="VIMP ST Storage" origin-model="foundation">
+      <unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
+      <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactlist_ut/group"/> -->
+      <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group"/> -->
+      <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group"/> -->
+     </component>
+     <component name="vimpstengine" long-name="VIMP ST Engine" origin-model="foundation">
+      <unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
+      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstengine/tsrc/group"/> -->
+     </component>
+     <component name="vimpstcmdprocess" long-name="VIMP ST Command Process" origin-model="foundation">
+      <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
+      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/tsrc/group"/> -->
+     </component>
+     <component name="vimpstui" long-name="VIMP ST UI" origin-model="foundation">
+      <unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
+     </component>
+     <component name="vimpstdetailsviewplugin" long-name="VIMP ST Details View Plugin" origin-model="foundation">
+      <unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
+     </component>
+     <component unofficial="yes" name="uiservicetab_build" long-name="UI Service Tab Build" origin-model="foundation">
+      <unit bldFile="app/conversations/uiservicetab/group"/>
+     </component>
+    </collection>
+    <collection name="servicewidget" long-name="Service Widget" level="ui">
+     <component name="servicewidgetactionhandler" long-name="Service Widget Action Handler" origin-model="foundation">
+      <unit bldFile="app/conversations/servicewidget/servicewidgetactionhandler/group"/>
+     </component>
+     <component name="servicewidgetdatapublisher" long-name="Service Widget Data Publisher" origin-model="foundation">
+      <unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
+     </component>
+     <component name="themes" long-name="Themes" origin-model="foundation">
+      <unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget/group"/>
+     </component>
+     <component unofficial="yes" name="servicewidget_build" long-name="Service Widget Build" origin-model="foundation">
+      <unit bldFile="app/conversations/servicewidget/group"/>
+     </component>
+    </collection>
+    <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
+     <component unofficial="yes" name="conversations_plat" long-name="Conversation Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/conversations/conversations_plat/group"/>
+     </component>
+     <component unofficial="yes" name="conversations_build" long-name="Conversation Apps Build" origin-model="foundation">
+      <unit bldFile="app/conversations/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="devicecontrol" long-name="Device Control Daemons" tech_domain="dm" level="services" levels="oma mid app">
+    <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
+     <component name="devdiagapp" long-name="Dev Diag App" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
+     </component>
+     <component name="devdiaggsplugin" long-name="Dev Diag GS Plugin" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
+     </component>
+     <component name="diagplugins" long-name="Diag Plugins" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
+     </component>
+     <component name="diagsuites" long-name="Diag Suites" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
+     </component>
+     <component unofficial="yes" name="devicediagnostics_build" long-name="Device Diagnostics Build" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/devicediagnostics/group"/>
+     </component>
+    </collection>
+    <collection name="fotaapplication" long-name="FOTA Application" level="app">
+     <component name="fotaserver" long-name="FOTA Server" origin-model="foundation">
+      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmsclient/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmserver/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotarfsplugin/group"/> -->
+      <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
+      <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
+     </component>
+     <component unofficial="yes" name="fotaapp" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
+     </component>
+    </collection>
+    <collection name="omadm" long-name="OMA Device Management" level="oma">
+     <component name="omadmappui" long-name="OMA DM App UI" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
+      <!-- <unit bldFile="app/devicecontrol/omadm/omadmappui/tsrc/group"/> -->
+     </component>
+     <component name="omadmextensions" long-name="OMA DM Extensions" origin-model="foundation">
+      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/email/tsrc/group"/> -->
+      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/mms/tsrc/group"/> -->
+      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmldm/tsrc/group"/> -->
+      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmldm12/tsrc/group"/> -->
+      <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmlds/tsrc/group"/> -->
+      <unit bldFile="app/devicecontrol/omadm/omadmextensions/group"/>
+     </component>
+    </collection>
+    <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
+     <component name="pnpms" long-name="PnP MS" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
+      <!-- <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/tsrc/group"/> -->
+     </component>
+    </collection>
+    <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
+     <component name="omacpadapters" long-name="OMA CP Adapters" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
+     </component>
+    </collection>
+    <collection name="devicecontrol_info" long-name="Device Control Daemons Info" level="app">
+     <component unofficial="yes" name="devicecontrol_build" long-name="Device Control Daemons Build" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/group"/>
+     </component>
+     <component unofficial="yes" name="customization_test" origin-model="foundation">
+      <!-- <unit bldFile="app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
+     </component>
+     <component unofficial="yes" name="applicationmanagement_build" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/applicationmanagement/group"/>
+     </component>
+     <component unofficial="yes" name="customization_build" origin-model="foundation">
+      <unit bldFile="app/devicecontrol/customization/group"/>
+     </component>
+     <component unofficial="yes" name="applicationmanagement_test" origin-model="foundation">
+      <!-- <unit bldFile="app/devicecontrol/applicationmanagement/tsrc/tarmappmng/group"/> -->
+     </component>
+    </collection>
+   </block>
+   <block name="dictionary" long-name="Dictionary" tech_domain="pr" level="services" levels="appl">
+    <collection name="userdict" long-name="User Dictionary" level="appl">
+     <component name="userdict_build" long-name="UserDict Client" origin-model="foundation">
+      <unit bldFile="app/dictionary/userdict/group"/>
+     </component>
+    </collection>
+    <collection name="dictionary_info" long-name="Dictionary Info" level="appl">
+     <component unofficial="yes" name="dictionary_plat" long-name="Dictionary Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/dictionary/dictionary_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="files" long-name="File Manager Apps" tech_domain="pr" level="apps" levels="support apps">
+    <collection name="filemanager" long-name="File Manager" level="apps">
+     <component name="filemanager_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/files/filemanager/help/group"/>
+     </component>
+     <component name="filemanager_build" origin-model="foundation">
+      <unit bldFile="app/files/filemanager/group"/>
+     </component>
+    </collection>
+    <collection name="filesystemuis" long-name="File System UIs" level="support">
+     <component name="memscaneng" long-name="Mem Scan Eng" origin-model="foundation">
+      <unit bldFile="app/files/filesystemuis/memscaneng/group"/>
+     </component>
+     <component name="memstatepopup" long-name="Mem State Popup" origin-model="foundation">
+      <unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
+     </component>
+     <component unofficial="yes" name="filesystemuis_build" long-name="File System UIs Build" origin-model="foundation">
+      <unit bldFile="app/files/filesystemuis/group"/>
+     </component>
+    </collection>
+    <collection name="files_info" long-name="File Manager Apps Info" level="apps">
+     <component unofficial="yes" name="files_plat" long-name="File Manager Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/files/files_plat/group"/>
+     </component>
+     <component unofficial="yes" name="files_build" long-name="File Manager Apps Build" origin-model="foundation">
+      <unit bldFile="app/files/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="gallery" long-name="Gallery Apps" tech_domain="ma" level="apps" levels="app">
+    <collection name="mediagallery" long-name="Media Gallery" level="app">
+     <component name="mediagallery2" long-name="Media Gallery 2" origin-model="foundation">
+      <unit bldFile="app/gallery/mediagallery/mediagallery2/group"/>
+     </component>
+    </collection>
+    <collection name="gallery_info" long-name="Gallery Apps Info" level="app">
+     <component unofficial="yes" name="gallery_build" long-name="Gallery Apps Build" origin-model="foundation">
+      <unit bldFile="app/gallery/group"/>
+     </component>
+     <component unofficial="yes" name="gallery_plat" long-name="Gallery Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/gallery/gallery_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="graphicsuis" long-name="Graphics UIs" tech_domain="ui" level="services" levels="util ui">
+    <collection name="svgtviewer" long-name="SVGT Viewer" level="ui">
+     <component name="svgtviewerplugin" long-name="SVGT Viewer Plugin" origin-model="foundation">
+      <unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
+     </component>
+     <component unofficial="yes" name="svgtviewer_build" long-name="SVGT Viewer Build" origin-model="foundation">
+      <unit bldFile="app/graphicsuis/svgtviewer/group"/>
+     </component>
+    </collection>
+    <collection name="graphicsuis_info" long-name="Graphics UIs Info" level="ui">
+     <component unofficial="yes" name="graphicsuis_build" long-name="Graphics UIs Build" origin-model="foundation">
+      <unit bldFile="app/graphicsuis/group"/>
+     </component>
+     <component unofficial="yes" name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/graphicsuis/graphicsuis_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="helps" long-name="Help Apps" tech_domain="ui" level="apps" span="2" levels="eng tools unused  ui">
+    <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="ui">
+     <component name="aiwhelpprovider" long-name="Aiw Help Provider" origin-model="foundation">
+      <!-- <unit bldFile="app/helps/csxhelp/aiwhelpprovider/group"/> -->
+     </component>
+     <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build" origin-model="foundation">
+      <unit bldFile="app/helps/csxhelp/group"/>
+     </component>
+    </collection>
+   <collection name="n:symhelptools" long-name="Symbian Help Tools" level="tools">
+     <component name="n:mbmcodec" long-name="MBM Codec" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="app/helps/symhelp/mbmcodec/group" mrp="app/helps/symhelp/mbmcodec/group/tools_sdk_eng_mbmcodec.mrp"/> -->
+     </component>
+     <component name="n:cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="app/helps/symhelp/cshlpcmpgui/group" mrp="app/helps/symhelp/cshlpcmpgui/group/tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/> -->
+     </component>
+     <component name="n:cshlpcmpfrontend" long-name="CSHelp Compiler Frontend" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="app/helps/symhelp/cshlpcmpfrontend/group" mrp="app/helps/symhelp/cshlpcmpfrontend/group/tools_sdk_eng_cshlpcmp_frontend.mrp"/> -->
+     </component>
+     <component name="n:cshlpcmpbackend" long-name="CSHelp Compiler Backend" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
+     </component>
+    </collection>
+    <collection name="symhelp" long-name="Symbian Help" level="eng">
+     <component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+     </component>
+    </collection>
+    <collection name="helps_info" long-name="Help Apps Info" level="ui">
+     <component name="helps_metadata" long-name="Help Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="homescreen" long-name="Home Screen Apps" tech_domain="ui" level="apps" levels="fw apps">
+    <collection name="idlehomescreen" long-name="Idle Homescreen" level="apps">
+     <component name="nativeuicontroller" long-name="Native UI Controller" origin-model="foundation">
+      <unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
+     </component>
+     <component name="exths" long-name="ExtHS" origin-model="foundation">
+      <unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
+     </component>
+     <component name="activeidle3" long-name="Active Idle 3" origin-model="foundation">
+      <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/group"/> -->
+      <unit bldFile="app/homescreen/idlehomescreen/activeidle3/group"/>
+      <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/> -->
+     </component>
+     <component name="hsplugins" long-name="HS Plugins" origin-model="foundation">
+      <unit bldFile="app/homescreen/idlehomescreen/hsplugins/group"/>
+      <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/qhd_tch/organizer_2001f481/group"/> -->
+      <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001f48d/group"/> -->
+      <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001fdba/group"/> -->
+     </component>
+    </collection>
+    <collection name="menufw" long-name="Menu Framework" level="fw">
+     <component name="hierarchynavigator" long-name="Hierarchy Navigator" origin-model="foundation">
+      <unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
+     </component>
+     <component name="menufwui" long-name="Menu Framework UI" origin-model="foundation">
+      <unit bldFile="app/homescreen/menufw/menufwui/group"/>
+     </component>
+     <component name="menusuites" long-name="Menu Suites" origin-model="foundation">
+      <unit bldFile="app/homescreen/menufw/menusuites/group"/>
+     </component>
+     <component unofficial="yes" name="menufw_build" long-name="Menu Framework Build" origin-model="foundation">
+      <unit bldFile="app/homescreen/menufw/group"/>
+     </component>
+    </collection>
+    <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
+     <component unofficial="yes" name="homescreen_build" long-name="Home Screen Apps Build" origin-model="foundation">
+      <unit bldFile="app/homescreen/group"/>
+     </component>
+     <component unofficial="yes" name="homescreen_test" long-name="Home Screen Apps Test" origin-model="foundation">
+      <!-- <unit bldFile="app/homescreen/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/homescreen/homescreen_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="im" long-name="Instant Messaging Apps" tech_domain="pr" level="apps" levels="support engine apps">
+    <collection name="impsengine" long-name="IMPS Engine" level="engine">
+     <component name="impsengine_utils" long-name="Utilities" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/utils/group"/> -->
+     </component>
+     <component name="datautils" long-name="Data Utils" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/datautils/group"/> -->
+     </component>
+     <component name="impsengine_client" long-name="Client" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/client/group"/> -->
+     </component>
+     <component name="imapi" long-name="IM API" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/imapi/group"/> -->
+     </component>
+     <component name="imlauncher" long-name="IM Launcher" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/imlauncher/group"/> -->
+     </component>
+     <component name="impsdatachannel" long-name="Imps Data Channel" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/impsdatachannel/group"/> -->
+     </component>
+     <component name="impsipcirwatcher" long-name="Imps Ip Cir Watcher" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/impsipcirwatcher/group"/> -->
+     </component>
+     <component name="messageencoder" long-name="Message Encoder" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/messageencoder/wbxml/group"/> -->
+     </component>
+     <component name="engsrv" long-name="Eng Srv" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/engsrv/group"/> -->
+     </component>
+     <component name="impswatcher" long-name="Imps Watcher" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/impswatcher/group"/> -->
+     </component>
+     <component name="wvotaparser" long-name="WV OTA Parser" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/wvotaparser/group"/> -->
+     </component>
+     <component unofficial="yes" name="impsengine_test" long-name="IMPS Engine Test" origin-model="foundation">
+      <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertimerprocess/group"/> -->
+      <!-- <unit bldFile="app/im/impsengine/tsrc/public/advance/group"/> -->
+      <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertest/group"/> -->
+      <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/group"/> -->
+      <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertestplugin/group"/> -->
+     </component>
+     <component unofficial="yes" name="impsengine_build" long-name="IMPS Engine Build" origin-model="foundation">
+      <unit bldFile="app/im/impsengine/group"/>
+     </component>
+    </collection>
+    <collection name="pecengine" long-name="Presence Engine" level="engine">
+     <component name="coreutilslib2" long-name="Core Utils Lib 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/coreutilslib2/group"/> -->
+     </component>
+     <component name="storagemanager2" long-name="Storage Manager 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/storagemanager2/group"/> -->
+     </component>
+     <component name="pecparser2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/parser2/group"/> -->
+     </component>
+     <component name="attributelibrary2" long-name="Attribute Library 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/attributelibrary2/group"/> -->
+     </component>
+     <component name="listlibrary2" long-name="List Library 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/listlibrary2/group"/> -->
+     </component>
+     <component name="transferadapter2" long-name="Transfer Adapter 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/transferadapter2/group"/> -->
+     </component>
+     <component name="presenceserver2" long-name="Presence Server 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/presenceserver2/group"/> -->
+     </component>
+     <component name="presencemanager2" long-name="Presence Manager 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/presencemanager2/group"/> -->
+     </component>
+     <component name="janitorplugin2" long-name="Janitor Plugin 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/janitorplugin2/group"/> -->
+     </component>
+     <component name="pluginserver2" long-name="Plugin Server 2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/pecengine/pluginserver2/group"/> -->
+     </component>
+     <component unofficial="yes" name="pecengine_build" long-name="Presence Engine Build" origin-model="foundation">
+      <unit bldFile="app/im/pecengine/group"/>
+     </component>
+    </collection>
+    <collection name="presadap12" long-name="Presence Adap 12" level="support">
+     <component name="presparser2" origin-model="foundation">
+      <!-- <unit bldFile="app/im/presadap12/parser2/group"/> -->
+     </component>
+     <component name="impsplugin" long-name="IMPS Plugin" origin-model="foundation">
+      <!-- <unit bldFile="app/im/presadap12/impsplugin/group"/> -->
+     </component>
+     <component unofficial="yes" name="presadap12_build" long-name="Presence Adap 12 Build" origin-model="foundation">
+      <!-- <unit bldFile="app/im/presadap12/group"/> -->
+     </component>
+    </collection>
+    <collection name="wvsettings20" long-name="WV Settings 20" level="support">
+     <component name="wvsapsettingsstore" origin-model="foundation">
+      <unit bldFile="app/im/wvsettings20/group"/>
+     </component>
+    </collection>
+    <collection name="wvuing" long-name="WV UI NG" level="apps">
+     <component name="imindicatorplugin" long-name="IM Indicator Plugin" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/imindicatorplugin/group"/> -->
+     </component>
+     <component name="impsconnectionui" long-name="IMPS Connection UI" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/impsconnectionui/group"/> -->
+     </component>
+     <component name="impsservicesettingsui" long-name="IMPS Service Settings UI" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/impsservicesettingsui/group"/> -->
+     </component>
+     <component name="impsalwaysonlineplugin" long-name="IMPS Always Online Plugin" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/impsalwaysonlineplugin/group"/> -->
+     </component>
+     <component name="wvvariant" long-name="Wvvariant" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvvariant/group"/> -->
+     </component>
+     <component name="wvuiada" long-name="Wvuiada" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvuiada/group"/> -->
+     </component>
+     <component name="wvuistorage" long-name="WV UI Storage" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvuistorage/group"/> -->
+     </component>
+     <component name="wvuipresence" long-name="WV UI Presence" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvuipresence/group"/> -->
+     </component>
+     <component name="wvlogger" long-name="Wvlogger" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvlogger/group"/> -->
+     </component>
+     <component name="wvuieng" long-name="Wvuieng" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvuieng/group"/> -->
+     </component>
+     <component name="imutils" long-name="Im Utils" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/imutils/group"/> -->
+     </component>
+     <component name="wvuiprocess" long-name="WV UI Process" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvuiprocess/group"/> -->
+     </component>
+     <component name="wvcommandutils" long-name="Wv Command Utils" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvcommandutils/group"/> -->
+     </component>
+     <component name="wvaudiomanager" long-name="Wv Audio Manager" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvaudiomanager/group"/> -->
+     </component>
+     <component name="wvuiave" long-name="Wvuiave" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/wvuiave/group"/> -->
+     </component>
+     <component name="wvimlauncher" long-name="IM Launcher" origin-model="foundation">
+      <!-- <unit bldFile="app/im/wvuing/imlauncher/group"/> -->
+     </component>
+     <component unofficial="yes" name="wvuing_build" long-name="WV UI NG Build" origin-model="foundation">
+      <unit bldFile="app/im/wvuing/group"/>
+     </component>
+    </collection>
+    <collection name="im_info" long-name="Instant Messaging Apps Info" level="apps">
+     <component unofficial="yes" name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/im/im_plat/group"/>
+      <unit bldFile="app/im/im_plat/wv_sap_settings_api/tsrc"/>
+     </component>
+     <component unofficial="yes" name="im_pub" long-name="Instant Messaging Apps Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/im/im_pub/group"/>
+      <!-- <unit bldFile="app/im/im_pub/im_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertest/group"/> -->
+      <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertestplugin/group"/> -->
+      <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertimerprocess/group"/> -->
+     </component>
+     <component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help" origin-model="foundation">
+      <unit bldFile="app/im/help/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="imgeditor" long-name="Image Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
+    <collection name="imageeditor" long-name="Image Editor" level="ui">
+     <component name="pb" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditor/pb/group"/>
+     </component>
+     <component name="iepb" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
+     </component>
+     <component name="imageeditorui" long-name="Image Editor UI" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
+     </component>
+     <component name="imageeditormanager" long-name="Image Editor Manager" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
+     </component>
+     <component name="imageeditorapp" long-name="Image Editor App" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
+     </component>
+     <component name="imageeditor_plugins" long-name="Plugins" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
+      <unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
+     </component>
+     <component name="editorprovider" long-name="Editor Provider" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
+     </component>
+     <component unofficial="yes" name="imageeditor_build" long-name="Image Editor Build" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditor/group"/>
+     </component>
+    </collection>
+    <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
+     <component name="filters" long-name="Filters" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
+      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
+     </component>
+     <component name="imageeditorutils" long-name="Image Editor Utils" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
+     </component>
+     <component name="systemparameters" long-name="System Parameters" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
+     </component>
+     <component name="enginewrapper" long-name="Engine Wrapper" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
+     </component>
+     <component name="jpegrotator" long-name="Jpeg Rotator" origin-model="foundation">
+      <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegrotator/group"/> -->
+     </component>
+     <component name="jpegscaler" long-name="Jpeg Scaler" origin-model="foundation">
+      <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegscaler/group"/> -->
+     </component>
+     <component unofficial="yes" name="imageeditorengine_build" long-name="Image Editor Engine Build" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imageeditorengine/group"/>
+     </component>
+    </collection>
+    <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
+     <component unofficial="yes" name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imgeditor_plat/group"/>
+     </component>
+     <component unofficial="yes" name="imgeditor_build" long-name="Image Editor Apps Build" origin-model="foundation">
+      <unit bldFile="app/imgeditor/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="imgvieweruis" long-name="Image Viewer UIs" tech_domain="ma" level="services" levels="app">
+    <collection name="imageviewer" long-name="Image Viewer" level="app">
+     <component name="imageviewer_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/imgvieweruis/imageviewer/help/group"/>
+     </component>
+     <component name="imageviewer_build" origin-model="foundation">
+      <unit bldFile="app/imgvieweruis/imageviewer/group"/>
+     </component>
+    </collection>
+    <collection name="imgvieweruis_info" long-name="Image Viewer UIs Info" level="app">
+     <component unofficial="yes" name="imgvieweruis_build" long-name="Image Viewer UIs Build" origin-model="foundation">
+      <unit bldFile="app/imgvieweruis/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="iptelephony" long-name="IP Telephony" tech_domain="vc" level="apps" levels="plugin eng ui">
+    <!-- Collection renamed to avoid duplicates -->
+    <collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
+     <component name="cscgsplugin" long-name="CSCGS Plugin" origin-model="foundation">
+      <unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
+     </component>
+     <component name="cscsipvoipcleanupplugin" long-name="CSC SIP VOIP Cleanup Plugin" origin-model="foundation">
+      <unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
+     </component>
+     <component name="cscengine" long-name="CSC Engine" origin-model="foundation">
+      <unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
+     </component>
+     <component name="cscsettingsui" long-name="CSC Settings UI" origin-model="foundation">
+      <unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
+     </component>
+     <component name="cscapplicationui" long-name="CSC Application UI" origin-model="foundation">
+      <unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
+     </component>
+     <component unofficial="yes" name="commsconfig_build" long-name="Comms Config Build" origin-model="foundation">
+      <unit bldFile="app/iptelephony/commsconfig/group"/>
+     </component>
+    </collection>
+    <collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="ui">
+     <component name="cchserver" long-name="CCH Server" origin-model="foundation">
+      <unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
+     </component>
+     <component name="cchclient" long-name="CCH Client" origin-model="foundation">
+      <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
+     </component>
+     <component name="cchclientapi" long-name="CCH Clientapi" origin-model="foundation">
+      <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
+     </component>
+     <component unofficial="yes" name="convergedconnectionhandler_build" long-name="Converged Connection Handler Build" origin-model="foundation">
+      <unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
+     </component>
+    </collection>
+    <collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
+     <component name="rcse2" long-name="Rcse2" origin-model="foundation">
+      <unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
+     </component>
+    </collection>
+    <collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="eng">
+     <component name="svp" origin-model="foundation">
+      <unit bldFile="app/iptelephony/sipvoipprovider/group"/>
+     </component>
+    </collection>
+    <collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
+     <component name="sipmxresolver" long-name="SIP MX Resolver" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
+     </component>
+     <component name="sipconnectionprovider" long-name="SIP Connection Provider" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
+      <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
+     </component>
+     <component name="ipapputils" long-name="IP App Utils" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
+     </component>
+     <component name="voipadapters" long-name="VOIP Adapters" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
+     </component>
+     <component name="accountcreationplugin" long-name="Account Creation Plugin" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
+     </component>
+     <component name="dhcppositionprovider" long-name="DHCP Position Provider" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
+     </component>
+     <component name="svtmatching" long-name="SVT Matching" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
+     </component>
+     <component name="svtlogging" long-name="SVT Logging" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
+     </component>
+     <component name="svtcallmenu" long-name="SVT Call Menu" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
+     </component>
+     <component unofficial="yes" name="voipplugins_build" long-name="VoIP Plugins Build" origin-model="foundation">
+      <unit bldFile="app/iptelephony/voipplugins/group"/>
+     </component>
+    </collection>
+    <collection name="callcontinuity" long-name="Call Continuity" level="eng">
+     <component name="vccutils" long-name="VCC Utils" origin-model="foundation">
+      <unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
+     </component>
+     <component name="nsmldmvccadapter" long-name="NSML DM VCC Adapter" origin-model="foundation">
+      <unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
+     </component>
+     <component name="vccclientprovisioningadapter" long-name="VCC Client Provisioning Adapter" origin-model="foundation">
+      <unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
+     </component>
+     <component name="vccpropertyhandler" long-name="VCC Property Handler" origin-model="foundation">
+      <unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
+     </component>
+     <component name="vcchotrigger" long-name="VCC Hotrigger" origin-model="foundation">
+      <unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
+     </component>
+     <component name="vcc" long-name="VCC" origin-model="foundation">
+      <unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
+     </component>
+     <component name="settingsreader" long-name="Settings Reader" origin-model="foundation">
+      <!-- <unit bldFile="app/iptelephony/callcontinuity/settingsreader/group"/> -->
+     </component>
+     <component unofficial="yes" name="callcontinuity_build" long-name="Call Continuity Build" origin-model="foundation">
+      <unit bldFile="app/iptelephony/callcontinuity/group"/>
+     </component>
+    </collection>
+    <collection name="iptelephony_info" long-name="IP Telephony Info" level="ui">
+     <component unofficial="yes" name="iptelephony_build" long-name="IP Telephony Build" origin-model="foundation">
+      <unit bldFile="app/iptelephony/group"/>
+     </component>
+     <component unofficial="yes" name="iptel_plat" class="api" origin-model="foundation">
+      <unit bldFile="app/iptelephony/iptel_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="java" long-name="Java" tech_domain="rt" level="services" levels="framework util generic rt">
+    <collection name="javaextensions" long-name="Java Extensions" level="generic">
+     <component name="eswt" long-name="Eswt" origin-model="foundation"/>
+     <component name="jsr" long-name="JSR" origin-model="foundation"/>
+     <component name="supplements" long-name="Supplements" origin-model="foundation"/>
+    </collection>
+    <collection name="javainstaller" long-name="Java Installer" level="generic">
+     <component name="javarightslistener" long-name="Java Rights Listener" origin-model="foundation"/>
+     <component name="installplugins" long-name="Install Plugins" origin-model="foundation"/>
+     <component name="midp2otadownloadplugin" long-name="MIDP2 OTA Download Plugin" origin-model="foundation"/>
+     <component name="installationfrontend" long-name="Installation Frontend" origin-model="foundation"/>
+     <component name="midp2iferecognizer" long-name="MIDP2 Interface Rrecognizer" origin-model="foundation"/>
+     <component name="iferecognizers" long-name="Ife Recognizers" origin-model="foundation"/>
+    </collection>
+    <collection name="javalegacy" long-name="Java Legacy" level="util">
+     <component name="jcfcommon" long-name="Jcf Common" origin-model="foundation"/>
+     <component name="j2me" long-name="J2ME" origin-model="foundation"/>
+    </collection>
+    <collection name="javamanager" long-name="Java Manager" level="framework">
+     <component name="javabackup" long-name="Java Backup" origin-model="foundation"/>
+     <!-- Empty duplicate component javaregistry removed -->
+     <component name="javadrmmanager" long-name="Java DRM Manager" origin-model="foundation"/>
+     <component name="javasettings" long-name="Java Settings" origin-model="foundation"/>
+    </collection>
+    <collection name="javaruntime" long-name="Java Runtime" level="rt">
+     <!-- Empty duplicate component common removed -->
+     <component name="temp_j2me_root" long-name="Temp J2me Root" origin-model="foundation"/>
+     <component name="jvm" long-name="JVM" origin-model="foundation"/>
+     <component name="eventserver" long-name="Event Server" origin-model="foundation"/>
+     <!-- Empty duplicate component utils removed -->
+     <component name="midp2ams" long-name="Midp2ams" origin-model="foundation"/>
+     <component name="redirserver" long-name="Redirect Server" origin-model="foundation"/>
+    </collection>
+    <collection name="javautils" long-name="Java Utils" level="util">
+     <component name="jarfiledecoder" long-name="JAR File Decoder" origin-model="foundation"/>
+     <component name="javareader" long-name="Java Reader" origin-model="foundation"/>
+     <component name="javapackagelookup" long-name="Java Package Lookup" origin-model="foundation"/>
+     <!-- Empty duplicate component common removed -->
+     <component name="integrityserver" long-name="Integrity Server" origin-model="foundation"/>
+     <!-- Empty duplicate component javadrmutils removed -->
+     <component name="javarecognizer" long-name="Java Recognizer" origin-model="foundation"/>
+     <component name="iconconverter" long-name="Icon Converter" origin-model="foundation"/>
+     <component name="adt" long-name="ADT" origin-model="foundation"/>
+     <!-- Empty duplicate component javaenvinfo removed -->
+    </collection>
+    <collection name="java_stubs" long-name="Java Stubs" level="util">
+     <!--component manually moved to javautils collection-->
+     <!--<component name="javadrmutils" long-name="Java DRM Utils">
+       <unit bldFile="app/java/java_stubs/javadrmutils/group"/>
+     </component>-->
+     <!--component manually moved to javautils collection-->
+     <!--<component name="javaenvinfo" long-name="Java Environment Info">
+       <unit bldFile="app/java/java_stubs/javaenvinfo/group"/>
+     </component>-->
+     <component name="javaregistry" long-name="Java Registry" origin-model="foundation">
+      <unit bldFile="app/java/java_stubs/javaregistry/clientserver/client/group"/>
+     </component>
+     <component unofficial="yes" name="java_stubs_build" origin-model="foundation">
+      <unit bldFile="app/java/java_stubs/group"/>
+     </component>
+    </collection>
+    <collection name="javatools" long-name="Java Tools" level="generic">
+     <component name="envupdater" long-name="Environment Updater" origin-model="foundation"/>
+    </collection>
+    <collection name="java_info" long-name="Java Info" level="rt">
+     <component unofficial="yes" name="java_build" long-name="Java Build" origin-model="foundation">
+      <unit bldFile="app/java/group"/>
+     </component>
+     <component unofficial="yes" name="java_plat" long-name="Java Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/java/java_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="location" long-name="Location Apps" tech_domain="lo" level="apps" levels="engine ui apps">
+    <collection name="landmarksui" long-name="Landmarks UI" level="ui">
+     <component name="landmarksui_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/location/landmarksui/help/group"/>
+     </component>
+     <component name="landmarksui_engine" long-name="Engine" origin-model="foundation">
+      <unit bldFile="app/location/landmarksui/engine/group"/>
+     </component>
+     <component name="uicontrols" long-name="UI Controls" origin-model="foundation">
+      <unit bldFile="app/location/landmarksui/uicontrols/group"/>
+     </component>
+     <component name="landmarksui_commonui" long-name="Common UI" origin-model="foundation">
+      <unit bldFile="app/location/landmarksui/commonui/group"/>
+     </component>
+     <component name="landmarksui_app" long-name="Application" origin-model="foundation">
+      <unit bldFile="app/location/landmarksui/app/group"/>
+     </component>
+     <component name="msgviewer" long-name="Message Viewer" origin-model="foundation">
+      <unit bldFile="app/location/landmarksui/msgviewer/group"/>
+     </component>
+     <component unofficial="yes" name="landmarksui_build" long-name="Landmarks UI Build" origin-model="foundation">
+      <unit bldFile="app/location/landmarksui/group"/>
+     </component>
+    </collection>
+    <collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
+     <component name="blid" long-name="Blid" origin-model="foundation">
+      <unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
+     </component>
+     <component unofficial="yes" name="basiclocationinfodisplay_build" long-name="Basic Location Info Display Build" origin-model="foundation">
+      <unit bldFile="app/location/basiclocationinfodisplay/group"/>
+     </component>
+    </collection>
+    <collection name="eventsui" long-name="Events UI" level="ui">
+     <component name="eventsui_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/location/eventsui/help/group"/>
+     </component>
+     <component name="eventsutils" long-name="Events Utils" origin-model="foundation">
+      <unit bldFile="app/location/eventsui/eventsutils/group"/>
+     </component>
+     <component name="eventsengine" long-name="Events Engine" origin-model="foundation">
+      <unit bldFile="app/location/eventsui/eventsengine/group"/>
+     </component>
+     <component name="eventshandlerui" long-name="Events Handler UI" origin-model="foundation">
+      <unit bldFile="app/location/eventsui/eventshandlerui/group"/>
+     </component>
+     <component name="eventseditor" long-name="Events Editor" origin-model="foundation">
+      <unit bldFile="app/location/eventsui/eventseditor/group"/>
+     </component>
+     <component name="eventsmgmtui" long-name="Events Mgmt UI" origin-model="foundation">
+      <unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
+     </component>
+     <component unofficial="yes" name="eventsui_build" long-name="Events UI Build" origin-model="foundation">
+      <unit bldFile="app/location/eventsui/group"/>
+     </component>
+    </collection>
+    <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
+     <component name="lmrefapp" origin-model="foundation">
+      <unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
+     </component>
+    </collection>
+    <collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
+     <component name="lmuirefapp" origin-model="foundation">
+      <unit bldFile="app/location/locationlandmarksuirefapp/group"/>
+     </component>
+    </collection>
+    <collection name="locationsatviewrefapp" long-name="Location Sat View Reference App" level="apps">
+     <component name="satellitereference" origin-model="foundation">
+      <unit bldFile="app/location/locationsatviewrefapp/group"/>
+     </component>
+    </collection>
+    <collection name="simpsyconfigurator" long-name="SIM PSY Configurator" level="engine">
+     <component name="simpsyui" origin-model="foundation">
+      <unit bldFile="app/location/simpsyconfigurator/group"/>
+     </component>
+    </collection>
+    <collection name="mapnavproviderrefapp" long-name="Map Nav Provider Reference App" level="apps">
+     <component unofficial="yes" name="mapnavproviderrefapp_build" long-name="Map Nav Provider Reference App Build" origin-model="foundation">
+      <unit bldFile="app/location/mapnavproviderrefapp/group"/>
+     </component>
+    </collection>
+    <collection name="location_info" long-name="Location Apps Info" level="apps">
+     <component unofficial="yes" name="location_build" long-name="Location Apps Build" origin-model="foundation">
+      <unit bldFile="app/location/group"/>
+     </component>
+     <component unofficial="yes" name="location_test" long-name="Location Apps Test" origin-model="foundation">
+      <!-- <unit bldFile="app/location/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="loc_pub" class="api" origin-model="foundation">
+      <unit bldFile="app/location/loc_pub/group"/>
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
@@ -1473,648 +1620,502 @@
      </component>
     </collection>
    </block>
-   <block name="commonemail" long-name="Email Apps" tech_domain="pr" level="apps" levels="service support ui app">
-    <collection name="emailservices" long-name="Email Services" level="service">
-     <component name="emailframework" long-name="Email framework" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailservices/emailframework/group"/>
-     </component>
-     <component name="emailserver" long-name="Email Server" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailservices/emailserver/group"/>
-     </component>
-     <component name="psmruadapter" long-name="PSMRU Adapter" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
-     </component>
-     <component name="emailstore" long-name="Email Store" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailservices/emailstore/group"/>
-     </component>
-     <component name="emaildebug" long-name="Email Debug" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
-     </component>
-     <component unofficial="yes" name="emailservices_build" long-name="Email Services Build" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailservices/group"/>
-     </component>
-    </collection>
-    <collection name="ipsservices" long-name="IPS Services" level="service">
-     <component name="ipssossettings" long-name="IPSSOS Settings" origin-model="foundation">
-      <unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
-     </component>
-     <component name="ipssosplugin" long-name="IPSSOS Plugin" origin-model="foundation">
-      <unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
-     </component>
-     <component name="ipssosaoplugin" long-name="IPSSOS AO Plugin" origin-model="foundation">
-      <unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
-     </component>
-     <component unofficial="yes" name="ipsservices_build" long-name="IPS Services Build" origin-model="foundation">
-      <unit bldFile="app/commonemail/ipsservices/group"/>
-     </component>
-    </collection>
-    <collection name="emailcontacts" long-name="Email Contacts" level="support">
-     <component name="contactactionservice" long-name="Contact Action Service" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
-     </component>
-     <component name="contactactionmenu" long-name="Contact Action Menu" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
-     </component>
-     <component name="remotecontactlookup" long-name="Remote Contact Lookup" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailcontacts/remotecontactlookup/group"/>
-     </component>
-     <component unofficial="yes" name="emailcontacts_build" long-name="Email Contacts Build" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailcontacts/group"/>
-     </component>
-    </collection>
-    <collection name="meetingrequest" long-name="Meeting Request" level="ui">
-     <component name="mrcommon" long-name="MR Common" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
-     </component>
-     <component name="mrdb" long-name="MR Database" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
-     </component>
-     <component name="mrpolicy" long-name="MR Policy" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
-     </component>
-     <component name="mrservices" long-name="MR Services" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
-     </component>
-     <component name="mrgui" long-name="MR GUI" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
-     </component>
-     <component name="mrentry" long-name="MR Entry" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
-     </component>
-     <component name="mrtasks" long-name="MR Tasks" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
-     </component>
-     <component name="mrutils" long-name="MR Utils" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
-     </component>
-     <component name="mrutilscalplugin" long-name="MR Utils Cal Plugin" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-     </component>
-     <component name="mrviewer" long-name="MR Viewer" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
-     </component>
-     <component name="mrviewercalplugin" long-name="MR Viewer Cal Plugin" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-     </component>
-     <component name="mricalviewer" long-name="MR iCal Viewer" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
-     </component>
-     <component name="mrversit2" long-name="MR Versit2" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
-     </component>
-     <component name="mragnversit2" long-name="MR Agenda Versit2" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
-     </component>
-     <component name="mrcasplugin" long-name="MR CAS Plugin" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
-     </component>
-     <component name="mrurlparserplugin" long-name="MR URLParser Plugin" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-     </component>
-     <component unofficial="yes" name="meetingrequest_build" long-name="Meeting Request Build" origin-model="foundation">
-      <unit bldFile="app/commonemail/meetingrequest/group"/>
-     </component>
-    </collection>
-    <collection name="emailuis" long-name="Email UIs" level="app">
-     <component name="emailui" long-name="Email UI" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailuis/emailui/group"/>
-     </component>
-     <component name="gsemailsettings" long-name="GSEmail Settings" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
-     </component>
-     <component name="uicomponents" long-name="UI Components" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
-     </component>
-     <component name="widget" long-name="Widget" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailuis/widget/group"/>
-     </component>
-     <component unofficial="yes" name="emailuis_build" long-name="Email UIs Build" origin-model="foundation">
-      <unit bldFile="app/commonemail/emailuis/group"/>
-     </component>
-    </collection>
-    <collection name="emailhelp" long-name="Email Help" level="support">
-     <component name="emailhelp_build" origin-model="foundation">
-      <!-- <unit bldFile="app/commonemail/emailhelp/group"/> -->
-     </component>
-    </collection>
-    <collection name="legacy" long-name="Legacy Email" level="support">
-     <component name="iad_rofs" long-name="IAD ROFS" origin-model="foundation"/>
-     <component name="ls_pt_hack" long-name="ls pt hack" origin-model="foundation"/>
-     <component name="settingwizard" long-name="Setting Wizard" origin-model="foundation"/>
-     <!-- Empty duplicate component starter removed -->
-    </collection>
-    <collection name="commonemail_help" long-name="Email Help" level="support">
-     <component name="help" origin-model="foundation"/>
-    </collection>
-    <collection name="commonemail_info" long-name="Email Apps Info" level="app">
-     <component unofficial="yes" name="email_plat" class="api" origin-model="foundation">
-      <unit bldFile="app/commonemail/email_plat/group"/>
-     </component>
-     <component unofficial="yes" name="commonemail_build" long-name="Email Apps Build" origin-model="foundation">
-      <unit bldFile="app/commonemail/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="conversations" long-name="Conversation Apps" tech_domain="pr" level="apps" levels="settings utils ui">
-    <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-     <component name="vimpstsettings" origin-model="foundation">
-      <unit bldFile="app/conversations/uiservicetabsettings/group"/>
-     </component>
-    </collection>
-    <collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-     <component name="imstutils_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/conversations/imstutils/help/group"/>
-     </component>
-     <component name="imconnectionprovider" long-name="IM Connection Provider" origin-model="foundation">
-      <unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
-      <!-- <unit bldFile="app/conversations/imstutils/imconnectionprovider/tsrc/imconnectionprovider_test/group"/> -->
-     </component>
-     <component name="xmppadapter" long-name="XMPP Adapter" origin-model="foundation">
-      <unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
-      <!-- <unit bldFile="app/conversations/imstutils/xmppadapter/tsrc/xmppadapter_test/group"/> -->
-     </component>
-     <component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
-      <unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-      <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
-      <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
-     </component>
-     <component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="foundation">
-      <unit bldFile="app/conversations/imstutils/group"/>
-     </component>
-    </collection>
-    <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-     <component name="vimpstutils" long-name="VIMP ST Utilities" origin-model="foundation">
-      <unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
-     </component>
-     <component name="vimpststorage" long-name="VIMP ST Storage" origin-model="foundation">
-      <unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactlist_ut/group"/> -->
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group"/> -->
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group"/> -->
-     </component>
-     <component name="vimpstengine" long-name="VIMP ST Engine" origin-model="foundation">
-      <unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstengine/tsrc/group"/> -->
-     </component>
-     <component name="vimpstcmdprocess" long-name="VIMP ST Command Process" origin-model="foundation">
-      <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/tsrc/group"/> -->
-     </component>
-     <component name="vimpstui" long-name="VIMP ST UI" origin-model="foundation">
-      <unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
-     </component>
-     <component name="vimpstdetailsviewplugin" long-name="VIMP ST Details View Plugin" origin-model="foundation">
-      <unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-     </component>
-     <component unofficial="yes" name="uiservicetab_build" long-name="UI Service Tab Build" origin-model="foundation">
-      <unit bldFile="app/conversations/uiservicetab/group"/>
-     </component>
-    </collection>
-    <collection name="servicewidget" long-name="Service Widget" level="ui">
-     <component name="servicewidgetactionhandler" long-name="Service Widget Action Handler" origin-model="foundation">
-      <unit bldFile="app/conversations/servicewidget/servicewidgetactionhandler/group"/>
-     </component>
-     <component name="servicewidgetdatapublisher" long-name="Service Widget Data Publisher" origin-model="foundation">
-      <unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-     </component>
-     <component name="themes" long-name="Themes" origin-model="foundation">
-      <unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget/group"/>
-     </component>
-     <component unofficial="yes" name="servicewidget_build" long-name="Service Widget Build" origin-model="foundation">
-      <unit bldFile="app/conversations/servicewidget/group"/>
-     </component>
-    </collection>
-    <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-     <component unofficial="yes" name="conversations_plat" long-name="Conversation Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/conversations/conversations_plat/group"/>
-     </component>
-     <component unofficial="yes" name="conversations_build" long-name="Conversation Apps Build" origin-model="foundation">
-      <unit bldFile="app/conversations/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="im" long-name="Instant Messaging Apps" tech_domain="pr" level="apps" levels="support engine apps">
-    <collection name="impsengine" long-name="IMPS Engine" level="engine">
-     <component name="impsengine_utils" long-name="Utilities" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/utils/group"/> -->
-     </component>
-     <component name="datautils" long-name="Data Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/datautils/group"/> -->
-     </component>
-     <component name="impsengine_client" long-name="Client" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/client/group"/> -->
-     </component>
-     <component name="imapi" long-name="IM API" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/imapi/group"/> -->
-     </component>
-     <component name="imlauncher" long-name="IM Launcher" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/imlauncher/group"/> -->
-     </component>
-     <component name="impsdatachannel" long-name="Imps Data Channel" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/impsdatachannel/group"/> -->
-     </component>
-     <component name="impsipcirwatcher" long-name="Imps Ip Cir Watcher" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/impsipcirwatcher/group"/> -->
-     </component>
-     <component name="messageencoder" long-name="Message Encoder" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/messageencoder/wbxml/group"/> -->
-     </component>
-     <component name="engsrv" long-name="Eng Srv" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/engsrv/group"/> -->
-     </component>
-     <component name="impswatcher" long-name="Imps Watcher" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/impswatcher/group"/> -->
-     </component>
-     <component name="wvotaparser" long-name="WV OTA Parser" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/wvotaparser/group"/> -->
-     </component>
-     <component unofficial="yes" name="impsengine_test" long-name="IMPS Engine Test" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertimerprocess/group"/> -->
-      <!-- <unit bldFile="app/im/impsengine/tsrc/public/advance/group"/> -->
-      <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertest/group"/> -->
-      <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/group"/> -->
-      <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertestplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="impsengine_build" long-name="IMPS Engine Build" origin-model="foundation">
-      <unit bldFile="app/im/impsengine/group"/>
-     </component>
-    </collection>
-    <collection name="pecengine" long-name="Presence Engine" level="engine">
-     <component name="coreutilslib2" long-name="Core Utils Lib 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/coreutilslib2/group"/> -->
-     </component>
-     <component name="storagemanager2" long-name="Storage Manager 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/storagemanager2/group"/> -->
-     </component>
-     <component name="pecparser2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/parser2/group"/> -->
-     </component>
-     <component name="attributelibrary2" long-name="Attribute Library 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/attributelibrary2/group"/> -->
-     </component>
-     <component name="listlibrary2" long-name="List Library 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/listlibrary2/group"/> -->
-     </component>
-     <component name="transferadapter2" long-name="Transfer Adapter 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/transferadapter2/group"/> -->
-     </component>
-     <component name="presenceserver2" long-name="Presence Server 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/presenceserver2/group"/> -->
-     </component>
-     <component name="presencemanager2" long-name="Presence Manager 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/presencemanager2/group"/> -->
-     </component>
-     <component name="janitorplugin2" long-name="Janitor Plugin 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/janitorplugin2/group"/> -->
-     </component>
-     <component name="pluginserver2" long-name="Plugin Server 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/pluginserver2/group"/> -->
-     </component>
-     <component unofficial="yes" name="pecengine_build" long-name="Presence Engine Build" origin-model="foundation">
-      <unit bldFile="app/im/pecengine/group"/>
-     </component>
-    </collection>
-    <collection name="presadap12" long-name="Presence Adap 12" level="support">
-     <component name="presparser2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/presadap12/parser2/group"/> -->
-     </component>
-     <component name="impsplugin" long-name="IMPS Plugin" origin-model="foundation">
-      <!-- <unit bldFile="app/im/presadap12/impsplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="presadap12_build" long-name="Presence Adap 12 Build" origin-model="foundation">
-      <!-- <unit bldFile="app/im/presadap12/group"/> -->
-     </component>
-    </collection>
-    <collection name="wvsettings20" long-name="WV Settings 20" level="support">
-     <component name="wvsapsettingsstore" origin-model="foundation">
-      <unit bldFile="app/im/wvsettings20/group"/>
-     </component>
-    </collection>
-    <collection name="wvuing" long-name="WV UI NG" level="apps">
-     <component name="imindicatorplugin" long-name="IM Indicator Plugin" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/imindicatorplugin/group"/> -->
-     </component>
-     <component name="impsconnectionui" long-name="IMPS Connection UI" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/impsconnectionui/group"/> -->
-     </component>
-     <component name="impsservicesettingsui" long-name="IMPS Service Settings UI" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/impsservicesettingsui/group"/> -->
-     </component>
-     <component name="impsalwaysonlineplugin" long-name="IMPS Always Online Plugin" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/impsalwaysonlineplugin/group"/> -->
-     </component>
-     <component name="wvvariant" long-name="Wvvariant" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvvariant/group"/> -->
-     </component>
-     <component name="wvuiada" long-name="Wvuiada" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuiada/group"/> -->
-     </component>
-     <component name="wvuistorage" long-name="WV UI Storage" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuistorage/group"/> -->
-     </component>
-     <component name="wvuipresence" long-name="WV UI Presence" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuipresence/group"/> -->
-     </component>
-     <component name="wvlogger" long-name="Wvlogger" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvlogger/group"/> -->
-     </component>
-     <component name="wvuieng" long-name="Wvuieng" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuieng/group"/> -->
-     </component>
-     <component name="imutils" long-name="Im Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/imutils/group"/> -->
-     </component>
-     <component name="wvuiprocess" long-name="WV UI Process" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuiprocess/group"/> -->
-     </component>
-     <component name="wvcommandutils" long-name="Wv Command Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvcommandutils/group"/> -->
-     </component>
-     <component name="wvaudiomanager" long-name="Wv Audio Manager" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvaudiomanager/group"/> -->
-     </component>
-     <component name="wvuiave" long-name="Wvuiave" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuiave/group"/> -->
-     </component>
-     <component name="wvimlauncher" long-name="IM Launcher" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/imlauncher/group"/> -->
-     </component>
-     <component unofficial="yes" name="wvuing_build" long-name="WV UI NG Build" origin-model="foundation">
-      <unit bldFile="app/im/wvuing/group"/>
-     </component>
-    </collection>
-    <collection name="im_info" long-name="Instant Messaging Apps Info" level="apps">
-     <component unofficial="yes" name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/im/im_plat/group"/>
-      <unit bldFile="app/im/im_plat/wv_sap_settings_api/tsrc"/>
-     </component>
-     <component unofficial="yes" name="im_pub" long-name="Instant Messaging Apps Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/im/im_pub/group"/>
-      <!-- <unit bldFile="app/im/im_pub/im_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertest/group"/> -->
-      <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertestplugin/group"/> -->
-      <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertimerprocess/group"/> -->
-     </component>
-     <component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help" origin-model="foundation">
-      <unit bldFile="app/im/help/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="utils" long-name="Utility Apps" tech_domain="pr" level="apps" levels="app">
-    <collection name="extras" long-name="Extras" level="app">
-     <component name="about" long-name="About" origin-model="foundation">
-      <unit bldFile="app/utils/extras/about/group"/>
-     </component>
-     <component name="calcsoft" long-name="Calcsoft" origin-model="foundation">
-      <unit bldFile="app/utils/extras/calcsoft/group"/>
-     </component>
-     <component name="converter" long-name="Converter" origin-model="foundation">
-      <unit bldFile="app/utils/extras/converter/group"/>
-     </component>
-     <component unofficial="yes" name="extras_build" long-name="Extras Build" origin-model="foundation">
-      <unit bldFile="app/utils/extras/group"/>
-     </component>
-    </collection>
-    <collection name="utils_info" long-name="Utility Apps Info" level="app">
-     <component unofficial="yes" name="utils_build" long-name="Utility Apps Build" origin-model="foundation">
-      <unit bldFile="app/utils/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="dictionary" long-name="Dictionary" tech_domain="pr" level="services" levels="appl">
-    <collection name="userdict" long-name="User Dictionary" level="appl">
-     <component name="userdict_build" long-name="UserDict Client" origin-model="foundation">
-      <unit bldFile="app/dictionary/userdict/group"/>
-     </component>
-    </collection>
-    <collection name="dictionary_info" long-name="Dictionary Info" level="appl">
-     <component unofficial="yes" name="dictionary_plat" long-name="Dictionary Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/dictionary/dictionary_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="camera" long-name="Camera Apps" tech_domain="ma" level="apps" levels="empty 1">
-    <collection name="camerauis" long-name="Camera UIs" level="1">
-     <component name="activepalette" long-name="Active Palette" origin-model="foundation">
-      <unit bldFile="app/camera/camerauis/activepalette/group"/>
-     </component>
-     <component name="cameraapp" long-name="Camera Application" origin-model="foundation">
-      <!-- <unit bldFile="app/camera/camerauis/cameraapp/generic/camerauiconfigmanager/group"/> -->
-      <!-- <unit bldFile="app/camera/camerauis/cameraapp/generic/gscamcorderplugin/group"/> -->
-      <unit bldFile="app/camera/camerauis/cameraapp/group"/>
-      <!-- <unit bldFile="app/camera/camerauis/cameraapp/help/group"/> -->
-     </component>
-    </collection>
-    <collection name="camera_info" long-name="Camera Apps Info" level="1">
-     <component unofficial="yes" name="camera_build" long-name="Camera Apps Build" origin-model="foundation">
-      <unit bldFile="app/camera/group"/>
-     </component>
-     <component unofficial="yes" name="camera_plat" long-name="Camera Apps Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/> -->
-      <unit bldFile="app/camera/camera_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="imgeditor" long-name="Image Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
-    <collection name="imageeditor" long-name="Image Editor" level="ui">
-     <component name="pb" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditor/pb/group"/>
-     </component>
-     <component name="iepb" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
-     </component>
-     <component name="imageeditorui" long-name="Image Editor UI" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
-     </component>
-     <component name="imageeditormanager" long-name="Image Editor Manager" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
-     </component>
-     <component name="imageeditorapp" long-name="Image Editor App" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
-     </component>
-     <component name="imageeditor_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-      <unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-     </component>
-     <component name="editorprovider" long-name="Editor Provider" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
-     </component>
-     <component unofficial="yes" name="imageeditor_build" long-name="Image Editor Build" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditor/group"/>
-     </component>
-    </collection>
-    <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-     <component name="filters" long-name="Filters" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-      <unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-     </component>
-     <component name="imageeditorutils" long-name="Image Editor Utils" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-     </component>
-     <component name="systemparameters" long-name="System Parameters" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
-     </component>
-     <component name="enginewrapper" long-name="Engine Wrapper" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
-     </component>
-     <component name="jpegrotator" long-name="Jpeg Rotator" origin-model="foundation">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegrotator/group"/> -->
-     </component>
-     <component name="jpegscaler" long-name="Jpeg Scaler" origin-model="foundation">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegscaler/group"/> -->
-     </component>
-     <component unofficial="yes" name="imageeditorengine_build" long-name="Image Editor Engine Build" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imageeditorengine/group"/>
-     </component>
-    </collection>
-    <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
-     <component unofficial="yes" name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/imgeditor/imgeditor_plat/group"/>
-     </component>
-     <component unofficial="yes" name="imgeditor_build" long-name="Image Editor Apps Build" origin-model="foundation">
-      <unit bldFile="app/imgeditor/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="videoeditor" long-name="Video Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
-    <collection name="videditor" long-name="Video Editor" level="ui">
-     <component name="videoeditorcommon" long-name="Video Editor Common" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-     </component>
-     <component name="videoeditoruicomponents" long-name="Video Editor UI Components" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-     </component>
-     <component name="simplevideoeditor" long-name="Simple Video Editor" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-     </component>
-     <component name="simplecutvideo" long-name="Simple Cut Video" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-     </component>
-     <component name="videoprovider" long-name="Video Provider" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-     </component>
-     <component name="manualvideoeditor" long-name="Manual Video Editor" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videditor/manualvideoeditor/group"/>
-     </component>
-     <component name="trimformms" long-name="Trim For MMS" origin-model="foundation">
-      <!-- <unit bldFile="app/videoeditor/videditor/trimformms/group"/> -->
-     </component>
-     <component unofficial="yes" name="videditor_build" long-name="Video Editor Build" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videditor/group"/>
-     </component>
-    </collection>
-    <collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-     <component name="audioeditorengine" long-name="Audio Editor Engine" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-     </component>
-     <component name="avcedit" long-name="Avcedit" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-     </component>
-     <component name="h263decoder" long-name="H263 Decoder" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-     </component>
-     <component name="mp3aacmaniplib" long-name="Mp3aac Manip Lib" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-     </component>
-     <component name="vedtranscoder" long-name="Ved Transcoder" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-     </component>
-     <component name="vedengine" long-name="Ved Engine" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-     </component>
-     <component unofficial="yes" name="videoeditorengine_build" long-name="Video Editor Engine Build" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videoeditorengine/group"/>
-     </component>
-    </collection>
-    <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
-     <component unofficial="yes" name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/videoeditor/videoeditor_plat/group"/>
-     </component>
-     <component unofficial="yes" name="videoeditor_build" long-name="Video Editor Apps Build" origin-model="foundation">
-      <unit bldFile="app/videoeditor/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="gallery" long-name="Gallery Apps" tech_domain="ma" level="apps" levels="app">
-    <collection name="mediagallery" long-name="Media Gallery" level="app">
-     <component name="mediagallery2" long-name="Media Gallery 2" origin-model="foundation">
-      <unit bldFile="app/gallery/mediagallery/mediagallery2/group"/>
-     </component>
-    </collection>
-    <collection name="gallery_info" long-name="Gallery Apps Info" level="app">
-     <component unofficial="yes" name="gallery_build" long-name="Gallery Apps Build" origin-model="foundation">
-      <unit bldFile="app/gallery/group"/>
-     </component>
-     <component unofficial="yes" name="gallery_plat" long-name="Gallery Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/gallery/gallery_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="videoplayer" long-name="Video Player Apps" tech_domain="ma" level="apps" levels="support apps">
-    <collection name="lwplayer" long-name="LW Player" level="apps">
-     <component name="lwplayer_build" long-name="LW Player" origin-model="foundation">
-      <unit bldFile="app/videoplayer/lwplayer/group"/>
-     </component>
-    </collection>
-    <collection name="mediaplayer" long-name="Media Player" level="apps">
-     <component name="mediaplayer_build" origin-model="foundation">
-      <unit bldFile="app/videoplayer/mediaplayer/group"/>
-     </component>
-    </collection>
-    <collection name="mediasettings" long-name="Media Settings" level="support">
-     <component name="mediasettings_build" origin-model="foundation">
-      <unit bldFile="app/videoplayer/mediasettings/group"/>
-     </component>
-    </collection>
-    <collection name="videoplayer_info" long-name="Video Player Apps Info" level="apps">
-     <component unofficial="yes" name="videoplayer_help" long-name="Video Player Apps Help" origin-model="foundation">
-      <unit bldFile="app/videoplayer/help/group"/>
-     </component>
-     <component unofficial="yes" name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/videoplayer/videoplayer_plat/group"/>
-      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/tsrc/group"/>
-      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="videoplayer_test" long-name="Video Player Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="app/videoplayer/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="videoplayer_build" long-name="Video Player Apps Build" origin-model="foundation">
-      <unit bldFile="app/videoplayer/group"/>
+   <block name="mmsharinguis" long-name="Multimedia Sharing UIs" tech_domain="vc" level="services" levels="base plugin">
+    <collection name="mmsharing" long-name="MM Sharing" level="base">
+     <component name="mmshavailability" long-name="Multimedia Sharing Availability" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
+     </component>
+     <component name="mmshindicator" long-name="Multimedia Sharing Indicator" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
+      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
+     </component>
+     <component name="mmshmanagercli" long-name="Multimedia Sharing Manager Client" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
+     </component>
+     <component name="mmshmanagersrv" long-name="Multimedia Sharing Manager Server" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
+     </component>
+     <component name="mmshengine" long-name="Multimedia Sharing Engine" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
+     </component>
+     <component name="mmshui" long-name="Multimedia Sharing UI" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
+      <unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshui/tsrc/ut_ui/group"/> -->
+     </component>
+     <component unofficial="yes" name="mmsharing_build" long-name="MM Sharing Build" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharing/group"/>
+     </component>
+    </collection>
+    <collection name="mmshplugins" long-name="MM Sharing Plugins" level="plugin">
+     <component name="mmshaoplugin" long-name="Multimedia Sharing Always Online Plugin" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
+     </component>
+     <component name="mmshaiwplugin" long-name="Multimedia Sharing AIW Plugin" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group"/> -->
+     </component>
+     <component name="mmshsipcrplugin" long-name="Multimedia Sharing SIP Client Resolver Plugin" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
+     </component>
+     <component name="mmshsettingsuiplugin" long-name="Multimedia Sharing Settings UI Plugin" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
+     </component>
+     <component name="mmshwpadapterplugin" long-name="Multimedia Sharing WP Adapter Plugin" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
+     </component>
+     <component name="mmcctranscoder" long-name="MMCC Transcoder" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
+      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group"/> -->
+     </component>
+     <component unofficial="yes" name="mmshplugins_build" long-name="MM Sharing Plugins Build" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmshplugins/group"/>
+     </component>
+    </collection>
+    <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="plugin">
+     <component unofficial="yes" name="scripts" origin-model="foundation">
+      <!-- <unit bldFile="app/mmsharinguis/tsrc/scripts"/> -->
+     </component>
+     <component unofficial="yes" name="mceclientstub" origin-model="foundation">
+      <!-- <unit bldFile="app/mmsharinguis/tsrc/mceclientstub/group"/> -->
+     </component>
+     <component unofficial="yes" name="mmsharinguis_build" long-name="Multimedia Sharing UIs Build" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/group"/>
+     </component>
+     <component unofficial="yes" name="musenginestub" origin-model="foundation">
+      <!-- <unit bldFile="app/mmsharinguis/tsrc/musenginestub/group"/> -->
+     </component>
+     <component unofficial="yes" name="ututils" origin-model="foundation">
+      <!-- <unit bldFile="app/mmsharinguis/tsrc/ututils/group"/> -->
+     </component>
+     <component unofficial="yes" name="cenrepeditor" origin-model="foundation">
+      <!-- <unit bldFile="app/mmsharinguis/tsrc/cenrepeditor/group"/> -->
+     </component>
+     <component unofficial="yes" name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="mustestapp" origin-model="foundation">
+      <!-- <unit bldFile="app/mmsharinguis/tsrc/mustestapp/group"/> -->
+     </component>
+    </collection>
+   </block>
+   <block name="musicplayer" long-name="Music Player Apps" tech_domain="ma" level="apps" levels="plugins support apps">
+    <collection name="musicvisualization" long-name="Music Visualization" level="plugins">
+     <component name="musicvisualizationplugin" long-name="Music Visualization Plugin" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musicvisualization/musicvisualizationplugin/group"/>
+     </component>
+     <component name="mpxvisualizationplugins" long-name="MPX Visualization Plugins" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musicvisualization/mpxvisualizationplugins/group"/>
+     </component>
+    </collection>
+    <collection name="mpxmusicplayer" long-name="MPX Music Player" level="apps">
+     <component name="mpxmusicplayer_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
+     </component>
+     <component name="mpxmusicplayer_commonui" long-name="Common UI" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
+     </component>
+     <component name="activeidle" long-name="Active Idle" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxmusicplayer/activeidle/group"/>
+     </component>
+     <component name="metadatahandler" long-name="Metadata Handler" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
+     </component>
+     <component name="mediakeyhandler" long-name="Mediakey Handler" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
+     </component>
+     <component name="mpxmusicplayer_app" long-name="Application" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
+     </component>
+     <component unofficial="yes" name="mpxmusicplayer_build" long-name="MPX Music Player Build" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
+     </component>
+    </collection>
+    <collection name="musichomescreen" long-name="Music Homescreen" level="apps">
+     <component name="mpxcollectionpublisher" long-name="MPX Collection Publisher" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musichomescreen/mpxcollectionpublisher/group"/>
+     </component>
+     <component name="musiccontentpublisher" long-name="Music Content Publisher" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musichomescreen/musiccontentpublisher/group"/>
+     </component>
+     <component name="mcpmusicplayer" long-name="MCP Music Player" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musichomescreen/mcpmusicplayer/group"/>
+     </component>
+     <component name="musicplayeractionhandlerplugin" long-name="Music Player Action Handler Plugin" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musichomescreen/musicplayeractionhandlerplugin/group"/>
+     </component>
+     <component name="data" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musichomescreen/data/themes/default/group"/>
+     </component>
+     <component unofficial="yes" name="musichomescreen_build" long-name="Music Homescreen Build" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musichomescreen/group"/>
+     </component>
+    </collection>
+    <collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
+     <component name="serviceplugins" long-name="service Plugins" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
+     </component>
+     <component name="viewplugins" long-name="View Plugins" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
+     </component>
+     <component unofficial="yes" name="mpxplugins_build" long-name="MPX Plugins Build" origin-model="foundation">
+      <unit bldFile="app/musicplayer/mpxplugins/group"/>
+     </component>
+    </collection>
+    <collection name="musicplayer_info" long-name="Music Player Apps Info" level="apps">
+     <component unofficial="yes" name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musicplayer_plat/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="musicplayer_test" long-name="Music Player Apps Test" origin-model="foundation">
+      <!-- <unit bldFile="app/musicplayer/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="musicplayer_build" long-name="Music Player Apps Build" origin-model="foundation">
+      <unit bldFile="app/musicplayer/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="organizer" long-name="Organizer Application Suite" tech_domain="pr" level="apps" span="2" levels="support services engine ui">
+    <collection name="alarmui" long-name="Alarm UI" level="ui">
+     <component unofficial="yes" name="alarmui_build" long-name="Alarm UI Build" origin-model="foundation">
+      <unit bldFile="app/organizer/alarmui/group"/>
+     </component>
+    </collection>
+    <collection name="calendarui" long-name="Calendar UI" level="ui">
+     <component name="calendarui_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/help/group"/>
+     </component>
+     <component name="commonutils" long-name="Common Utils" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/commonutils/group"/>
+     </component>
+     <component name="globaldata" long-name="Global Data" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/globaldata/group"/>
+     </component>
+     <component name="settings" long-name="Settings" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
+      <unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
+     </component>
+     <component name="customisation" long-name="Customisation" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/customisation/group"/>
+     </component>
+     <component name="customisationmanager" long-name="Customisation Manager" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
+     </component>
+     <component name="views" long-name="Views" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/views/group"/>
+     </component>
+     <component name="calendarui_controller" long-name="Controller" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/controller/group"/>
+     </component>
+     <component name="editors" long-name=" Editors" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/editors/group"/>
+     </component>
+     <component name="application" long-name="Application" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/application/group"/>
+     </component>
+     <component name="missedalarmindicatorplugin" long-name="Missed Alarm Indicator Plugin" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
+     </component>
+     <component name="calendarui_server" long-name="Server" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
+      <unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
+     </component>
+     <component name="regionalplugins" long-name="Regional Plugins" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
+      <unit bldFile="app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
+      <unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
+      <unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
+     </component>
+     <!-- Empty duplicate component inc removed -->
+     <component unofficial="yes" name="calendarui_build" long-name="Calendar UI Build" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarui/group"/>
+     </component>
+    </collection>
+    <collection name="clock2" long-name="Clock2" level="ui">
+     <component name="clockengines" long-name="Clock Engines" origin-model="foundation">
+      <unit bldFile="app/organizer/clock2/clockengines/group"/>
+     </component>
+     <component name="clockui" long-name="Clock UI" origin-model="foundation">
+      <unit bldFile="app/organizer/clock2/clockui/group"/>
+      <!-- <unit bldFile="app/organizer/clock2/clockui/plugins/datetimeviewplugin/group"/> -->
+     </component>
+     <component name="clock2_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/organizer/clock2/help/group"/>
+     </component>
+     <component unofficial="yes" name="clock2_build" long-name="Clock2 Build" origin-model="foundation">
+      <unit bldFile="app/organizer/clock2/group"/>
+     </component>
+    </collection>
+    <collection name="meetingui" long-name="Meeting UI" level="ui">
+     <component name="attendeeview" long-name="Attendee View" origin-model="foundation">
+      <unit bldFile="app/organizer/meetingui/attendeeview/group"/>
+     </component>
+     <component name="agnentryui" long-name="Agn Entry UI" origin-model="foundation">
+      <unit bldFile="app/organizer/meetingui/agnentryui/group"/>
+     </component>
+     <component name="meetingrequestutils" long-name="Meeting Request Utils" origin-model="foundation">
+      <unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
+     </component>
+     <component name="meetingrequestviewers" long-name="Meeting Request Viewers" origin-model="foundation">
+      <unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
+     </component>
+     <component unofficial="yes" name="meetingui_build" long-name="Meeting UI Build" origin-model="foundation">
+      <unit bldFile="app/organizer/meetingui/group"/>
+     </component>
+    </collection>
+    <collection name="notepad" long-name="Notepad" level="ui">
+     <component name="notepad_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/organizer/notepad/help/group"/>
+     </component>
+     <component name="notepad1" long-name="Notepad1" origin-model="foundation">
+      <unit bldFile="app/organizer/notepad/notepad1/group"/>
+      <!-- <unit bldFile="app/organizer/notepad/notepad1/syncmladapter/group"/> -->
+     </component>
+     <component name="txtrecog" long-name="Txt Recog" origin-model="foundation">
+      <unit bldFile="app/organizer/notepad/txtrecog/group"/>
+     </component>
+     <component unofficial="yes" name="notepad_build" long-name="Notepad Build" origin-model="foundation">
+      <unit bldFile="app/organizer/notepad/group"/>
+     </component>
+    </collection>
+    <collection name="searchui" long-name="Search UI" level="ui">
+     <component name="searchui_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/organizer/searchui/help/group"/>
+     </component>
+     <component name="searchapp" long-name="Search App" origin-model="foundation">
+      <unit bldFile="app/organizer/searchui/searchapp/group"/>
+      <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
+      <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
+     </component>
+     <component unofficial="yes" name="searchui_build" long-name="Search UI Build" origin-model="foundation">
+      <unit bldFile="app/organizer/searchui/group"/>
+     </component>
+    </collection>
+    <collection name="calendarengines" long-name="Calendar Engines" level="engine">
+     <component name="versit2" long-name="Versit 2" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarengines/versit2/group"/>
+     </component>
+     <component name="agnversit2" long-name="Agenda Versit2" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
+     </component>
+     <component name="caleninterimutils" long-name="Calen Interim Utils" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
+     </component>
+     <component name="calenimp" long-name="Calen Imp" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarengines/calenimp/group"/>
+     </component>
+     <component name="calenlauncher" long-name="Calen Launcher" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
+     </component>
+     <component unofficial="yes" name="calendarengines_build" long-name="Calendar Engines Build" origin-model="foundation">
+      <unit bldFile="app/organizer/calendarengines/group"/>
+     </component>
+    </collection>
+    <collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
+     <component name="mrmailbox" long-name="MR Mailbox" origin-model="foundation">
+      <unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
+     </component>
+     <component name="mrmailboxutils" long-name="MR Mailbox Utils" origin-model="foundation">
+      <unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
+     </component>
+    </collection>
+    <collection name="alarmengines" long-name="Alarm Engines" level="engine">
+     <component name="missedalarmstore" long-name="Missed Alarm Store" origin-model="foundation">
+      <unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
+     </component>
+     <component unofficial="yes" name="alarmengines_build" long-name="Alarm Engines Build" origin-model="foundation">
+      <unit bldFile="app/organizer/alarmengines/group"/>
+     </component>
+    </collection>
+    <collection name="searchfw" long-name="Search Framework" level="services">
+     <component name="coresearchfw" long-name="Core Search Framework" origin-model="foundation">
+      <unit bldFile="app/organizer/searchfw/coresearchfw/group"/>
+     </component>
+     <component name="searchfw_plugins" long-name="Plugins" origin-model="foundation">
+      <unit bldFile="app/organizer/searchfw/plugins/group"/>
+     </component>
+     <component unofficial="yes" name="searchfw_build" long-name="Search Framework Build" origin-model="foundation">
+      <unit bldFile="app/organizer/searchfw/group"/>
+     </component>
+    </collection>
+    <collection name="pimappservices" long-name="PIM App Services" level="services">
+     <component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
+     </component>
+     <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
+     </component>
+     <component name="agendamodeltest" long-name="Agenda Model Test" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv" mrp="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv/app-engines_testagendasrv.mrp"/>
+     </component>
+     <component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection name="officeappeng" long-name="Office App Engines" level="engine">
+     <component name="datamodel" long-name="Data Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/organizer/officeappeng/datamodel/group" mrp="app/organizer/officeappeng/datamodel/group/app-engines_damodel.mrp"/>
+     </component>
+     <component name="sheeteng" long-name="Sheet Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/organizer/officeappeng/sheeteng/group" mrp="app/organizer/officeappeng/sheeteng/group/app-engines_sheng.mrp"/>
+     </component>
+     <component name="charteng" long-name="Chart" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit mrp="app/organizer/officeappeng/charteng/group/app-engines_chart.mrp"/>
+     </component>
+     <component name="wordeng" long-name="Word Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/organizer/officeappeng/wordeng/group" mrp="app/organizer/officeappeng/wordeng/group/app-engines_wpeng.mrp"/>
+     </component>
+    </collection>
+    <collection name="pimappsupport" long-name="PIM Application Support" level="support">
+     <component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/organizer/pimappsupport/vcardandvcal/group" mrp="app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+     </component>
+     <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+     </component>
+     <component name="n:chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
+     <component unofficial="yes" name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
+      <unit bldFile="app/organizer/organizer_pub/group"/>
+      <!-- <unit bldFile="app/organizer/organizer_pub/notepad_library_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="organizer_build" long-name="Organizer Application Suite Build" origin-model="foundation">
+      <unit bldFile="app/organizer/group"/>
+     </component>
+     <component unofficial="yes" name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
+      <unit bldFile="app/organizer/organizer_plat/group"/>
+      <!-- <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
+     </component>
+    <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="phone" long-name="Phone Apps" tech_domain="vc" level="apps" span="2" levels="engine plugin ui apps">
+    <collection name="phoneapp" long-name="Phone App" level="apps">
+     <component name="blacklist" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/blacklist/group"/>
+     </component>
+     <component name="phoneui" long-name="Phone UI" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/phoneui/group"/>
+      <!-- <unit bldFile="app/phone/phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group"/> -->
+      <!-- <unit bldFile="app/phone/phoneapp/phoneui/tsrc/public/basic/group"/> -->
+     </component>
+     <component name="phoneuicontrol" long-name="Phone UI Control" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
+     </component>
+     <component name="phoneuistates" long-name="Phone UI States" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
+     </component>
+     <component name="phoneuiutils" long-name="Phone UI Utils" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
+     </component>
+     <component name="phoneuiview" long-name="Phone UI View" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
+     </component>
+     <component name="phoneuivoipextension" long-name="Phone UI VOIP Extension" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
+     </component>
+     <component name="silenceactionplugin" long-name="Silence Action Plugin" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
+     </component>
+     <component name="phonemediatorcenter" long-name="Phone Mediator Center" origin-model="foundation">
+      <unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
+     </component>
+    </collection>
+    <collection name="phoneengine" long-name="Phone Engine" level="engine">
+     <component name="phonecntfinder" long-name="Phone Contact Finder" origin-model="foundation">
+      <unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
+     </component>
+     <component name="audiohandling" long-name="Audio Handling" origin-model="foundation">
+      <unit bldFile="app/phone/phoneengine/audiohandling/group"/>
+     </component>
+     <component name="callhandling" long-name="Call Handling" origin-model="foundation">
+      <unit bldFile="app/phone/phoneengine/callhandling/group"/>
+     </component>
+     <component name="contacthandling" long-name="Contact Handling" origin-model="foundation">
+      <unit bldFile="app/phone/phoneengine/contacthandling/group"/>
+     </component>
+     <component name="loghandling" long-name="Log Handling" origin-model="foundation">
+      <unit bldFile="app/phone/phoneengine/loghandling/group"/>
+     </component>
+     <component name="engineinfo" long-name="Engine Info" origin-model="foundation">
+      <unit bldFile="app/phone/phoneengine/engineinfo/group"/>
+     </component>
+     <component name="phonemodel" long-name="Phone Model" origin-model="foundation">
+      <unit bldFile="app/phone/phoneengine/phonemodel/group"/>
+     </component>
+     <component name="servicehandling" long-name="Service Handling" origin-model="foundation">
+      <unit bldFile="app/phone/phoneengine/servicehandling/group"/>
+     </component>
+    </collection>
+    <collection name="phonesettings" long-name="Phone Settings" level="ui">
+     <component name="aiwcallimageplugin" long-name="Aiw Call Image Plugin" origin-model="foundation">
+      <unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
+     </component>
+     <component name="pslncallimageplugin" long-name="Personalization Call Image Plugin" origin-model="foundation">
+      <unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
+     </component>
+    </collection>
+    <collection name="phoneuis" long-name="Phone UIs" level="ui">
+     <component name="dialer" long-name="Dialer" origin-model="foundation">
+      <unit bldFile="app/phone/phoneuis/dialer/group"/>
+      <!-- <unit bldFile="app/phone/phoneuis/dialer/tsrc/public/basic/group"/> -->
+     </component>
+     <component name="bubblemanager" long-name="Bubble Manager" origin-model="foundation">
+      <unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
+     </component>
+     <component name="connectutil" long-name="Connect Util" origin-model="foundation">
+      <unit bldFile="app/phone/phoneuis/connectutil/group"/>
+     </component>
+     <component name="sfiutils" long-name="SFI Utils" origin-model="foundation">
+      <unit bldFile="app/phone/phoneuis/sfiutils/group"/>
+      <!-- <unit bldFile="app/phone/phoneuis/sfiutils/tsrc/public/basic/group"/> -->
+     </component>
+     <component name="ussd" long-name="USSD" origin-model="foundation">
+      <unit bldFile="app/phone/phoneuis/ussd/group"/>
+     </component>
+     <component name="vmbx" long-name="Vmbx" origin-model="foundation">
+      <unit bldFile="app/phone/phoneuis/vmbx/group"/>
+     </component>
+     <component name="telephonydevicemode" long-name="Telephony Device Mode" origin-model="foundation">
+      <unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
+     </component>
+    </collection>
+    <collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
+     <component name="telbranding" long-name="Tel Branding" origin-model="foundation">
+      <unit bldFile="app/phone/phoneplugins/telbranding/group"/>
+     </component>
+    </collection>
+    <collection name="phone_info" long-name="Phone Apps Info" level="apps">
+     <component unofficial="yes" name="phone_build" long-name="Phone Apps Build" origin-model="foundation">
+      <unit bldFile="app/phone/group"/>
+     </component>
+     <component unofficial="yes" name="phone_plat" long-name="Phone Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/phone/phone_plat/group"/>
      </component>
     </collection>
    </block>
@@ -2193,6 +2194,343 @@
      </component>
     </collection>
    </block>
+   <block name="poc" long-name="PoC" tech_domain="vc" level="apps" levels="engine ui">
+    <collection name="pocengine" long-name="PoC Engine" level="engine">
+     <component name="sipclientresolver" long-name="SIP Client Resolver" origin-model="foundation">
+      <!-- <unit bldFile="app/poc/pocengine/sipclientresolver/group"/> -->
+     </component>
+     <component unofficial="yes" name="pocengine_build" long-name="PoC Engine Build" origin-model="foundation">
+      <unit bldFile="app/poc/pocengine/group"/>
+     </component>
+     <component unofficial="yes" name="pocengine_test" long-name="PoC Engine Test" origin-model="foundation">
+      <!-- <unit bldFile="app/poc/pocengine/tsrc/public/basic/group"/> -->
+     </component>
+    </collection>
+    <collection name="pocui" long-name="PoC Ui" level="ui">
+     <component name="pocuiintgr" long-name="PoC UI Intgr" origin-model="foundation">
+      <unit bldFile="app/poc/pocui/pocuiintgr/group"/>
+      <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
+      <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiecomplugin/group"/> -->
+      <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiintegrationservices/group"/> -->
+     </component>
+     <component name="pocui_app" long-name="Application" origin-model="foundation">
+      <unit bldFile="app/poc/pocui/app/group"/>
+     </component>
+     <component unofficial="yes" name="pocui_build" long-name="PoC Ui Build" origin-model="foundation">
+      <unit bldFile="app/poc/pocui/group"/>
+     </component>
+    </collection>
+    <collection name="poc_info" long-name="PoC Info" level="ui">
+     <component unofficial="yes" name="poc_build" long-name="PoC Build" origin-model="foundation">
+      <unit bldFile="app/poc/group"/>
+     </component>
+     <component unofficial="yes" name="poc_plat" long-name="PoC Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/poc/poc_plat/group"/>
+     </component>
+     <component unofficial="yes" name="poc_help" long-name="PoC Help" origin-model="foundation">
+      <unit bldFile="app/poc/help/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="printing" long-name="Printing" tech_domain="de" level="services" levels="app">
+    <collection name="imageprint" long-name="ImagePrint" level="app">
+     <component name="clog" origin-model="foundation">
+      <unit bldFile="app/printing/imageprint/clog/group"/>
+     </component>
+     <component name="imageprintengine" origin-model="foundation">
+      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
+      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
+      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
+      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/upnpprotocolfw2/group"/> -->
+      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/xhtmlfilecomposer/group"/> -->
+      <unit bldFile="app/printing/imageprint/imageprintengine/group"/>
+      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/imageprintserver/group"/> -->
+     </component>
+     <component name="imageprintui" origin-model="foundation">
+      <unit bldFile="app/printing/imageprint/imageprintui/group"/>
+     </component>
+     <component unofficial="yes" name="imageprint_build" origin-model="foundation">
+      <unit bldFile="app/printing/imageprint/group"/>
+     </component>
+    </collection>
+    <collection name="printing_info" long-name="Printing Info" level="app">
+     <component unofficial="yes" name="printing_build" long-name="Printing Build" origin-model="foundation">
+      <unit bldFile="app/printing/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="profile" long-name="Profile" tech_domain="ui" level="apps" levels="app">
+    <collection name="profilesapplication" long-name="Profiles Application" level="app">
+     <component name="profiles" long-name="Profiles" origin-model="foundation">
+      <unit bldFile="app/profile/profilesapplication/profiles/group"/>
+      <!-- <unit bldFile="app/profile/profilesapplication/profiles/gsprofilesplugin/group"/> -->
+      <!-- <unit bldFile="app/profile/profilesapplication/profiles/profileaiwprovider/group"/> -->
+      <!-- <unit bldFile="app/profile/profilesapplication/profiles/profileapp/group"/> -->
+      <unit bldFile="app/profile/profilesapplication/profiles/profileapp/tsrc/public/basic/group"/>
+      <!-- <unit bldFile="app/profile/profilesapplication/profiles/profilesgstonesplugin/group"/> -->
+     </component>
+     <component unofficial="yes" name="profilesapplication_test" long-name="Profiles Application Test" origin-model="foundation">
+      <!-- <unit bldFile="app/profile/profilesapplication/tsrc/public/basic/group"/> -->
+     </component>
+    </collection>
+    <collection name="profile_info" long-name="Profile Info" level="app">
+     <component unofficial="yes" name="profile_plat" long-name="Profile Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/profile/profile_plat/group"/>
+     </component>
+     <component unofficial="yes" name="profile_help" long-name="Profile Help" origin-model="foundation">
+      <unit bldFile="app/profile/help/group"/>
+     </component>
+     <component unofficial="yes" name="profile_build" long-name="Profile Build" origin-model="foundation">
+      <unit bldFile="app/profile/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="radio" long-name="Radio Apps" tech_domain="ma" level="apps" levels="engine ui">
+    <collection name="fmradio" long-name="FM Radio" level="ui">
+     <component name="activeidleengine" long-name="Active Idle Engine" origin-model="foundation">
+      <unit bldFile="app/radio/fmradio/activeidleengine/group"/>
+     </component>
+     <component name="fmradioengine" long-name="FM Radio Engine" origin-model="foundation">
+      <unit bldFile="app/radio/fmradio/fmradioengine/group"/>
+     </component>
+     <component name="fmradioactionhandler" long-name="FMRadio Action Handler" origin-model="foundation">
+      <unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
+     </component>
+     <component name="fmradiomcpplugin" long-name="FM Radio MCP Plugin" origin-model="foundation">
+      <unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
+     </component>
+     
+     <component name="fmradio_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="app/radio/fmradio/help/group"/>
+     </component>
+     <component unofficial="yes" name="fmradio_build" long-name="FM Radio Build" origin-model="foundation">
+      <unit bldFile="app/radio/fmradio/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="screensaver" long-name="Screen Saver Apps" tech_domain="ui" level="apps" levels="eng plugin">
+    <collection name="scrsaver" long-name="Screen Saver Plugins" level="eng">
+     <component name="scrsaverplugins" long-name="Screen Saver Plugins" origin-model="foundation">
+      <!-- <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/group"/> -->
+     </component>
+     <component name="screensaveraiwplugin" long-name="Screen Saver AIW Plugin" origin-model="foundation">
+      <unit bldFile="app/screensaver/scrsaver/screensaveraiwplugin/group"/>
+     </component>
+    </collection>
+    
+    <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="plugin">
+     <component unofficial="yes" name="screensaver_build" long-name="Screen Saver Apps Build" origin-model="foundation">
+      <unit bldFile="app/screensaver/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="settingsuis" long-name="Settings UIs" tech_domain="dm" level="services" levels="empty rsc ui">
+    <collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
+     <component name="services_db" long-name="Services Db" origin-model="foundation">
+      <unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
+     </component>
+     <component name="defaultapplicationsettings_server" long-name="Server" origin-model="foundation">
+      <unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
+     </component>
+     <component name="service" long-name="Service" origin-model="foundation">
+      <unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
+     </component>
+     <component name="dasgsplugin" long-name="GS Plugin" origin-model="foundation">
+      <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
+     </component>
+     <component unofficial="yes" name="defaultapplicationsettings_build" long-name="Default Application Settings Build" origin-model="foundation">
+      <unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
+     </component>
+    </collection>
+    <collection name="systemswuis" long-name="System SW UIs" level="ui">
+     <component name="touchscreencalib" long-name="Touchscreen Calib" origin-model="foundation">
+      <unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
+     </component>
+    </collection>
+    <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
+     <component unofficial="yes" name="devmngt_pub" class="api" origin-model="foundation">
+      <unit bldFile="app/settingsuis/devmngt_pub/group"/>
+     </component>
+     <component unofficial="yes" name="settingsuis_build" long-name="Settings UIs Build" origin-model="foundation">
+      <unit bldFile="app/settingsuis/group"/>
+     </component>
+     <component unofficial="yes" name="settingsuis_test" long-name="Settings UIs Test" origin-model="foundation">
+      <!-- <unit bldFile="app/settingsuis/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="devmngt_plat" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
+      <unit bldFile="app/settingsuis/devmngt_plat/group"/>
+      <!-- <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/tsrc/servicesdbapitest/group"/> -->
+     </component>
+    </collection>
+   </block>
+   <block name="speechsrv" long-name="Speech Recognition UIs" tech_domain="ui" level="services" levels="engine framework ui">
+    <collection name="voiceui" long-name="Voice UI" level="ui">
+     <component name="vcommand" long-name="VCommand" origin-model="foundation">
+      <unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
+     </component>
+     <component name="voiceuivoicerecognition" long-name="Voice UI Voice Recognition" origin-model="foundation">
+      <unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
+     </component>
+     <component name="pbkinfoviewimpl" long-name="Phonebook Info View Implementation" origin-model="foundation">
+      <unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
+     </component>
+     <component name="aiwpbkinfoviewprovider" long-name="AIW Phonebook Info View Provider" origin-model="foundation">
+      <unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
+     </component>
+     <component name="vccontrolpanelplugin" long-name="VC Control Panel Plugin" origin-model="foundation">
+      <unit bldFile="app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
+     </component>
+     <component unofficial="yes" name="voiceui_build" long-name="Voice UI Build" origin-model="foundation">
+      <unit bldFile="app/speechsrv/voiceui/group"/>
+     </component>
+    </collection>
+    <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
+     <component name="sispeechrecognitiondata" long-name="SI Speech Recognition Data" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
+     </component>
+     <component name="ttscommon" long-name="TTS Common" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
+     </component>
+     <component name="devtts" long-name="Text to Speech" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/devtts/group"/>
+     </component>
+     <component name="ttscustomcommands" long-name="TTS Custom Commands" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
+     </component>
+     <component name="ttscontrollerplugin" long-name="TTS Controller Plugin" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
+     </component>
+     <component name="ttsutility" long-name="TTS Utility" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
+     </component>
+     <component name="speechsynthesis" long-name="Speech Synthesis" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
+      <unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
+      <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/speechsynthesistest/group"/>
+      <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/testapplication/group"/> -->
+      <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/texttospeech/group"/> -->
+     </component>
+     <component name="devasr" long-name="Audio Recording and Speech Recognition" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/devasr/group"/>
+     </component>
+     <component name="sicc" long-name="Speaker Independent Custom Commands" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/sicc/group"/>
+     </component>
+     <component name="sisrscontrollerplugin" long-name="SI SRS Controller Plugin" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
+     </component>
+     <component name="siutility" long-name="Speaker Independent Utility" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/siutility/group"/>
+     </component>
+     <component name="nssvasapi" long-name="NSS VAS API" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
+      <!-- <unit bldFile="app/speechsrv/srsf/nssvasapi/nssvasdb/nssvasdbeventnotifier/group"/> -->
+     </component>
+     <component name="nssvascontacthdlr" long-name="NSS VAS Contact Handler" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
+     </component>
+     <component name="vcommandhandler" long-name="Voice Command Handler" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
+     </component>
+     <component name="vuiphandler" long-name="Voice UI Plugin Handler" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
+     </component>
+     <component name="vcommandexecutor" long-name="Voice Command Executor" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
+     </component>
+     <component name="vcommandexecutorbearer" long-name="Voice Command Executor Bearer" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
+     </component>
+     <component name="vcommandmanager" long-name="Voice Command Manager" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
+     </component>
+     <component name="vcexecutorapp" long-name="Voice Command Executor Application" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
+     </component>
+     <component name="profileobserverplugin" long-name="Profile Observer Plugin" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
+     </component>
+     <component unofficial="yes" name="srsf_build" long-name="Speech Recognition and Synthesis Framework Build" origin-model="foundation">
+      <unit bldFile="app/speechsrv/srsf/group"/>
+     </component>
+    </collection>
+    <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
+     <component unofficial="yes" name="speechsrv_test" long-name="Speech Recognition UIs Test" origin-model="foundation">
+      <!-- <unit bldFile="app/speechsrv/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build" origin-model="foundation">
+      <unit bldFile="app/speechsrv/group"/>
+     </component>
+     <component unofficial="yes" name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/speechsrv/speechsrv_plat/group"/>
+      <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/tsrc/group"/>
+     </component>
+    </collection>
+   </block>
+  <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+    <collection name="buildverification" long-name="Build Verification" level="services">
+     <component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+     </component>
+     <component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+     </component>
+    </collection>
+    <collection name="sysvalidation" long-name="System Validation" level="services">
+     <component name="integtestltsy" long-name="Integration Test Licensee TSY" filter="systemtest" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DEF140073" 
+        <unit bldFile="sysvalidation/integtestltsy/group" mrp="sysvalidation/integtestltsy/group/integtestltsy.mrp"/>
+        -->
+     </component>
+     <!--PLACEHOLDER="DEF140016" START REMOVE -->
+     <!--PLACEHOLDER="DEF140016" END REMOVE -->
+    </collection>
+    <collection name="installationapps" long-name="Installation Apps" level="apps2">
+     <component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+     </component>
+    </collection>
+    <collection name="networkingutils" long-name="Networking Utils" level="utils">
+     <component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp"/>
+     </component>
+     <component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp"/>
+     </component>
+    </collection>
+    <collection name="testapps" long-name="Test Apps" level="utils">
+     <component name="rschandler" long-name="Resource Handler" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp"/>
+     </component>
+    </collection>
+    <collection name="techview_info" long-name="Techview Info" level="apps3">
+     <component name="techview_metadata" long-name="Techview Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="utils" long-name="Utility Apps" tech_domain="pr" level="apps" levels="app">
+    <collection name="extras" long-name="Extras" level="app">
+     <component name="about" long-name="About" origin-model="foundation">
+      <unit bldFile="app/utils/extras/about/group"/>
+     </component>
+     <component name="calcsoft" long-name="Calcsoft" origin-model="foundation">
+      <unit bldFile="app/utils/extras/calcsoft/group"/>
+     </component>
+     <component name="converter" long-name="Converter" origin-model="foundation">
+      <unit bldFile="app/utils/extras/converter/group"/>
+     </component>
+     <component unofficial="yes" name="extras_build" long-name="Extras Build" origin-model="foundation">
+      <unit bldFile="app/utils/extras/group"/>
+     </component>
+    </collection>
+    <collection name="utils_info" long-name="Utility Apps Info" level="app">
+     <component unofficial="yes" name="utils_build" long-name="Utility Apps Build" origin-model="foundation">
+      <unit bldFile="app/utils/group"/>
+     </component>
+    </collection>
+   </block>
    <block name="videocenter" long-name="Video Center" tech_domain="ma" level="apps" levels="eng ui app">
     <collection name="mpxmyvideoscollection" long-name="MPX My Videos Collection" level="app">
      <component name="mpx_common_api" long-name="MPX Common_Api" class="api" origin-model="foundation">
@@ -2345,106 +2683,145 @@
      </component>
     </collection>
    </block>
-   <block name="musicplayer" long-name="Music Player Apps" tech_domain="ma" level="apps" levels="plugins support apps">
-    <collection name="musicvisualization" long-name="Music Visualization" level="plugins">
-     <component name="musicvisualizationplugin" long-name="Music Visualization Plugin" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musicvisualization/musicvisualizationplugin/group"/>
-     </component>
-     <component name="mpxvisualizationplugins" long-name="MPX Visualization Plugins" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musicvisualization/mpxvisualizationplugins/group"/>
-     </component>
-    </collection>
-    <collection name="mpxmusicplayer" long-name="MPX Music Player" level="apps">
-     <component name="mpxmusicplayer_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
-     </component>
-     <component name="mpxmusicplayer_commonui" long-name="Common UI" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
-     </component>
-     <component name="activeidle" long-name="Active Idle" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/activeidle/group"/>
-     </component>
-     <component name="metadatahandler" long-name="Metadata Handler" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-     </component>
-     <component name="mediakeyhandler" long-name="Mediakey Handler" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-     </component>
-     <component name="mpxmusicplayer_app" long-name="Application" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
-     </component>
-     <component unofficial="yes" name="mpxmusicplayer_build" long-name="MPX Music Player Build" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
-     </component>
-    </collection>
-    <collection name="musichomescreen" long-name="Music Homescreen" level="apps">
-     <component name="mpxcollectionpublisher" long-name="MPX Collection Publisher" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musichomescreen/mpxcollectionpublisher/group"/>
-     </component>
-     <component name="musiccontentpublisher" long-name="Music Content Publisher" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musichomescreen/musiccontentpublisher/group"/>
-     </component>
-     <component name="mcpmusicplayer" long-name="MCP Music Player" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musichomescreen/mcpmusicplayer/group"/>
-     </component>
-     <component name="musicplayeractionhandlerplugin" long-name="Music Player Action Handler Plugin" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musichomescreen/musicplayeractionhandlerplugin/group"/>
-     </component>
-     <component name="data" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musichomescreen/data/themes/default/group"/>
-     </component>
-     <component unofficial="yes" name="musichomescreen_build" long-name="Music Homescreen Build" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musichomescreen/group"/>
-     </component>
-    </collection>
-    <collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-     <component name="serviceplugins" long-name="service Plugins" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
-     </component>
-     <component name="viewplugins" long-name="View Plugins" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
-     </component>
-     <component unofficial="yes" name="mpxplugins_build" long-name="MPX Plugins Build" origin-model="foundation">
-      <unit bldFile="app/musicplayer/mpxplugins/group"/>
-     </component>
-    </collection>
-    <collection name="musicplayer_info" long-name="Music Player Apps Info" level="apps">
-     <component unofficial="yes" name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/group"/>
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/tsrc/group"/>
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/tsrc/group"/>
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group"/>
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/tsrc/group"/>
-      <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="musicplayer_test" long-name="Music Player Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="app/musicplayer/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="musicplayer_build" long-name="Music Player Apps Build" origin-model="foundation">
-      <unit bldFile="app/musicplayer/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="radio" long-name="Radio Apps" tech_domain="ma" level="apps" levels="engine ui">
-    <collection name="fmradio" long-name="FM Radio" level="ui">
-     <component name="activeidleengine" long-name="Active Idle Engine" origin-model="foundation">
-      <unit bldFile="app/radio/fmradio/activeidleengine/group"/>
-     </component>
-     <component name="fmradioengine" long-name="FM Radio Engine" origin-model="foundation">
-      <unit bldFile="app/radio/fmradio/fmradioengine/group"/>
-     </component>
-     <component name="fmradioactionhandler" long-name="FMRadio Action Handler" origin-model="foundation">
-      <unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
-     </component>
-     <component name="fmradiomcpplugin" long-name="FM Radio MCP Plugin" origin-model="foundation">
-      <unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
-     </component>
-     
-     <component name="fmradio_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/radio/fmradio/help/group"/>
-     </component>
-     <component unofficial="yes" name="fmradio_build" long-name="FM Radio Build" origin-model="foundation">
-      <unit bldFile="app/radio/fmradio/group"/>
+   <block name="videoeditor" long-name="Video Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
+    <collection name="videditor" long-name="Video Editor" level="ui">
+     <component name="videoeditorcommon" long-name="Video Editor Common" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
+     </component>
+     <component name="videoeditoruicomponents" long-name="Video Editor UI Components" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
+     </component>
+     <component name="simplevideoeditor" long-name="Simple Video Editor" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
+     </component>
+     <component name="simplecutvideo" long-name="Simple Cut Video" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
+     </component>
+     <component name="videoprovider" long-name="Video Provider" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
+     </component>
+     <component name="manualvideoeditor" long-name="Manual Video Editor" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videditor/manualvideoeditor/group"/>
+     </component>
+     <component name="trimformms" long-name="Trim For MMS" origin-model="foundation">
+      <!-- <unit bldFile="app/videoeditor/videditor/trimformms/group"/> -->
+     </component>
+     <component unofficial="yes" name="videditor_build" long-name="Video Editor Build" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videditor/group"/>
+     </component>
+    </collection>
+    <collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
+     <component name="audioeditorengine" long-name="Audio Editor Engine" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
+     </component>
+     <component name="avcedit" long-name="Avcedit" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
+     </component>
+     <component name="h263decoder" long-name="H263 Decoder" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
+     </component>
+     <component name="mp3aacmaniplib" long-name="Mp3aac Manip Lib" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
+     </component>
+     <component name="vedtranscoder" long-name="Ved Transcoder" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
+     </component>
+     <component name="vedengine" long-name="Ved Engine" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
+     </component>
+     <component unofficial="yes" name="videoeditorengine_build" long-name="Video Editor Engine Build" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditorengine/group"/>
+     </component>
+    </collection>
+    <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
+     <component unofficial="yes" name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditor_plat/group"/>
+     </component>
+     <component unofficial="yes" name="videoeditor_build" long-name="Video Editor Apps Build" origin-model="foundation">
+      <unit bldFile="app/videoeditor/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="videoplayer" long-name="Video Player Apps" tech_domain="ma" level="apps" levels="support apps">
+    <collection name="lwplayer" long-name="LW Player" level="apps">
+     <component name="lwplayer_build" long-name="LW Player" origin-model="foundation">
+      <unit bldFile="app/videoplayer/lwplayer/group"/>
+     </component>
+    </collection>
+    <collection name="mediaplayer" long-name="Media Player" level="apps">
+     <component name="mediaplayer_build" origin-model="foundation">
+      <unit bldFile="app/videoplayer/mediaplayer/group"/>
+     </component>
+    </collection>
+    <collection name="mediasettings" long-name="Media Settings" level="support">
+     <component name="mediasettings_build" origin-model="foundation">
+      <unit bldFile="app/videoplayer/mediasettings/group"/>
+     </component>
+    </collection>
+    <collection name="videoplayer_info" long-name="Video Player Apps Info" level="apps">
+     <component unofficial="yes" name="videoplayer_help" long-name="Video Player Apps Help" origin-model="foundation">
+      <unit bldFile="app/videoplayer/help/group"/>
+     </component>
+     <component unofficial="yes" name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/videoplayer/videoplayer_plat/group"/>
+      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/tsrc/group"/>
+      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="videoplayer_test" long-name="Video Player Apps Test" origin-model="foundation">
+      <!-- <unit bldFile="app/videoplayer/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="videoplayer_build" long-name="Video Player Apps Build" origin-model="foundation">
+      <unit bldFile="app/videoplayer/group"/>
+     </component>
+    </collection>
+   </block>
+<block name="videotelephony" long-name="Video Telephony Apps" tech_domain="vc" level="apps" levels="engine plugin prot ui">
+    <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
+     <component name="packetvideoenginebinaries" long-name="Packet Video Engine Binaries" origin-model="foundation"/>
+    </collection>
+    <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
+     <component name="videoteleng" long-name="Videotel Engine" origin-model="foundation">
+      <!-- <unit bldFile="app/videotelephony/vtengines/videoteleng/callctrl/group"/> -->
+      <unit bldFile="app/videotelephony/vtengines/videoteleng/group"/>
+      <!-- <unit bldFile="app/videotelephony/vtengines/videoteleng/logger/group"/> -->
+     </component>
+     <component name="vtmediatorplugin" long-name="VT Mediator Plugin" origin-model="foundation">
+      <unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
+     </component>
+     <component unofficial="yes" name="vtengines_build" long-name="Video Telephony Engines Build" origin-model="foundation">
+      <unit bldFile="app/videotelephony/vtengines/group"/>
+     </component>
+    </collection>
+    <collection name="vtuis" long-name="Video Telephony UIs" level="ui">
+     <component name="videotelui" long-name="Video Telephony UI" origin-model="foundation">
+      <unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
+     </component>
+     <component unofficial="yes" name="vtuis_build" long-name="Video Telephony UIs Build" origin-model="foundation">
+      <unit bldFile="app/videotelephony/vtuis/group"/>
+     </component>
+    </collection>
+    <collection name="vtprotocolplugins" long-name="Video Telephony Protocol Plugins" level="plugin">
+     <component name="displaysink" long-name="Display Sink" origin-model="foundation">
+      <unit bldFile="app/videotelephony/vtprotocolplugins/displaysink/group"/>
+     </component>
+     <component name="videosource" long-name="Video Source" origin-model="foundation">
+      <unit bldFile="app/videotelephony/vtprotocolplugins/videosource/group"/>
+     </component>
+     <component unofficial="yes" name="vtprotocolplugins_build" long-name="Video Telephony Protocol Plugins Build" origin-model="foundation">
+      <unit bldFile="app/videotelephony/vtprotocolplugins/group"/>
+     </component>
+    </collection>
+    <collection name="vtprotocols" long-name="Video Telephony Protocols" level="prot">
+     <!-- Empty duplicate component videotelproto.dll=binary removed -->
+    </collection>
+    <collection name="vtprotocolsstub" long-name="Video Telephony Protocols Stub" level="prot">
+     <component name="videotelproto" origin-model="foundation">
+      <unit bldFile="app/videotelephony/vtprotocolsstub/group"/>
+     </component>
+    </collection>
+    <collection name="videotelephony_info" long-name="Video Telephony Apps Info" level="ui">
+     <component unofficial="yes" name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/videotelephony/videotelephony_plat/group"/>
      </component>
     </collection>
    </block>
@@ -2473,253 +2850,6 @@
      </component>
     </collection>
    </block>
-   <block name="imgvieweruis" long-name="Image Viewer UIs" tech_domain="ma" level="services" levels="app">
-    <collection name="imageviewer" long-name="Image Viewer" level="app">
-     <component name="imageviewer_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="app/imgvieweruis/imageviewer/help/group"/>
-     </component>
-     <component name="imageviewer_build" origin-model="foundation">
-      <unit bldFile="app/imgvieweruis/imageviewer/group"/>
-     </component>
-    </collection>
-    <collection name="imgvieweruis_info" long-name="Image Viewer UIs Info" level="app">
-     <component unofficial="yes" name="imgvieweruis_build" long-name="Image Viewer UIs Build" origin-model="foundation">
-      <unit bldFile="app/imgvieweruis/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="screensaver" long-name="Screen Saver Apps" tech_domain="ui" level="apps" levels="eng plugin">
-    <collection name="scrsaver" long-name="Screen Saver Plugins" level="eng">
-     <component name="scrsaverplugins" long-name="Screen Saver Plugins" origin-model="foundation">
-      <!-- <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/group"/> -->
-     </component>
-     <component name="screensaveraiwplugin" long-name="Screen Saver AIW Plugin" origin-model="foundation">
-      <unit bldFile="app/screensaver/scrsaver/screensaveraiwplugin/group"/>
-     </component>
-    </collection>
-    
-    <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="plugin">
-     <component unofficial="yes" name="screensaver_build" long-name="Screen Saver Apps Build" origin-model="foundation">
-      <unit bldFile="app/screensaver/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="homescreen" long-name="Home Screen Apps" tech_domain="ui" level="apps" levels="fw apps">
-    <collection name="idlehomescreen" long-name="Idle Homescreen" level="apps">
-     <component name="nativeuicontroller" long-name="Native UI Controller" origin-model="foundation">
-      <unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-     </component>
-     <component name="exths" long-name="ExtHS" origin-model="foundation">
-      <unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
-     </component>
-     <component name="activeidle3" long-name="Active Idle 3" origin-model="foundation">
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/group"/> -->
-      <unit bldFile="app/homescreen/idlehomescreen/activeidle3/group"/>
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/> -->
-     </component>
-     <component name="hsplugins" long-name="HS Plugins" origin-model="foundation">
-      <unit bldFile="app/homescreen/idlehomescreen/hsplugins/group"/>
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/qhd_tch/organizer_2001f481/group"/> -->
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001f48d/group"/> -->
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001fdba/group"/> -->
-     </component>
-    </collection>
-    <collection name="menufw" long-name="Menu Framework" level="fw">
-     <component name="hierarchynavigator" long-name="Hierarchy Navigator" origin-model="foundation">
-      <unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
-     </component>
-     <component name="menufwui" long-name="Menu Framework UI" origin-model="foundation">
-      <unit bldFile="app/homescreen/menufw/menufwui/group"/>
-     </component>
-     <component name="menusuites" long-name="Menu Suites" origin-model="foundation">
-      <unit bldFile="app/homescreen/menufw/menusuites/group"/>
-     </component>
-     <component unofficial="yes" name="menufw_build" long-name="Menu Framework Build" origin-model="foundation">
-      <unit bldFile="app/homescreen/menufw/group"/>
-     </component>
-    </collection>
-    <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
-     <component unofficial="yes" name="homescreen_build" long-name="Home Screen Apps Build" origin-model="foundation">
-      <unit bldFile="app/homescreen/group"/>
-     </component>
-     <component unofficial="yes" name="homescreen_test" long-name="Home Screen Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="app/homescreen/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/homescreen/homescreen_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="graphicsuis" long-name="Graphics UIs" tech_domain="ui" level="services" levels="util ui">
-    <collection name="svgtviewer" long-name="SVGT Viewer" level="ui">
-     <component name="svgtviewerplugin" long-name="SVGT Viewer Plugin" origin-model="foundation">
-      <unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-     </component>
-     <component unofficial="yes" name="svgtviewer_build" long-name="SVGT Viewer Build" origin-model="foundation">
-      <unit bldFile="app/graphicsuis/svgtviewer/group"/>
-     </component>
-    </collection>
-    <collection name="graphicsuis_info" long-name="Graphics UIs Info" level="ui">
-     <component unofficial="yes" name="graphicsuis_build" long-name="Graphics UIs Build" origin-model="foundation">
-      <unit bldFile="app/graphicsuis/group"/>
-     </component>
-     <component unofficial="yes" name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="profile" long-name="Profile" tech_domain="ui" level="apps" levels="app">
-    <collection name="profilesapplication" long-name="Profiles Application" level="app">
-     <component name="profiles" long-name="Profiles" origin-model="foundation">
-      <unit bldFile="app/profile/profilesapplication/profiles/group"/>
-      <!-- <unit bldFile="app/profile/profilesapplication/profiles/gsprofilesplugin/group"/> -->
-      <!-- <unit bldFile="app/profile/profilesapplication/profiles/profileaiwprovider/group"/> -->
-      <!-- <unit bldFile="app/profile/profilesapplication/profiles/profileapp/group"/> -->
-      <unit bldFile="app/profile/profilesapplication/profiles/profileapp/tsrc/public/basic/group"/>
-      <!-- <unit bldFile="app/profile/profilesapplication/profiles/profilesgstonesplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="profilesapplication_test" long-name="Profiles Application Test" origin-model="foundation">
-      <!-- <unit bldFile="app/profile/profilesapplication/tsrc/public/basic/group"/> -->
-     </component>
-    </collection>
-    <collection name="profile_info" long-name="Profile Info" level="app">
-     <component unofficial="yes" name="profile_plat" long-name="Profile Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/profile/profile_plat/group"/>
-     </component>
-     <component unofficial="yes" name="profile_help" long-name="Profile Help" origin-model="foundation">
-      <unit bldFile="app/profile/help/group"/>
-     </component>
-     <component unofficial="yes" name="profile_build" long-name="Profile Build" origin-model="foundation">
-      <unit bldFile="app/profile/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="speechsrv" long-name="Speech Recognition UIs" tech_domain="ui" level="services" levels="engine framework ui">
-    <collection name="voiceui" long-name="Voice UI" level="ui">
-     <component name="vcommand" long-name="VCommand" origin-model="foundation">
-      <unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
-     </component>
-     <component name="voiceuivoicerecognition" long-name="Voice UI Voice Recognition" origin-model="foundation">
-      <unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-     </component>
-     <component name="pbkinfoviewimpl" long-name="Phonebook Info View Implementation" origin-model="foundation">
-      <unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-     </component>
-     <component name="aiwpbkinfoviewprovider" long-name="AIW Phonebook Info View Provider" origin-model="foundation">
-      <unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-     </component>
-     <component name="vccontrolpanelplugin" long-name="VC Control Panel Plugin" origin-model="foundation">
-      <unit bldFile="app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
-     </component>
-     <component unofficial="yes" name="voiceui_build" long-name="Voice UI Build" origin-model="foundation">
-      <unit bldFile="app/speechsrv/voiceui/group"/>
-     </component>
-    </collection>
-    <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-     <component name="sispeechrecognitiondata" long-name="SI Speech Recognition Data" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-     </component>
-     <component name="ttscommon" long-name="TTS Common" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
-     </component>
-     <component name="devtts" long-name="Text to Speech" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/devtts/group"/>
-     </component>
-     <component name="ttscustomcommands" long-name="TTS Custom Commands" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
-     </component>
-     <component name="ttscontrollerplugin" long-name="TTS Controller Plugin" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
-     </component>
-     <component name="ttsutility" long-name="TTS Utility" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
-     </component>
-     <component name="speechsynthesis" long-name="Speech Synthesis" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
-      <unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-      <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/speechsynthesistest/group"/>
-      <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/testapplication/group"/> -->
-      <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/texttospeech/group"/> -->
-     </component>
-     <component name="devasr" long-name="Audio Recording and Speech Recognition" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/devasr/group"/>
-     </component>
-     <component name="sicc" long-name="Speaker Independent Custom Commands" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/sicc/group"/>
-     </component>
-     <component name="sisrscontrollerplugin" long-name="SI SRS Controller Plugin" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-     </component>
-     <component name="siutility" long-name="Speaker Independent Utility" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/siutility/group"/>
-     </component>
-     <component name="nssvasapi" long-name="NSS VAS API" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
-      <!-- <unit bldFile="app/speechsrv/srsf/nssvasapi/nssvasdb/nssvasdbeventnotifier/group"/> -->
-     </component>
-     <component name="nssvascontacthdlr" long-name="NSS VAS Contact Handler" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
-     </component>
-     <component name="vcommandhandler" long-name="Voice Command Handler" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
-     </component>
-     <component name="vuiphandler" long-name="Voice UI Plugin Handler" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
-     </component>
-     <component name="vcommandexecutor" long-name="Voice Command Executor" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
-     </component>
-     <component name="vcommandexecutorbearer" long-name="Voice Command Executor Bearer" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-     </component>
-     <component name="vcommandmanager" long-name="Voice Command Manager" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
-     </component>
-     <component name="vcexecutorapp" long-name="Voice Command Executor Application" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
-     </component>
-     <component name="profileobserverplugin" long-name="Profile Observer Plugin" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
-     </component>
-     <component unofficial="yes" name="srsf_build" long-name="Speech Recognition and Synthesis Framework Build" origin-model="foundation">
-      <unit bldFile="app/speechsrv/srsf/group"/>
-     </component>
-    </collection>
-    <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
-     <component unofficial="yes" name="speechsrv_test" long-name="Speech Recognition UIs Test" origin-model="foundation">
-      <!-- <unit bldFile="app/speechsrv/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build" origin-model="foundation">
-      <unit bldFile="app/speechsrv/group"/>
-     </component>
-     <component unofficial="yes" name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/group"/>
-      <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/tsrc/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
-    <collection name="dtdinstaller" long-name="DTD Installer" level="install">
-     <component name="dtdinstaller_build" origin-model="foundation">
-      <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
-     </component>
-    </collection>
-    <collection name="themeinstaller" long-name="Theme Installer" level="install">
-     <component name="themeinstaller_build" origin-model="foundation">
-      <unit bldFile="tools/homescreentools/themeinstaller/group"/>
-     </component>
-    </collection>
-    <collection name="themetool" long-name="Theme Tool" level="tool">
-     <component name="themetool_build" origin-model="foundation">
-      <unit bldFile="tools/homescreentools/themetool/group"/>
-     </component>
-    </collection>
-    <collection name="homescreentools_info" long-name="Home Screen Tools Info" level="install">
-     <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="foundation">
-      <unit bldFile="tools/homescreentools/group"/>
-     </component>
-    </collection>
-   </block>
    <block name="webuis" long-name="Web UIs" tech_domain="rt" level="services" levels="plugin app">
     <collection name="browserui" long-name="Browser UI" level="app">
      <component name="browser" long-name="Browser" origin-model="foundation">
@@ -2767,76 +2897,26 @@
      </component>
     </collection>
    </block>
-   <block name="java" long-name="Java" tech_domain="rt" level="services" levels="framework util generic rt">
-    <collection name="javaextensions" long-name="Java Extensions" level="generic">
-     <component name="eswt" long-name="Eswt" origin-model="foundation"/>
-     <component name="jsr" long-name="JSR" origin-model="foundation"/>
-     <component name="supplements" long-name="Supplements" origin-model="foundation"/>
-    </collection>
-    <collection name="javainstaller" long-name="Java Installer" level="generic">
-     <component name="javarightslistener" long-name="Java Rights Listener" origin-model="foundation"/>
-     <component name="installplugins" long-name="Install Plugins" origin-model="foundation"/>
-     <component name="midp2otadownloadplugin" long-name="MIDP2 OTA Download Plugin" origin-model="foundation"/>
-     <component name="installationfrontend" long-name="Installation Frontend" origin-model="foundation"/>
-     <component name="midp2iferecognizer" long-name="MIDP2 Interface Rrecognizer" origin-model="foundation"/>
-     <component name="iferecognizers" long-name="Ife Recognizers" origin-model="foundation"/>
-    </collection>
-    <collection name="javalegacy" long-name="Java Legacy" level="util">
-     <component name="jcfcommon" long-name="Jcf Common" origin-model="foundation"/>
-     <component name="j2me" long-name="J2ME" origin-model="foundation"/>
-    </collection>
-    <collection name="javamanager" long-name="Java Manager" level="framework">
-     <component name="javabackup" long-name="Java Backup" origin-model="foundation"/>
-     <!-- Empty duplicate component javaregistry removed -->
-     <component name="javadrmmanager" long-name="Java DRM Manager" origin-model="foundation"/>
-     <component name="javasettings" long-name="Java Settings" origin-model="foundation"/>
-    </collection>
-    <collection name="javaruntime" long-name="Java Runtime" level="rt">
-     <!-- Empty duplicate component common removed -->
-     <component name="temp_j2me_root" long-name="Temp J2me Root" origin-model="foundation"/>
-     <component name="jvm" long-name="JVM" origin-model="foundation"/>
-     <component name="eventserver" long-name="Event Server" origin-model="foundation"/>
-     <!-- Empty duplicate component utils removed -->
-     <component name="midp2ams" long-name="Midp2ams" origin-model="foundation"/>
-     <component name="redirserver" long-name="Redirect Server" origin-model="foundation"/>
-    </collection>
-    <collection name="javautils" long-name="Java Utils" level="util">
-     <component name="jarfiledecoder" long-name="JAR File Decoder" origin-model="foundation"/>
-     <component name="javareader" long-name="Java Reader" origin-model="foundation"/>
-     <component name="javapackagelookup" long-name="Java Package Lookup" origin-model="foundation"/>
-     <!-- Empty duplicate component common removed -->
-     <component name="integrityserver" long-name="Integrity Server" origin-model="foundation"/>
-     <!-- Empty duplicate component javadrmutils removed -->
-     <component name="javarecognizer" long-name="Java Recognizer" origin-model="foundation"/>
-     <component name="iconconverter" long-name="Icon Converter" origin-model="foundation"/>
-     <component name="adt" long-name="ADT" origin-model="foundation"/>
-     <!-- Empty duplicate component javaenvinfo removed -->
-    </collection>
-    <collection name="java_stubs" long-name="Java Stubs" level="util">
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javadrmutils" long-name="Java DRM Utils">
-       <unit bldFile="app/java/java_stubs/javadrmutils/group"/>
-     </component>-->
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javaenvinfo" long-name="Java Environment Info">
-       <unit bldFile="app/java/java_stubs/javaenvinfo/group"/>
-     </component>-->
-     <component name="javaregistry" long-name="Java Registry" origin-model="foundation">
-      <unit bldFile="app/java/java_stubs/javaregistry/clientserver/client/group"/>
-     </component>
-     <component unofficial="yes" name="java_stubs_build" origin-model="foundation">
-      <unit bldFile="app/java/java_stubs/group"/>
-     </component>
-    </collection>
-    <collection name="javatools" long-name="Java Tools" level="generic">
-     <component name="envupdater" long-name="Environment Updater" origin-model="foundation"/>
-    </collection>
-    <collection name="java_info" long-name="Java Info" level="rt">
-     <component unofficial="yes" name="java_build" long-name="Java Build" origin-model="foundation">
-      <unit bldFile="app/java/group"/>
-     </component>
-     <component unofficial="yes" name="java_plat" long-name="Java Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="app/java/java_plat/group"/>
+
+   <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
+    <collection name="dtdinstaller" long-name="DTD Installer" level="install">
+     <component name="dtdinstaller_build" origin-model="foundation">
+      <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
+     </component>
+    </collection>
+    <collection name="themeinstaller" long-name="Theme Installer" level="install">
+     <component name="themeinstaller_build" origin-model="foundation">
+      <unit bldFile="tools/homescreentools/themeinstaller/group"/>
+     </component>
+    </collection>
+    <collection name="themetool" long-name="Theme Tool" level="tool">
+     <component name="themetool_build" origin-model="foundation">
+      <unit bldFile="tools/homescreentools/themetool/group"/>
+     </component>
+    </collection>
+    <collection name="homescreentools_info" long-name="Home Screen Tools Info" level="install">
+     <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="foundation">
+      <unit bldFile="tools/homescreentools/group"/>
      </component>
     </collection>
    </block>
@@ -2910,85 +2990,6 @@
      </component>
     </collection>
    </block>
-   <block name="helps" long-name="Help Apps" tech_domain="ui" level="apps" span="2" levels="eng tools unused  ui">
-    <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="ui">
-     <component name="aiwhelpprovider" long-name="Aiw Help Provider" origin-model="foundation">
-      <!-- <unit bldFile="app/helps/csxhelp/aiwhelpprovider/group"/> -->
-     </component>
-     <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build" origin-model="foundation">
-      <unit bldFile="app/helps/csxhelp/group"/>
-     </component>
-    </collection>
-   <collection name="n:symhelptools" long-name="Symbian Help Tools" level="tools">
-     <component name="n:mbmcodec" long-name="MBM Codec" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="app/helps/symhelp/mbmcodec/group" mrp="app/helps/symhelp/mbmcodec/group/tools_sdk_eng_mbmcodec.mrp"/> -->
-     </component>
-     <component name="n:cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="app/helps/symhelp/cshlpcmpgui/group" mrp="app/helps/symhelp/cshlpcmpgui/group/tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/> -->
-     </component>
-     <component name="n:cshlpcmpfrontend" long-name="CSHelp Compiler Frontend" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="app/helps/symhelp/cshlpcmpfrontend/group" mrp="app/helps/symhelp/cshlpcmpfrontend/group/tools_sdk_eng_cshlpcmp_frontend.mrp"/> -->
-     </component>
-     <component name="n:cshlpcmpbackend" long-name="CSHelp Compiler Backend" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
-     </component>
-    </collection>
-    <collection name="symhelp" long-name="Symbian Help" level="eng">
-     <component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-     </component>
-    </collection>
-    <collection name="helps_info" long-name="Help Apps Info" level="ui">
-     <component name="helps_metadata" long-name="Help Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-  <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
-    <collection name="buildverification" long-name="Build Verification" level="services">
-     <component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/techview/buildverification/autosmoketest/Group" mrp="app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-     </component>
-     <component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-     </component>
-    </collection>
-    <collection name="sysvalidation" long-name="System Validation" level="services">
-     <component name="integtestltsy" long-name="Integration Test Licensee TSY" filter="systemtest" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DEF140073" 
-        <unit bldFile="sysvalidation/integtestltsy/group" mrp="sysvalidation/integtestltsy/group/integtestltsy.mrp"/>
-        -->
-     </component>
-     <!--PLACEHOLDER="DEF140016" START REMOVE -->
-     <!--PLACEHOLDER="DEF140016" END REMOVE -->
-    </collection>
-    <collection name="installationapps" long-name="Installation Apps" level="apps2">
-     <component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkingutils" long-name="Networking Utils" level="utils">
-     <component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp"/>
-     </component>
-     <component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp"/>
-     </component>
-    </collection>
-    <collection name="testapps" long-name="Test Apps" level="utils">
-     <component name="rschandler" long-name="Resource Handler" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp"/>
-     </component>
-    </collection>
-    <collection name="techview_info" long-name="Techview Info" level="apps3">
-     <component name="techview_metadata" long-name="Techview Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
   </layer>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appsupport" long-name="Generic Application Support" tech_domain="rt" level="generic" levels="system plugin framework server generic specific">