Added "/sf/" prefix to all bldFile values, as this is what's expected in the package builds.
authorSimon Howkins <simonh@symbian.org>
Mon, 10 Aug 2009 14:00:06 +0100
changeset 8 0d49d14a3f5e
parent 7 f28a2588e622
child 9 91d5acad1e40
Added "/sf/" prefix to all bldFile values, as this is what's expected in the package builds. (Also in comments!)
3k/adaptation/stubs/package_definition.xml
3k/app/camera/package_definition.xml
3k/app/commonemail/package_definition.xml
3k/app/contacts/package_definition.xml
3k/app/contentcontrol/package_definition.xml
3k/app/conversations/package_definition.xml
3k/app/devicecontrol/package_definition.xml
3k/app/helps/package_definition.xml
3k/app/homescreen/package_definition.xml
3k/app/im/package_definition.xml
3k/app/imgeditor/package_definition.xml
3k/app/iptelephony/package_definition.xml
3k/app/java/package_definition.xml
3k/app/location/package_definition.xml
3k/app/messaging/package_definition.xml
3k/app/mmsharinguis/package_definition.xml
3k/app/musicplayer/package_definition.xml
3k/app/organizer/package_definition.xml
3k/app/phone/package_definition.xml
3k/app/photos/package_definition.xml
3k/app/poc/package_definition.xml
3k/app/printing/package_definition.xml
3k/app/profile/package_definition.xml
3k/app/screensaver/package_definition.xml
3k/app/settingsuis/package_definition.xml
3k/app/speechsrv/package_definition.xml
3k/app/videocenter/package_definition.xml
3k/app/videoeditor/package_definition.xml
3k/app/videoplayer/package_definition.xml
3k/app/videotelephony/package_definition.xml
3k/app/voicerec/package_definition.xml
3k/app/webuis/package_definition.xml
3k/mw/appinstall/package_definition.xml
3k/mw/appsupport/package_definition.xml
3k/mw/camerasrv/package_definition.xml
3k/mw/classicui/package_definition.xml
3k/mw/drm/package_definition.xml
3k/mw/homescreensrv/package_definition.xml
3k/mw/imghandling/package_definition.xml
3k/mw/imsrv/package_definition.xml
3k/mw/inputmethods/package_definition.xml
3k/mw/ipappprotocols/package_definition.xml
3k/mw/ipappsrv/package_definition.xml
3k/mw/legacypresence/package_definition.xml
3k/mw/locationsrv/package_definition.xml
3k/mw/mds/package_definition.xml
3k/mw/messagingmw/package_definition.xml
3k/mw/mmappfw/package_definition.xml
3k/mw/mmmw/package_definition.xml
3k/mw/mmuifw/package_definition.xml
3k/mw/netprotocols/package_definition.xml
3k/mw/opensrv/package_definition.xml
3k/mw/phonesrv/package_definition.xml
3k/mw/remoteconn/package_definition.xml
3k/mw/remotemgmt/package_definition.xml
3k/mw/remotestorage/package_definition.xml
3k/mw/securitysrv/package_definition.xml
3k/mw/serviceapi/package_definition.xml
3k/mw/serviceapifw/package_definition.xml
3k/mw/shortlinkconn/package_definition.xml
3k/mw/svgt/package_definition.xml
3k/mw/uiaccelerator/package_definition.xml
3k/mw/uiresources/package_definition.xml
3k/mw/uitools/package_definition.xml
3k/mw/videoutils/package_definition.xml
3k/mw/vpnclient/package_definition.xml
3k/mw/web/package_definition.xml
3k/mw/websrv/package_definition.xml
3k/mw/wirelessacc/package_definition.xml
3k/os/boardsupport/package_definition.xml
3k/os/buildtools/package_definition.xml
3k/os/cellularsrv/package_definition.xml
3k/os/commsfw/package_definition.xml
3k/os/deviceplatformrelease/package_definition.xml
3k/os/devicesrv/package_definition.xml
3k/os/graphics/package_definition.xml
3k/os/imagingext/package_definition.xml
3k/os/kernelhwsrv/package_definition.xml
3k/os/lbs/package_definition.xml
3k/os/mm/package_definition.xml
3k/os/ossrv/package_definition.xml
3k/os/persistentdata/package_definition.xml
3k/os/textandloc/package_definition.xml
3k/os/xmlsrv/package_definition.xml
3k/ostools/osrndtools/package_definition.xml
3k/tools/homescreentools/package_definition.xml
3k/tools/platformtools/package_definition.xml
3k/tools/rndtools/package_definition.xml
3k/tools/swconfigtools/package_definition.xml
--- a/3k/adaptation/stubs/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/adaptation/stubs/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,9 +5,9 @@
 <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
     <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
      <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
-      <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
-      <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
       <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
      </component>
      <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" origin-model="foundation">
@@ -44,25 +44,25 @@
     </collection>
     <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
      <component name="adaptationhwdevice" long-name="Adaptation Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/adaptationhwdevice/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/adaptationhwdevice/group"/> -->
      </component>
      <component name="grcompilerhwdevice" long-name="GR Compiler Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
      </component>
      <component name="ttphwdevice" long-name="TTP Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttphwdevice/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/ttphwdevice/group"/> -->
      </component>
      <component name="recognitionhwdevice" long-name="Recognition Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
      </component>
      <component name="vocmanhwdevice" long-name="Voc Man Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
      </component>
      <component name="ttshwdevice" long-name="TTS Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttshwdevice/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/ttshwdevice/group"/> -->
      </component>
      <component name="nlphwdevice" long-name="NLP Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/nlphwdevice/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/nlphwdevice/group"/> -->
      </component>
      <component unofficial="yes" name="srsfenginestub_build" long-name="SRSF Engine Stub Build" origin-model="foundation">
       <unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
@@ -109,7 +109,7 @@
       <unit bldFile="/sf/adaptation/stubs/systemswstubs/wiredbearerreference/group"/>
      </component>
      <component unofficial="yes" name="systemswstubs_build" long-name="System SW Stubs Build" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/systemswstubs/group"/> -->
+      <!-- <unit bldFile="/sf/adaptation/stubs/systemswstubs/group"/> -->
      </component>
     </collection>
     <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
--- a/3k/app/camera/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/camera/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -8,10 +8,10 @@
       <unit bldFile="/sf/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="/sf/app/camera/camerauis/cameraapp/generic/camerauiconfigmanager/group"/> -->
+      <!-- <unit bldFile="/sf/app/camera/camerauis/cameraapp/generic/gscamcorderplugin/group"/> -->
       <unit bldFile="/sf/app/camera/camerauis/cameraapp/group"/>
-      <!-- <unit bldFile="app/camera/camerauis/cameraapp/help/group"/> -->
+      <!-- <unit bldFile="/sf/app/camera/camerauis/cameraapp/help/group"/> -->
      </component>
     </collection>
     <collection name="camera_info" long-name="Camera Apps Info" level="1">
@@ -19,8 +19,8 @@
       <unit bldFile="/sf/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="/sf/app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/> -->
       <unit bldFile="/sf/app/camera/camera_plat/group"/>
      </component>
     </collection>
--- a/3k/app/commonemail/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/commonemail/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -123,7 +123,7 @@
     </collection>
     <collection name="emailhelp" long-name="Email Help" level="support">
      <component name="emailhelp_build" origin-model="foundation">
-      <!-- <unit bldFile="app/commonemail/emailhelp/group"/> -->
+      <!-- <unit bldFile="/sf/app/commonemail/emailhelp/group"/> -->
      </component>
     </collection>
     <collection name="legacy" long-name="Legacy Email" level="support">
--- a/3k/app/contacts/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/contacts/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -30,14 +30,14 @@
       <unit bldFile="/sf/app/contacts/phonebookui/speeddial/group"/>
      </component>
      <component name="phonebook2" long-name="Phone Book 2" origin-model="foundation">
-      <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group"/> -->
-      <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group"/> -->
       <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/group"/>
-      <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/tsrc/utilities/changepbk2cenrepkeyvaluestool/group"/> -->
-      <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/tsrc/ut_addfavoritiesvisibility/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/tsrc/utilities/changepbk2cenrepkeyvaluestool/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/tsrc/ut_addfavoritiesvisibility/group"/> -->
      </component>
      <component unofficial="yes" name="phonebookui_build" long-name="Phonebook UI Build" origin-model="foundation">
-      <!-- <unit bldFile="app/contacts/phonebookui/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/phonebookui/group"/> -->
      </component>
     </collection>
     <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
@@ -49,21 +49,21 @@
      </component>
      <component name="virtualphonebook" long-name="Virtual Phonebook" origin-model="foundation">
       <unit bldFile="/sf/app/contacts/phonebookengines/virtualphonebook/group"/>
-      <!-- <unit bldFile="app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_selectorfactory/group"/> -->
-      <!-- <unit bldFile="app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_strcntanalyzer/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_selectorfactory/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_strcntanalyzer/group"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="contactsmodel">
-       -  <unit bldFile="app/contacts/phonebookengines/contactsmodel/cntmatchlog/group"/>  -
-       -  <unit bldFile="app/contacts/phonebookengines/contactsmodel/group"/>  -
-       -  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/cntmatchlog/group"/>  -
-       -  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/fuzztest/group"/>  -
-       <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/cntperftest/groupsql"/>
-       <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/perffuncsuite/groupsql"/>
-       <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/tcntpolice/groupsql"/>
-       -  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/testcontactsuite/group"/>  -
-       <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/testimpexvcard/groupsql"/>
-       -  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/teststartup/group"/>  -
+       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/cntmatchlog/group"/>  -
+       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/group"/>  -
+       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/cntmatchlog/group"/>  -
+       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/fuzztest/group"/>  -
+       <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/cntperftest/groupsql"/>
+       <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/perffuncsuite/groupsql"/>
+       <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/tcntpolice/groupsql"/>
+       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/testcontactsuite/group"/>  -
+       <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/testimpexvcard/groupsql"/>
+       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/teststartup/group"/>  -
      </component>-->
      <component unofficial="yes" name="phonebookengines_build" long-name="Phonebook Engines Build" origin-model="foundation">
       <unit bldFile="/sf/app/contacts/phonebookengines/group"/>
@@ -83,24 +83,24 @@
 	</collection>
     <collection name="ccservices" long-name="CC Services" level="services">
      <component name="cmsservices" long-name="CMS Services" origin-model="foundation">
-      <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/client/group"/> -->
-      <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/server/group"/> -->
-      <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator/client/group"/> -->
-      <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator/server/group"/> -->
-      <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/client/group"/> -->
-      <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/server/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/client/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/server/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator/client/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator/server/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/client/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/server/group"/> -->
       <unit bldFile="/sf/app/contacts/ccservices/cmsservices/group"/>
      </component>
     </collection>
     <collection name="presencecache" long-name="Presence Cache" level="support">
      <component name="presencecacheutils" long-name="Presence Cache Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/contacts/presencecache/presencecacheutils/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/presencecache/presencecacheutils/group"/> -->
      </component>
      <component name="presencecacheserver2" long-name="Presence Cache Server2" origin-model="foundation">
-      <!-- <unit bldFile="app/contacts/presencecache/presencecacheserver2/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/presencecache/presencecacheserver2/group"/> -->
      </component>
      <component name="presencecacheclient2" long-name="Presence Cache Client2" origin-model="foundation">
-      <!-- <unit bldFile="app/contacts/presencecache/presencecacheclient2/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/presencecache/presencecacheclient2/group"/> -->
      </component>
      <component unofficial="yes" name="presencecache_build" long-name="Presence Cache Build" origin-model="foundation">
       <unit bldFile="/sf/app/contacts/presencecache/group"/>
@@ -131,27 +131,27 @@
       <unit bldFile="/sf/app/contacts/group"/>
      </component>
      <component unofficial="yes" name="contacts_plat" long-name="Contacts Apps Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="app/contacts/contacts_plat/cca_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/cca_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
       <unit bldFile="/sf/app/contacts/contacts_plat/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/presence_cache_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/presence_cache_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="contacts_pub" long-name="Contacts Apps Public Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/app/contacts/contacts_pub/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/> -->
      </component>
     <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
--- a/3k/app/contentcontrol/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/contentcontrol/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -54,7 +54,7 @@
       <unit bldFile="/sf/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="/sf/app/contentcontrol/omads/omadsextensions/dsutils/emailxmlutils/bld"/> -->
       <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
      </component>
     </collection>
--- a/3k/app/conversations/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/conversations/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -14,16 +14,16 @@
      </component>
      <component name="imconnectionprovider" long-name="IM Connection Provider" origin-model="foundation">
       <unit bldFile="/sf/app/conversations/imstutils/imconnectionprovider/group"/>
-      <!-- <unit bldFile="app/conversations/imstutils/imconnectionprovider/tsrc/imconnectionprovider_test/group"/> -->
+      <!-- <unit bldFile="/sf/app/conversations/imstutils/imconnectionprovider/tsrc/imconnectionprovider_test/group"/> -->
      </component>
      <component name="xmppadapter" long-name="XMPP Adapter" origin-model="foundation">
       <unit bldFile="/sf/app/conversations/imstutils/xmppadapter/group"/>
-      <!-- <unit bldFile="app/conversations/imstutils/xmppadapter/tsrc/xmppadapter_test/group"/> -->
+      <!-- <unit bldFile="/sf/app/conversations/imstutils/xmppadapter/tsrc/xmppadapter_test/group"/> -->
      </component>
      <component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/conversations/imstutils/group"/>
@@ -35,17 +35,17 @@
      </component>
      <component name="vimpststorage" long-name="VIMP ST Storage" origin-model="foundation">
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactlist_ut/group"/> -->
+      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group"/> -->
+      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group"/> -->
      </component>
      <component name="vimpstengine" long-name="VIMP ST Engine" origin-model="foundation">
       <unit bldFile="/sf/app/conversations/uiservicetab/vimpstengine/group"/>
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstengine/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpstengine/tsrc/group"/> -->
      </component>
      <component name="vimpstcmdprocess" long-name="VIMP ST Command Process" origin-model="foundation">
       <unit bldFile="/sf/app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-      <!-- <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpstcmdprocess/tsrc/group"/> -->
      </component>
      <component name="vimpstui" long-name="VIMP ST UI" origin-model="foundation">
       <unit bldFile="/sf/app/conversations/uiservicetab/vimpstui/group"/>
--- a/3k/app/devicecontrol/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/devicecontrol/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -35,21 +35,21 @@
     <collection name="omadm" long-name="OMA Device Management" level="oma">
      <component name="omadmappui" long-name="OMA DM App UI" origin-model="foundation">
       <unit bldFile="/sf/app/devicecontrol/omadm/omadmappui/group"/>
-      <!-- <unit bldFile="app/devicecontrol/omadm/omadmappui/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/devicecontrol/omadm/omadmextensions/adapters/email/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/mms/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/syncmldm/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/syncmldm12/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/syncmlds/tsrc/group"/> -->
       <unit bldFile="/sf/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="/sf/app/devicecontrol/pnpmobileservices/pnpms/group"/>
-      <!-- <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/devicecontrol/pnpmobileservices/pnpms/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
@@ -62,7 +62,7 @@
       <unit bldFile="/sf/app/devicecontrol/group"/>
      </component>
      <component unofficial="yes" name="customization_test" origin-model="foundation">
-      <!-- <unit bldFile="app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
+      <!-- <unit bldFile="/sf/app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
      </component>
      <component unofficial="yes" name="applicationmanagement_build" origin-model="foundation">
       <unit bldFile="/sf/app/devicecontrol/applicationmanagement/group"/>
@@ -71,7 +71,7 @@
       <unit bldFile="/sf/app/devicecontrol/customization/group"/>
      </component>
      <component unofficial="yes" name="applicationmanagement_test" origin-model="foundation">
-      <!-- <unit bldFile="app/devicecontrol/applicationmanagement/tsrc/tarmappmng/group"/> -->
+      <!-- <unit bldFile="/sf/app/devicecontrol/applicationmanagement/tsrc/tarmappmng/group"/> -->
      </component>
     </collection>
    </block>
--- a/3k/app/helps/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/helps/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,7 +5,7 @@
 <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"/> -->
+      <!-- <unit bldFile="/sf/app/helps/csxhelp/aiwhelpprovider/group"/> -->
      </component>
      <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build" origin-model="foundation">
       <unit bldFile="/sf/app/helps/csxhelp/group"/>
@@ -14,15 +14,15 @@
    <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"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
--- a/3k/app/homescreen/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/homescreen/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -11,15 +11,15 @@
       <unit bldFile="/sf/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="/sf/app/homescreen/idlehomescreen/activeidle3/data/group"/> -->
       <unit bldFile="/sf/app/homescreen/idlehomescreen/activeidle3/group"/>
-      <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/> -->
+      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/> -->
      </component>
      <component name="hsplugins" long-name="HS Plugins" origin-model="foundation">
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/qhd_tch/organizer_2001f481/group"/> -->
+      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001f48d/group"/> -->
+      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001fdba/group"/> -->
      </component>
     </collection>
     <collection name="menufw" long-name="Menu Framework" level="fw">
@@ -41,7 +41,7 @@
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/homescreen/homescreen_plat/group"/>
--- a/3k/app/im/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/im/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,44 +5,44 @@
 <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"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/utils/group"/> -->
      </component>
      <component name="datautils" long-name="Data Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/datautils/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/datautils/group"/> -->
      </component>
      <component name="impsengine_client" long-name="Client" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/client/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/client/group"/> -->
      </component>
      <component name="imapi" long-name="IM API" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/imapi/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/imapi/group"/> -->
      </component>
      <component name="imlauncher" long-name="IM Launcher" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/imlauncher/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/imlauncher/group"/> -->
      </component>
      <component name="impsdatachannel" long-name="Imps Data Channel" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/impsdatachannel/group"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/impsipcirwatcher/group"/> -->
      </component>
      <component name="messageencoder" long-name="Message Encoder" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/messageencoder/wbxml/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/messageencoder/wbxml/group"/> -->
      </component>
      <component name="engsrv" long-name="Eng Srv" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/engsrv/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/engsrv/group"/> -->
      </component>
      <component name="impswatcher" long-name="Imps Watcher" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/impswatcher/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/impswatcher/group"/> -->
      </component>
      <component name="wvotaparser" long-name="WV OTA Parser" origin-model="foundation">
-      <!-- <unit bldFile="app/im/impsengine/wvotaparser/group"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertimerprocess/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/advance/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertest/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/im/impsengine/group"/>
@@ -50,34 +50,34 @@
     </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"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/coreutilslib2/group"/> -->
      </component>
      <component name="storagemanager2" long-name="Storage Manager 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/storagemanager2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/storagemanager2/group"/> -->
      </component>
      <component name="pecparser2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/parser2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/parser2/group"/> -->
      </component>
      <component name="attributelibrary2" long-name="Attribute Library 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/attributelibrary2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/attributelibrary2/group"/> -->
      </component>
      <component name="listlibrary2" long-name="List Library 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/listlibrary2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/listlibrary2/group"/> -->
      </component>
      <component name="transferadapter2" long-name="Transfer Adapter 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/transferadapter2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/transferadapter2/group"/> -->
      </component>
      <component name="presenceserver2" long-name="Presence Server 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/presenceserver2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/presenceserver2/group"/> -->
      </component>
      <component name="presencemanager2" long-name="Presence Manager 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/presencemanager2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/presencemanager2/group"/> -->
      </component>
      <component name="janitorplugin2" long-name="Janitor Plugin 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/janitorplugin2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/janitorplugin2/group"/> -->
      </component>
      <component name="pluginserver2" long-name="Plugin Server 2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/pecengine/pluginserver2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/pecengine/pluginserver2/group"/> -->
      </component>
      <component unofficial="yes" name="pecengine_build" long-name="Presence Engine Build" origin-model="foundation">
       <unit bldFile="/sf/app/im/pecengine/group"/>
@@ -85,13 +85,13 @@
     </collection>
     <collection name="presadap12" long-name="Presence Adap 12" level="support">
      <component name="presparser2" origin-model="foundation">
-      <!-- <unit bldFile="app/im/presadap12/parser2/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/presadap12/parser2/group"/> -->
      </component>
      <component name="impsplugin" long-name="IMPS Plugin" origin-model="foundation">
-      <!-- <unit bldFile="app/im/presadap12/impsplugin/group"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/im/presadap12/group"/> -->
      </component>
     </collection>
     <collection name="wvsettings20" long-name="WV Settings 20" level="support">
@@ -101,52 +101,52 @@
     </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"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/imindicatorplugin/group"/> -->
      </component>
      <component name="impsconnectionui" long-name="IMPS Connection UI" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/impsconnectionui/group"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/impsalwaysonlineplugin/group"/> -->
      </component>
      <component name="wvvariant" long-name="Wvvariant" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvvariant/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvvariant/group"/> -->
      </component>
      <component name="wvuiada" long-name="Wvuiada" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuiada/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvuiada/group"/> -->
      </component>
      <component name="wvuistorage" long-name="WV UI Storage" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuistorage/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvuistorage/group"/> -->
      </component>
      <component name="wvuipresence" long-name="WV UI Presence" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuipresence/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvuipresence/group"/> -->
      </component>
      <component name="wvlogger" long-name="Wvlogger" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvlogger/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvlogger/group"/> -->
      </component>
      <component name="wvuieng" long-name="Wvuieng" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuieng/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvuieng/group"/> -->
      </component>
      <component name="imutils" long-name="Im Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/imutils/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/imutils/group"/> -->
      </component>
      <component name="wvuiprocess" long-name="WV UI Process" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuiprocess/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvuiprocess/group"/> -->
      </component>
      <component name="wvcommandutils" long-name="Wv Command Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvcommandutils/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvcommandutils/group"/> -->
      </component>
      <component name="wvaudiomanager" long-name="Wv Audio Manager" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvaudiomanager/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvaudiomanager/group"/> -->
      </component>
      <component name="wvuiave" long-name="Wvuiave" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/wvuiave/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/wvuiave/group"/> -->
      </component>
      <component name="wvimlauncher" long-name="IM Launcher" origin-model="foundation">
-      <!-- <unit bldFile="app/im/wvuing/imlauncher/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/wvuing/imlauncher/group"/> -->
      </component>
      <component unofficial="yes" name="wvuing_build" long-name="WV UI NG Build" origin-model="foundation">
       <unit bldFile="/sf/app/im/wvuing/group"/>
@@ -159,11 +159,11 @@
      </component>
      <component unofficial="yes" name="im_pub" long-name="Instant Messaging Apps Public Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/im/im_pub/im_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/im_pub/im_application_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/im_pub/im_application_launch_api/tsrc/imlaunchertest/group"/> -->
+      <!-- <unit bldFile="/sf/app/im/im_pub/im_application_launch_api/tsrc/imlaunchertestplugin/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/im/help/group"/>
--- a/3k/app/imgeditor/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/imgeditor/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -78,10 +78,10 @@
       <unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
      </component>
      <component name="jpegrotator" long-name="Jpeg Rotator" origin-model="foundation">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegrotator/group"/> -->
+      <!-- <unit bldFile="/sf/app/imgeditor/imageeditorengine/jpegrotator/group"/> -->
      </component>
      <component name="jpegscaler" long-name="Jpeg Scaler" origin-model="foundation">
-      <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegscaler/group"/> -->
+      <!-- <unit bldFile="/sf/app/imgeditor/imageeditorengine/jpegscaler/group"/> -->
      </component>
      <component unofficial="yes" name="imageeditorengine_build" long-name="Image Editor Engine Build" origin-model="foundation">
       <unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
--- a/3k/app/iptelephony/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/iptelephony/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -101,7 +101,7 @@
       <unit bldFile="/sf/app/iptelephony/callcontinuity/vcc/group"/>
      </component>
      <component name="settingsreader" long-name="Settings Reader" origin-model="foundation">
-      <!-- <unit bldFile="app/iptelephony/callcontinuity/settingsreader/group"/> -->
+      <!-- <unit bldFile="/sf/app/iptelephony/callcontinuity/settingsreader/group"/> -->
      </component>
      <component unofficial="yes" name="callcontinuity_build" long-name="Call Continuity Build" origin-model="foundation">
       <unit bldFile="/sf/app/iptelephony/callcontinuity/group"/>
--- a/3k/app/java/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/java/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -50,11 +50,11 @@
     <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"/>
+       <unit bldFile="/sf/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"/>
+       <unit bldFile="/sf/app/java/java_stubs/javaenvinfo/group"/>
      </component>-->
      <component name="javaregistry" long-name="Java Registry" origin-model="foundation">
       <unit bldFile="/sf/app/java/java_stubs/javaregistry/clientserver/client/group"/>
--- a/3k/app/location/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/location/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -87,14 +87,14 @@
       <unit bldFile="/sf/app/location/group"/>
      </component>
      <component unofficial="yes" name="location_test" long-name="Location Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="app/location/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/location/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="loc_pub" class="api" origin-model="foundation">
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
--- a/3k/app/messaging/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/messaging/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -27,12 +27,12 @@
      </component>
      <component name="smsui" long-name="SMS UI" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mobilemessaging/smsui/group"/>
-      <!-- <unit bldFile="app/messaging/mobilemessaging/smsui/viewer"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mobilemessaging/smsui/viewer"/> -->
      </component>
      <!--Component manually removed as already declared in OS-->
      <!--<component name="smsmtm">
-       <unit bldFile="app/messaging/mobilemessaging/smsmtm/multimode/group"/>
-       -  <unit bldFile="app/messaging/mobilemessaging/smsmtm/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/multimode/group"/>
+       -  <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/test/testrom"/>  -
      </component>-->
     <component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/multimode/Group" mrp="/sf/app/messaging/mobilemessaging/smsmtm/multimode/Group/messaging_sms_multimode.mrp"/>
@@ -40,44 +40,44 @@
     </collection>
     <collection name="mmsengine" long-name="MMS Engine" level="eng">
      <component name="mmsconninit" long-name="MMS Connection Init" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsconninit/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsconninit/bld"/> -->
      </component>
      <component name="genutils" long-name="General Utils" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/genutils/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/genutils/bld"/> -->
      </component>
      <component name="mmsserversettings" long-name="MMS Server Aettings" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsserversettings/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsserversettings/bld"/> -->
      </component>
      <component name="mmsmessage" long-name="MMS Message" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsmessage/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsmessage/bld"/> -->
      </component>
      <component name="mmshttptransport" long-name="MMS HTTP Transport" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmshttptransport/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmshttptransport/bld"/> -->
      </component>
      <component name="mmscodec" long-name="MMS Codec" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmscodec/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmscodec/bld"/> -->
      </component>
      <component name="mmsserver" long-name="MMS Server" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmsserver/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsserver/bld"/> -->
      </component>
      <component name="clientmtm" long-name="Client MTM" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/clientmtm/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/clientmtm/bld"/> -->
      </component>
      <component name="mmswatcher" long-name="MMS Watcher" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmswatcher/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmswatcher/bld"/> -->
      </component>
      <component name="mmspushhandler" long-name="MMS Push Handler" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmspushhandler/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmspushhandler/bld"/> -->
      </component>
      <component name="applicationadapter" long-name="Application Adapter" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/applicationadapter/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/applicationadapter/bld"/> -->
      </component>
      <component name="mmscodecclient" long-name="MMS Codec Client" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/mmsengine/mmscodecclient/bld"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmscodecclient/bld"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="mmssettings">
-       <unit bldFile="app/messaging/mmsengine/mmssettings/test/group"/>
+       <unit bldFile="/sf/app/messaging/mmsengine/mmssettings/test/group"/>
      </component>-->
      <component unofficial="yes" name="mmsengine_build" long-name="MMS Engine Build" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/mmsengine/group"/>
@@ -112,10 +112,10 @@
       <unit bldFile="/sf/app/messaging/messagingappbase/schemeplugin/group"/>
      </component>
      <component name="sendui" long-name="Send UI" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/messagingappbase/sendui/drmlinksender/group"/> -->
-      <!-- <unit bldFile="app/messaging/messagingappbase/sendui/genericmtmplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/drmlinksender/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/genericmtmplugin/group"/> -->
       <unit bldFile="/sf/app/messaging/messagingappbase/sendui/group"/>
-      <!-- <unit bldFile="app/messaging/messagingappbase/sendui/meetingrequestsender/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/meetingrequestsender/group"/> -->
      </component>
      <component name="smilengine" long-name="SMIL Engine" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/messagingappbase/smilengine/group"/>
@@ -131,25 +131,25 @@
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="smilparser">
-       <unit bldFile="app/messaging/messagingappbase/smilparser/rom"/>
-       <unit bldFile="app/messaging/messagingappbase/smilparser/smildtd/group"/>
-       <unit bldFile="app/messaging/messagingappbase/smilparser/xmldom/group"/>
-       <unit bldFile="app/messaging/messagingappbase/smilparser/xmlparser/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/rom"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/smildtd/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/xmldom/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/xmlparser/group"/>
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="obexmtms">
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/btmtm/btclient/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/btmtm/btserver/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/irmtm/irclient/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/irmtm/irserver/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexclient/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexserver/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexutil/group"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/rom"/>
-       <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/group"/>
-       -  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/bluetoothsdpstub/sdp"/>  -
-       -  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/irobexstub/group"/>  -
-       -  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/testutils/msgth/group"/>  -
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/btmtm/btclient/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/btmtm/btserver/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/irmtm/irclient/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/irmtm/irserver/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexclient/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexserver/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexutil/group"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/rom"/>
+       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/group"/>
+       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/bluetoothsdpstub/sdp"/>  -
+       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/irobexstub/group"/>  -
+       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/testutils/msgth/group"/>  -
      </component>-->
     <component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/GROUP" mrp="/sf/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
@@ -166,37 +166,37 @@
       <unit bldFile="/sf/app/messaging/email/emailnotificationhandler/group"/>
      </component>
      <component name="imum" long-name="IMUM" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/email/imum/domainapi/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/email/imum/domainapi/group"/> -->
       <unit bldFile="/sf/app/messaging/email/imum/group"/>
-      <!-- <unit bldFile="app/messaging/email/imum/mtms/group"/> -->
-      <!-- <unit bldFile="app/messaging/email/imum/utils/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/email/imum/mtms/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/email/imum/utils/group"/> -->
      </component>
      <component name="mail" long-name="Mail" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/email/mail/group"/>
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="pop3andsmtpmtm">
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/autosend/group"/>
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/clientmtms/group"/>
-       -  <unit bldFile="app/messaging/email/pop3andsmtpmtm/clientmtms/test/testrom"/>  -
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/popservermtm/group"/>
-       -  <unit bldFile="app/messaging/email/pop3andsmtpmtm/popservermtm/test/testrom"/>  -
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/servermtmutils/group"/>
-       -  <unit bldFile="app/messaging/email/pop3andsmtpmtm/servermtmutils/test/testrom"/>  -
-       <unit bldFile="app/messaging/email/pop3andsmtpmtm/smtpservermtm/group"/>
-       -  <unit bldFile="app/messaging/email/pop3andsmtpmtm/smtpservermtm/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/autosend/group"/>
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/clientmtms/group"/>
+       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/clientmtms/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/popservermtm/group"/>
+       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/popservermtm/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/servermtmutils/group"/>
+       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/servermtmutils/test/testrom"/>  -
+       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/smtpservermtm/group"/>
+       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/smtpservermtm/test/testrom"/>  -
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="imap4mtm">
-       <unit bldFile="app/messaging/email/imap4mtm/imapmailstore/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapofflinecontrol/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapprotocolcontroller/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapservermtm/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapsession/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapsettings/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imapsyncmanager/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imaptransporthandler/group"/>
-       <unit bldFile="app/messaging/email/imap4mtm/imaputils/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapmailstore/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapofflinecontrol/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapprotocolcontroller/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapservermtm/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsession/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsettings/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsyncmanager/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imaptransporthandler/group"/>
+       <unit bldFile="/sf/app/messaging/email/imap4mtm/imaputils/group"/>
      </component>-->
     <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/group" mrp="/sf/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
@@ -207,10 +207,10 @@
     </collection>
     <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
      <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="msg_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
       <unit bldFile="/sf/app/messaging/msg_plat/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/messaging_editor_api/tsrc/group"/>
@@ -219,15 +219,15 @@
       <unit bldFile="/sf/app/messaging/msg_plat/mms_codec_client_api/tsrc/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/mms_conformance_api/tsrc/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/mms_server_settings_api/tsrc/group"/>
-      <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
       <unit bldFile="/sf/app/messaging/msg_plat/smil_engine_api/tsrc/group"/>
       <unit bldFile="/sf/app/messaging/msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="msg_pub" class="api" origin-model="foundation">
       <unit bldFile="/sf/app/messaging/msg_pub/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
       <unit bldFile="/sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
       <unit bldFile="/sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build" origin-model="foundation">
--- a/3k/app/mmsharinguis/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/mmsharinguis/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,29 +6,29 @@
     <collection name="mmsharing" long-name="MM Sharing" level="base">
      <component name="mmshavailability" long-name="Multimedia Sharing Availability" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshavailability/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
      </component>
      <component name="mmshindicator" long-name="Multimedia Sharing Indicator" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshindicator/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
      </component>
      <component name="mmshmanagercli" long-name="Multimedia Sharing Manager Client" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
      </component>
      <component name="mmshmanagersrv" long-name="Multimedia Sharing Manager Server" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
      </component>
      <component name="mmshengine" long-name="Multimedia Sharing Engine" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshengine/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
      </component>
      <component name="mmshui" long-name="Multimedia Sharing UI" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
       <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshui/tsrc/ut_ui/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/mmsharinguis/mmsharing/group"/>
@@ -37,27 +37,27 @@
     <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="/sf/app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
      </component>
      <component name="mmshaiwplugin" long-name="Multimedia Sharing AIW Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
      </component>
      <component name="mmshsettingsuiplugin" long-name="Multimedia Sharing Settings UI Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
      </component>
      <component name="mmshwpadapterplugin" long-name="Multimedia Sharing WP Adapter Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
      </component>
      <component name="mmcctranscoder" long-name="MMCC Transcoder" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmcctranscoder/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
-      <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/mmsharinguis/mmshplugins/group"/>
@@ -65,29 +65,29 @@
     </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"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/scripts"/> -->
      </component>
      <component unofficial="yes" name="mceclientstub" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/mceclientstub/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/mceclientstub/group"/> -->
      </component>
      <component unofficial="yes" name="mmsharinguis_build" long-name="Multimedia Sharing UIs Build" origin-model="foundation">
       <unit bldFile="/sf/app/mmsharinguis/group"/>
      </component>
      <component unofficial="yes" name="musenginestub" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/musenginestub/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/musenginestub/group"/> -->
      </component>
      <component unofficial="yes" name="ututils" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/ututils/group"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/ututils/group"/> -->
      </component>
      <component unofficial="yes" name="cenrepeditor" origin-model="foundation">
-      <!-- <unit bldFile="app/mmsharinguis/tsrc/cenrepeditor/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/mmsharinguis/mmsharinguis_plat/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/mustestapp/group"/> -->
      </component>
     </collection>
    </block>
--- a/3k/app/musicplayer/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/musicplayer/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -75,7 +75,7 @@
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/musicplayer/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="musicplayer_build" long-name="Music Player Apps Build" origin-model="foundation">
       <unit bldFile="/sf/app/musicplayer/group"/>
--- a/3k/app/organizer/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/organizer/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -64,7 +64,7 @@
      </component>
      <component name="clockui" long-name="Clock UI" origin-model="foundation">
       <unit bldFile="/sf/app/organizer/clock2/clockui/group"/>
-      <!-- <unit bldFile="app/organizer/clock2/clockui/plugins/datetimeviewplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/organizer/clock2/clockui/plugins/datetimeviewplugin/group"/> -->
      </component>
      <component name="clock2_help" long-name="Help" origin-model="foundation">
       <unit bldFile="/sf/app/organizer/clock2/help/group"/>
@@ -96,7 +96,7 @@
      </component>
      <component name="notepad1" long-name="Notepad1" origin-model="foundation">
       <unit bldFile="/sf/app/organizer/notepad/notepad1/group"/>
-      <!-- <unit bldFile="app/organizer/notepad/notepad1/syncmladapter/group"/> -->
+      <!-- <unit bldFile="/sf/app/organizer/notepad/notepad1/syncmladapter/group"/> -->
      </component>
      <component name="txtrecog" long-name="Txt Recog" origin-model="foundation">
       <unit bldFile="/sf/app/organizer/notepad/txtrecog/group"/>
@@ -111,8 +111,8 @@
      </component>
      <component name="searchapp" long-name="Search App" origin-model="foundation">
       <unit bldFile="/sf/app/organizer/searchui/searchapp/group"/>
-      <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
-      <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/organizer/searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/organizer/searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
      </component>
      <component unofficial="yes" name="searchui_build" long-name="Search UI Build" origin-model="foundation">
       <unit bldFile="/sf/app/organizer/searchui/group"/>
@@ -202,25 +202,25 @@
      </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"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
       <unit bldFile="/sf/app/organizer/organizer_pub/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_pub/notepad_library_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/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="/sf/app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/organizer/organizer_plat/calendar_importer_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/organizer/organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
       <unit bldFile="/sf/app/organizer/organizer_plat/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
--- a/3k/app/phone/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/phone/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -9,8 +9,8 @@
      </component>
      <component name="phoneui" long-name="Phone UI" origin-model="foundation">
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/phone/phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group"/> -->
+      <!-- <unit bldFile="/sf/app/phone/phoneapp/phoneui/tsrc/public/basic/group"/> -->
      </component>
      <component name="phoneuicontrol" long-name="Phone UI Control" origin-model="foundation">
       <unit bldFile="/sf/app/phone/phoneapp/phoneuicontrol/group"/>
@@ -71,7 +71,7 @@
     <collection name="phoneuis" long-name="Phone UIs" level="ui">
      <component name="dialer" long-name="Dialer" origin-model="foundation">
       <unit bldFile="/sf/app/phone/phoneuis/dialer/group"/>
-      <!-- <unit bldFile="app/phone/phoneuis/dialer/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/app/phone/phoneuis/dialer/tsrc/public/basic/group"/> -->
      </component>
      <component name="bubblemanager" long-name="Bubble Manager" origin-model="foundation">
       <unit bldFile="/sf/app/phone/phoneuis/bubblemanager/group"/>
@@ -81,7 +81,7 @@
      </component>
      <component name="sfiutils" long-name="SFI Utils" origin-model="foundation">
       <unit bldFile="/sf/app/phone/phoneuis/sfiutils/group"/>
-      <!-- <unit bldFile="app/phone/phoneuis/sfiutils/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/app/phone/phoneuis/sfiutils/tsrc/public/basic/group"/> -->
      </component>
      <component name="ussd" long-name="USSD" origin-model="foundation">
       <unit bldFile="/sf/app/phone/phoneuis/ussd/group"/>
--- a/3k/app/photos/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/photos/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -8,7 +8,7 @@
       <unit bldFile="/sf/app/photos/photosgallery/help/group"/>
      </component>
      <component name="logging" long-name="Logging" origin-model="foundation">
-      <!-- <unit bldFile="app/photos/photosgallery/logging/app/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/logging/app/group"/> -->
       <unit bldFile="/sf/app/photos/photosgallery/logging/group"/>
      </component>
      <component name="photosgallery_common" long-name="Common" origin-model="foundation">
@@ -19,24 +19,24 @@
      </component>
      <component name="photoscollectionfw" long-name="Collection Framework" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/collectionframework/group"/>
-      <!-- <unit bldFile="app/photos/photosgallery/collectionframework/plugins/glxcollectionpluginalbums/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/collectionframework/plugins/glxcollectionpluginalbums/group"/> -->
      </component>
      <component name="photosviewfw" long-name="View Framework" origin-model="foundation">
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerbase/tsrc/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/t_glxupnprenderer/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_cglxaiwservicehandler/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_glxcommandhandlerback/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/tsrc/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut_commandhandlerdrm/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut_commandhandlermoreinfo/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut__commandhandlermarking/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commandhandlerbase/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/t_glxupnprenderer/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_cglxaiwservicehandler/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_glxcommandhandlerback/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut_commandhandlerdrm/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut_commandhandlermoreinfo/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut__commandhandlermarking/group"/> -->
       <unit bldFile="/sf/app/photos/photosgallery/viewframework/group"/>
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/plugins/metadataviewplugin/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/listview/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/metadataview/group"/> -->
-      <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/viewbase/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/plugins/metadataviewplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/views/listview/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/views/metadataview/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/views/viewbase/group"/> -->
      </component>
      <component name="controllers" long-name="Controllers" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/controllers/group"/>
@@ -45,7 +45,7 @@
       <unit bldFile="/sf/app/photos/photosgallery/gallery/group"/>
      </component>
      <component name="slideshow" long-name="Slideshow" origin-model="foundation">
-      <!-- <unit bldFile="app/photos/photosgallery/slideshow/engine/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photosgallery/slideshow/engine/tsrc/group"/> -->
       <unit bldFile="/sf/app/photos/photosgallery/slideshow/group"/>
      </component>
      <component name="contentharvesterplugin" long-name="Content Harvester Plugin" origin-model="foundation">
@@ -56,7 +56,7 @@
      </component>
      <!--Component manually removed as empty and name conflicts with another component-->
      <!--<component name="memoryplugin" long-name="Memory Plugin">
-       <unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
+       <unit bldFile="/sf/app/photos/photosgallery/memoryplugin/group"/>
      </component>-->
      <component unofficial="yes" name="photosicons" origin-model="foundation">
       <unit bldFile="/sf/app/photos/photosgallery/icons"/>
@@ -67,9 +67,9 @@
     </collection>
     <collection name="photos_info" long-name="Photos Info" level="app">
      <component unofficial="yes" name="photos_plat" long-name="Photos Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ui_metadatadialog/group"/> -->
-      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
-      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photos_plat/controllers_collection_api/tsrc/ui_metadatadialog/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
+      <!-- <unit bldFile="/sf/app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
       <unit bldFile="/sf/app/photos/photos_plat/group"/>
      </component>
      <component unofficial="yes" name="photos_build" long-name="Photos Build" origin-model="foundation">
--- a/3k/app/poc/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/poc/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,21 +5,21 @@
 <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"/> -->
+      <!-- <unit bldFile="/sf/app/poc/pocengine/sipclientresolver/group"/> -->
      </component>
      <component unofficial="yes" name="pocengine_build" long-name="PoC Engine Build" origin-model="foundation">
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/poc/pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/poc/pocui/pocuiintgr/pocuiecomplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/poc/pocui/pocuiintgr/pocuiintegrationservices/group"/> -->
      </component>
      <component name="pocui_app" long-name="Application" origin-model="foundation">
       <unit bldFile="/sf/app/poc/pocui/app/group"/>
--- a/3k/app/printing/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/printing/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -8,13 +8,13 @@
       <unit bldFile="/sf/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="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
+      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
+      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
+      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/upnpprotocolfw2/group"/> -->
+      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/xhtmlfilecomposer/group"/> -->
       <unit bldFile="/sf/app/printing/imageprint/imageprintengine/group"/>
-      <!-- <unit bldFile="app/printing/imageprint/imageprintengine/imageprintserver/group"/> -->
+      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/imageprintserver/group"/> -->
      </component>
      <component name="imageprintui" origin-model="foundation">
       <unit bldFile="/sf/app/printing/imageprint/imageprintui/group"/>
--- a/3k/app/profile/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/profile/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,14 +6,14 @@
     <collection name="profilesapplication" long-name="Profiles Application" level="app">
      <component name="profiles" long-name="Profiles" origin-model="foundation">
       <unit bldFile="/sf/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="/sf/app/profile/profilesapplication/profiles/gsprofilesplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/profile/profilesapplication/profiles/profileaiwprovider/group"/> -->
+      <!-- <unit bldFile="/sf/app/profile/profilesapplication/profiles/profileapp/group"/> -->
       <unit bldFile="/sf/app/profile/profilesapplication/profiles/profileapp/tsrc/public/basic/group"/>
-      <!-- <unit bldFile="app/profile/profilesapplication/profiles/profilesgstonesplugin/group"/> -->
+      <!-- <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/profile/profilesapplication/tsrc/public/basic/group"/> -->
      </component>
     </collection>
     <collection name="profile_info" long-name="Profile Info" level="app">
--- a/3k/app/screensaver/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/screensaver/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,7 +5,7 @@
 <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"/> -->
+      <!-- <unit bldFile="/sf/app/screensaver/scrsaver/scrsaverplugins/group"/> -->
      </component>
      <component name="screensaveraiwplugin" long-name="Screen Saver AIW Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/screensaver/scrsaver/screensaveraiwplugin/group"/>
--- a/3k/app/settingsuis/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/settingsuis/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -33,12 +33,12 @@
       <unit bldFile="/sf/app/settingsuis/group"/>
      </component>
      <component unofficial="yes" name="settingsuis_test" long-name="Settings UIs Test" origin-model="foundation">
-      <!-- <unit bldFile="app/settingsuis/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/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="/sf/app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
       <unit bldFile="/sf/app/settingsuis/devmngt_plat/group"/>
-      <!-- <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/tsrc/servicesdbapitest/group"/> -->
+      <!-- <unit bldFile="/sf/app/settingsuis/devmngt_plat/services_db_api/tsrc/servicesdbapitest/group"/> -->
      </component>
     </collection>
    </block>
--- a/3k/app/speechsrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/speechsrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -46,8 +46,8 @@
       <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/client/group"/>
       <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/server/group"/>
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/tsrc/testapplication/group"/> -->
+      <!-- <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/tsrc/texttospeech/group"/> -->
      </component>
      <component name="devasr" long-name="Audio Recording and Speech Recognition" origin-model="foundation">
       <unit bldFile="/sf/app/speechsrv/srsf/devasr/group"/>
@@ -63,7 +63,7 @@
      </component>
      <component name="nssvasapi" long-name="NSS VAS API" origin-model="foundation">
       <unit bldFile="/sf/app/speechsrv/srsf/nssvasapi/group"/>
-      <!-- <unit bldFile="app/speechsrv/srsf/nssvasapi/nssvasdb/nssvasdbeventnotifier/group"/> -->
+      <!-- <unit bldFile="/sf/app/speechsrv/srsf/nssvasapi/nssvasdb/nssvasdbeventnotifier/group"/> -->
      </component>
      <component name="nssvascontacthdlr" long-name="NSS VAS Contact Handler" origin-model="foundation">
       <unit bldFile="/sf/app/speechsrv/srsf/nssvascontacthdlr/group"/>
@@ -95,7 +95,7 @@
     </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"/> -->
+      <!-- <unit bldFile="/sf/app/speechsrv/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build" origin-model="foundation">
       <unit bldFile="/sf/app/speechsrv/group"/>
--- a/3k/app/videocenter/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/videocenter/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -11,7 +11,7 @@
       <unit bldFile="/sf/app/videocenter/mpxmyvideoscollection/group"/>
      </component>
      <component unofficial="yes" name="mpxmyvideoscollection_test" long-name="MPX My Videos Collection Test" origin-model="foundation">
-      <!-- <unit bldFile="app/videocenter/mpxmyvideoscollection/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/videocenter/mpxmyvideoscollection/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="nsmyvideosview" long-name="NS My Videos View" level="app">
@@ -22,10 +22,10 @@
       <unit bldFile="/sf/app/videocenter/nsmyvideosview/hgmyvideosplugin/group"/>
      </component>
      <component name="nsmyvideos" long-name="NS Myvideos" origin-model="foundation">
-      <!-- <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideos/group"/> -->
+      <!-- <unit bldFile="/sf/app/videocenter/nsmyvideosview/nsmyvideos/group"/> -->
      </component>
      <component name="nsmyvideosplugin" long-name="NS Myvideos Plugin" origin-model="foundation">
-      <!-- <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideosplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/videocenter/nsmyvideosview/nsmyvideosplugin/group"/> -->
      </component>
     </collection>
     <collection name="vccommon" long-name="Video Center Common" level="eng">
@@ -43,7 +43,7 @@
       <unit bldFile="/sf/app/videocenter/vccommon/help/group"/>
      </component>
      <component unofficial="yes" name="sis" origin-model="foundation">
-      <!-- <unit bldFile="app/videocenter/vccommon/sis"/> -->
+      <!-- <unit bldFile="/sf/app/videocenter/vccommon/sis"/> -->
      </component>
      <component unofficial="yes" name="vccommon_build" long-name="Video Center Common Build" origin-model="foundation">
       <unit bldFile="/sf/app/videocenter/vccommon/group"/>
@@ -111,9 +111,9 @@
      </component>
      <component name="vcnsvodui" long-name="VCNS VOD UI" origin-model="foundation">
       <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsvodui/plugins/hgvodplugin/group"/>
-      <!-- <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/plugins/vcnsvodplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsvodui/plugins/vcnsvodplugin/group"/> -->
       <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsvodui/views/hgvodui/group"/>
-      <!-- <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/views/vcnsvodui/group"/> -->
+      <!-- <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsvodui/views/vcnsvodui/group"/> -->
      </component>
      <component name="vcnslivetv" long-name="VCNS Live TV" origin-model="foundation">
       <unit bldFile="/sf/app/videocenter/vcnsuis/vcnslivetv/remindernotifier/group"/>
@@ -139,7 +139,7 @@
       <unit bldFile="/sf/app/videocenter/vcplayer/vcnsplayerview/group"/>
      </component>
      <component name="defaultview" long-name="Default View" origin-model="foundation">
-      <!-- <unit bldFile="app/videocenter/vcplayer/defaultview/group"/> -->
+      <!-- <unit bldFile="/sf/app/videocenter/vcplayer/defaultview/group"/> -->
      </component>
      <component unofficial="yes" name="vcplayer_build" long-name="Video Center Player Build" origin-model="foundation">
       <unit bldFile="/sf/app/videocenter/vcplayer/group"/>
--- a/3k/app/videoeditor/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/videoeditor/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -23,7 +23,7 @@
       <unit bldFile="/sf/app/videoeditor/videditor/manualvideoeditor/group"/>
      </component>
      <component name="trimformms" long-name="Trim For MMS" origin-model="foundation">
-      <!-- <unit bldFile="app/videoeditor/videditor/trimformms/group"/> -->
+      <!-- <unit bldFile="/sf/app/videoeditor/videditor/trimformms/group"/> -->
      </component>
      <component unofficial="yes" name="videditor_build" long-name="Video Editor Build" origin-model="foundation">
       <unit bldFile="/sf/app/videoeditor/videditor/group"/>
--- a/3k/app/videoplayer/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/videoplayer/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -28,7 +28,7 @@
       <unit bldFile="/sf/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"/> -->
+      <!-- <unit bldFile="/sf/app/videoplayer/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="videoplayer_build" long-name="Video Player Apps Build" origin-model="foundation">
       <unit bldFile="/sf/app/videoplayer/group"/>
--- a/3k/app/videotelephony/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/videotelephony/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -8,9 +8,9 @@
     </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="/sf/app/videotelephony/vtengines/videoteleng/callctrl/group"/> -->
       <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/group"/>
-      <!-- <unit bldFile="app/videotelephony/vtengines/videoteleng/logger/group"/> -->
+      <!-- <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/logger/group"/> -->
      </component>
      <component name="vtmediatorplugin" long-name="VT Mediator Plugin" origin-model="foundation">
       <unit bldFile="/sf/app/videotelephony/vtengines/vtmediatorplugin/group"/>
--- a/3k/app/voicerec/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/voicerec/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,7 +5,7 @@
 <block name="voicerec" long-name="Voice Recorder Apps" tech_domain="ma" level="apps" levels="empty 1">
     <collection name="voicerecorder" long-name="Voice Recorder" level="1">
      <component name="voicerecordergsplugin" long-name="GS Plugin" origin-model="foundation">
-      <!-- <unit bldFile="app/voicerec/voicerecorder/gsplugin/group"/> -->
+      <!-- <unit bldFile="/sf/app/voicerec/voicerecorder/gsplugin/group"/> -->
      </component>
      <component name="voicerecorder_help" long-name="Help" origin-model="foundation">
       <unit bldFile="/sf/app/voicerec/voicerecorder/help/group"/>
@@ -19,7 +19,7 @@
       <unit bldFile="/sf/app/voicerec/group"/>
      </component>
      <component unofficial="yes" name="voicerec_test" long-name="Voice Recorder Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="app/voicerec/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/app/voicerec/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/app/voicerec/voicerec_plat/group"/>
--- a/3k/app/webuis/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/app/webuis/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,7 +6,7 @@
     <collection name="browserui" long-name="Browser UI" level="app">
      <component name="browser" long-name="Browser" origin-model="foundation">
       <unit bldFile="/sf/app/webuis/browserui/browser/group"/>
-      <!-- <unit bldFile="app/webuis/browserui/browser/launcher2/group"/> -->
+      <!-- <unit bldFile="/sf/app/webuis/browserui/browser/launcher2/group"/> -->
      </component>
      <component name="operatormenu" long-name="Operator Menu" origin-model="foundation">
       <unit bldFile="/sf/app/webuis/browserui/operatormenu/group"/>
--- a/3k/mw/appinstall/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/appinstall/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -19,7 +19,7 @@
       <unit bldFile="/sf/mw/appinstall/ncdengine/engine/group"/>
      </component>
      <component name="debuglogger" long-name="Debug Logger" origin-model="foundation">
-      <!-- <unit bldFile="mw/appinstall/ncdengine/debuglogger/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appinstall/ncdengine/debuglogger/group"/> -->
      </component>
      <component unofficial="yes" name="ncdengine_build" long-name="NCD Engine Build" origin-model="foundation">
       <unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
@@ -44,14 +44,14 @@
     <collection name="appinstall_info" long-name="Application Installation Info" level="api">
      <component unofficial="yes" name="appinstall_pub" long-name="Application Installation Public Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/appinstall/appinstall_pub/group"/>
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
      </component>
      <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/appinstall/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appinstall/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="appinstall_plat" long-name="Application Installation Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
+      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
       <unit bldFile="/sf/mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
       <unit bldFile="/sf/mw/appinstall/appinstall_plat/group"/>
      </component>
@@ -77,14 +77,14 @@
     <collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
      <!--Component manually removed and merged to OS-->
      <!--<component name="swisistools">
-       -  <unit bldFile="mw/appinstall/secureswitools/swisistools/test/tinterpretsisinteg/tintsistef"/>  -
+       -  <unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/test/tinterpretsisinteg/tintsistef"/>  -
       </component>-->
     <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
      </component>
      <component name="n:swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/> -->
      </component>
      <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
--- a/3k/mw/appsupport/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/appsupport/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -9,7 +9,7 @@
      </component>
      <component name="oommonitor" long-name="OOM Monitor" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oommonitor/group"/>
-      <!-- <unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oommonitor/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="sysresmonitoring_build" long-name="System Resource Monitoring Build" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/sysresmonitoring/group"/>
@@ -18,9 +18,9 @@
     <collection name="gssettingsuis" long-name="GS Settings UIs" level="specific">
      <component name="gs" long-name="GS" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/gssettingsuis/gs/group"/>
-      <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/gsdiagnosticsplugin"/> -->
-      <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/gsprslnplugin"/> -->
-      <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/gssettingsuis/gs/gsdiagnosticsplugin"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/gssettingsuis/gs/gsprslnplugin"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/gssettingsuis/gs/tsrc/public/basic/group"/> -->
      </component>
     </collection>
     <collection name="profilesservices" long-name="Profiles Services" level="server">
@@ -39,7 +39,7 @@
       <unit bldFile="/sf/mw/appsupport/profilesservices/ringingtone3dplugin/group"/>
      </component>
      <component unofficial="yes" name="profilesservices_test" long-name="Profiles Services Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/appsupport/profilesservices/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/profilesservices/tsrc/public/basic/group"/> -->
      </component>
     </collection>
     <collection name="flashliteapi_3_1" long-name="Flashlite API 3.1" level="specific">
@@ -48,8 +48,8 @@
     <collection name="contextframework" long-name="Context Framework" level="framework">
      <component name="cfw" long-name="Context Framework" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
-      <!-- <unit bldFile="mw/appsupport/contextframework/cfw/tsrc/cfwtest/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/contextframework/cfw/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/contextframework/cfw/tsrc/cfwtest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/contextframework/cfw/tsrc/public/basic/group"/> -->
      </component>
      <component name="cfwplugins" long-name="Context Framework Plugins" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/contextframework/cfwplugins/group"/>
@@ -60,10 +60,10 @@
     </collection>
     <collection name="mediakeys" long-name="Media Keys" level="plugin">
      <component name="keypublisherplugin" long-name="Key Publisher Plugin" origin-model="foundation">
-      <!-- <unit bldFile="mw/appsupport/mediakeys/keypublisherplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/mediakeys/keypublisherplugin/group"/> -->
      </component>
      <component name="mmkeybearer" long-name="MM Key Bearer" origin-model="foundation">
-      <!-- <unit bldFile="mw/appsupport/mediakeys/mmkeybearer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/mediakeys/mmkeybearer/group"/> -->
      </component>
      <component unofficial="yes" name="mediakeys_build" long-name="Media Keys Build" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/mediakeys/group"/>
@@ -78,12 +78,12 @@
      </component>
      <component name="rfs" long-name="RFS" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/group"/>
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfs/plugins/gsrfsplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/plugins/gsrfsplugin/group"/> -->
      </component>
      <component name="rfsplugins" long-name="Rfs Plugins" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group"/> -->
      </component>
      <component name="sysap" long-name="Sys Ap" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sysap/group"/>
@@ -99,12 +99,12 @@
      </component>
      <component name="advancedtspcontroller" long-name="Advanced TSP Controller" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/tsrc/stub/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/tsrc/stub/group"/> -->
      </component>
      <component name="powersaveutilities" long-name="Power Save Utilities" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/tsrc/public/basic/group"/> -->
      </component>
      <component name="gsserverenginestub" long-name="GS Server Engine Stub" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
@@ -117,11 +117,11 @@
      </component>
      <component name="sensordatacompensatorplugin" long-name="Sensor Data Compensator Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group"/> -->
      </component>
      <component unofficial="yes" name="coreapplicationuis_test" long-name="Core Application UIs Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/appsupport/coreapplicationuis/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="coreapplicationuis_build" long-name="Core Application UIs Build" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/coreapplicationuis/group"/>
@@ -133,9 +133,9 @@
      </component>
      <component name="startup" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/startupservices/startup/group"/>
-      <!-- <unit bldFile="mw/appsupport/startupservices/startup/mediatorplugin/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/startupservices/startup/startupsyncplugin/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/startupservices/startup/systemerrorplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/startupservices/startup/mediatorplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/startupservices/startup/startupsyncplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/startupservices/startup/systemerrorplugin/group"/> -->
      </component>
      <component name="startupanimation" long-name="Startup Animation" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/startupservices/startupanimation/group"/>
@@ -252,17 +252,17 @@
     <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
      <component unofficial="yes" name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/appsupport_plat/group"/>
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/settings_framework_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="appsupport_pub" long-name="Generic Application Support Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
       <unit bldFile="/sf/mw/appsupport/appsupport_pub/group"/>
-      <!-- <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
-      <!-- <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
+      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/> -->
      </component>
      <component unofficial="yes" name="appsupport_build" long-name="Generic Application Support Build" origin-model="foundation">
       <unit bldFile="/sf/mw/appsupport/group"/>
--- a/3k/mw/camerasrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/camerasrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,14 +5,14 @@
 <block name="camerasrv" long-name="Camera Services" tech_domain="mm" level="specific" levels="plugin fw api">
     <collection name="camappengine" long-name="Camera App Engine" level="fw">
      <component name="stillconverter" long-name="Still Converter" origin-model="foundation">
-      <!-- <unit bldFile="mw/camerasrv/camappengine/stillconverter/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camappengine/stillconverter/group"/> -->
      </component>
      <component name="camappengine_engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/camerasrv/camappengine/engine/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camappengine/engine/group"/> -->
      </component>
      <component name="asynchfilesavequeue" long-name="Asynch File Save Queue" origin-model="foundation">
       <unit bldFile="/sf/mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camappengine/asynchfilesavequeue/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="camappengine_build" origin-model="foundation">
       <unit bldFile="/sf/mw/camerasrv/camappengine/build"/>
@@ -20,16 +20,16 @@
     </collection>
     <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
      <component name="mediarecorder" long-name="Media Recorder" origin-model="foundation">
-      <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/mediarecorder/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/mediarecorder/group"/> -->
      </component>
      <component name="filecomposer" long-name="File Composer" origin-model="foundation">
-      <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/filecomposer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/filecomposer/group"/> -->
      </component>
      <component name="camcordermmfplugin_controller" long-name="Controller" origin-model="foundation">
-      <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/controller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/controller/group"/> -->
      </component>
      <component unofficial="yes" name="camcordermmfplugin_test" long-name="Camcorder MMF Plugin Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="camcordermmfplugin_build" origin-model="foundation">
       <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/build"/>
@@ -38,16 +38,16 @@
     <collection name="configmanagers" long-name="Config Managers" level="api">
      <component name="imagingconfigmanager" long-name="Imaging Config Manager" origin-model="foundation">
       <unit bldFile="/sf/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-      <!-- <unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/configmanagers/imagingconfigmanager/tsrc/public/basic/group"/> -->
      </component>
     </collection>
     <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
      <component unofficial="yes" name="camerasrv_plat" long-name="Camera Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="camerasrv_build" long-name="Camera Services Build" origin-model="foundation">
       <unit bldFile="/sf/mw/camerasrv/group"/>
--- a/3k/mw/classicui/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/classicui/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,14 +5,14 @@
 <block name="classicui" long-name="Classic UI" tech_domain="ui" level="generic" levels="base support server generic specific">
     <collection name="psln" long-name="Personalization" level="specific">
      <component name="pslnengine" long-name="Personalization Engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/classicui/psln/pslnengine/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/psln/pslnengine/group"/> -->
      </component>
      <component name="pslnframework" long-name="Personalization Framework" origin-model="foundation">
-      <!-- <unit bldFile="mw/classicui/psln/pslnframework"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/psln/pslnframework"/> -->
      </component>
      <component name="pslnlibraryloaders" long-name="Personalization Library Loaders" origin-model="foundation"/>
      <component name="pslnslidesetdialog" long-name="Personalization Slideset Dialog" origin-model="foundation">
-      <!-- <unit bldFile="mw/classicui/psln/pslnslidesetdialog/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/psln/pslnslidesetdialog/group"/> -->
      </component>
      <component name="pslngsplugin" long-name="Personalizaion GS Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/classicui/psln/pslngsplugin/group"/>
@@ -35,7 +35,7 @@
      </component>
      <component name="commondialogs" long-name="Common Dialogs" origin-model="foundation">
       <unit bldFile="/sf/mw/classicui/commonuis/commondialogs/group"/>
-      <!-- <unit bldFile="mw/classicui/commonuis/commondialogs/group_test"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/commonuis/commondialogs/group_test"/> -->
      </component>
     </collection>
     <collection name="uifw" long-name="UI Framework" level="server">
@@ -46,13 +46,13 @@
       <unit bldFile="/sf/mw/classicui/uifw/eikctl/group"/>
      </component>
      <component name="avkon" long-name="AvKon" origin-model="foundation">
-      <!-- <unit bldFile="mw/classicui/uifw/avkon/aknhlist/group"/> -->
-      <!-- <unit bldFile="mw/classicui/uifw/avkon/aknkeyrotator/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/uifw/avkon/aknhlist/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/uifw/avkon/aknkeyrotator/group"/> -->
       <unit bldFile="/sf/mw/classicui/uifw/avkon/aknphysics/group"/>
       <unit bldFile="/sf/mw/classicui/uifw/avkon/group"/>
       <unit bldFile="/sf/mw/classicui/uifw/avkon/odeconf/group"/>
-      <!-- <unit bldFile="mw/classicui/uifw/avkon/prebuilder"/> -->
-      <!-- <unit bldFile="mw/classicui/uifw/avkon/tsrc/bc/s60_sdkmcl/bctestmixmcl/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/uifw/avkon/prebuilder"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/uifw/avkon/tsrc/bc/s60_sdkmcl/bctestmixmcl/group"/> -->
      </component>
      <component name="eikstd" long-name="EikStd" origin-model="foundation">
       <unit bldFile="/sf/mw/classicui/uifw/eikstd/group"/>
@@ -64,7 +64,7 @@
       <unit bldFile="/sf/mw/classicui/uifw/ganes/group"/>
      </component>
      <component unofficial="yes" name="uifw_test" long-name="UI Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/classicui/uifw/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/uifw/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="commonadapter" long-name="Common Adapter" level="support">
@@ -173,13 +173,13 @@
       <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group"/>
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/group"/> -->
       <unit bldFile="/sf/mw/classicui/classicui_pub/uikon_core_controls/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group"/>
@@ -194,7 +194,7 @@
       <unit bldFile="/sf/mw/classicui/classicui_plat/application_switching_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
-      <!-- <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
@@ -213,7 +213,7 @@
       <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group"/>
-      <!-- <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/classicui/classicui_plat/extended_sounds_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group"/>
       <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group"/>
--- a/3k/mw/drm/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/drm/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -24,21 +24,21 @@
     </collection>
     <collection name="omadrm" long-name="OMA DRM" level="server">
      <component name="drmroapwbxmlparser" long-name="DRM ROAP WBXML Parser" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/omadrm/drmroapwbxmlparser/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmroapwbxmlparser/group"/> -->
      </component>
      <component name="drmplugins" long-name="DRM Plugins" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmfilter/group"/> -->
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmrecognizer/group"/> -->
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmrohandler/group"/> -->
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmromtm/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmplugins/drmfilter/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmplugins/drmrecognizer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmplugins/drmrohandler/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmplugins/drmromtm/group"/> -->
      </component>
      <component name="drmengine" long-name="DRM Engine" origin-model="foundation"/>
      <component name="drmhelper" long-name="DRM Helper" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/omadrm/drmhelper/drmhelperserver/group"/> -->
-      <!-- <unit bldFile="mw/drm/omadrm/drmhelper/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmhelper/drmhelperserver/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmhelper/group"/> -->
      </component>
      <component name="drmlicensemanager" long-name="Drm License Manager" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/omadrm/drmlicensemanager/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmlicensemanager/group"/> -->
      </component>
      <component unofficial="yes" name="omadrm_build" long-name="OMA DRM Build" origin-model="foundation">
       <unit bldFile="/sf/mw/drm/omadrm/group"/>
@@ -46,23 +46,23 @@
     </collection>
     <collection name="wmdrm" long-name="WM DRM" level="framework">
      <component name="wmdrmengine" long-name="WM DRM Engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmagent/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/client/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmagent/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmserver/client/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
      </component>
      <component name="camese" long-name="Camese" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/cameseutility/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/httpfiltercamese/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdla/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlaapp/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdladefaulthttpplugin/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdladefaultuiplugin/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlautils/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlawrapper/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/cameseutility/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/httpfiltercamese/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdla/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdlaapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdladefaulthttpplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdladefaultuiplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdlautils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdlawrapper/group"/> -->
      </component>
      <component name="wmdrmplugins" long-name="WM DRM Plugins" origin-model="foundation"/>
      <component unofficial="yes" name="wmdrm_build" long-name="WM DRM Build" origin-model="foundation">
@@ -71,16 +71,16 @@
     </collection>
     <collection name="drm_info" long-name="DRM Info" level="specific">
      <component unofficial="yes" name="drm_pub" long-name="DRM Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/drm/drm_pub/group"/>
-      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
      </component>
      <component unofficial="yes" name="drm_plat" long-name="DRM Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/drm/drm_plat/group"/>
-      <!-- <unit bldFile="mw/drm/drm_plat/roap_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/drm/drm_plat/roap_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="drm_build" long-name="DRM Build" origin-model="foundation">
       <unit bldFile="/sf/mw/drm/group"/>
--- a/3k/mw/homescreensrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/homescreensrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -60,7 +60,7 @@
     <collection name="idlefw" long-name="Idle Framework" level="framework">
      <component name="idlefw_plugins" long-name="Plugins" origin-model="foundation">
       <unit bldFile="/sf/mw/homescreensrv/idlefw/plugins/group"/>
-      <!-- <unit bldFile="mw/homescreensrv/idlefw/plugins/pslnactiveidleplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/homescreensrv/idlefw/plugins/pslnactiveidleplugin/group"/> -->
      </component>
      <component unofficial="yes" name="idlefw_build" long-name="Idle Framework Build" origin-model="foundation">
       <unit bldFile="/sf/mw/homescreensrv/idlefw/group"/>
@@ -76,12 +76,12 @@
     </collection>
     <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
      <component unofficial="yes" name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/group"/>
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
--- a/3k/mw/imghandling/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/imghandling/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,7 +6,7 @@
     <collection name="3gplibrary" long-name="3GP Library" level="server">
      <component name="3gpmp4lib" long-name="3GP MP4 Library" origin-model="foundation">
       <unit bldFile="/sf/mw/imghandling/3gplibrary/3gpmp4lib/group"/>
-      <!-- <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imghandling/3gplibrary/3gpmp4lib/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="3gplibrary_build" long-name="3GP Library Build" origin-model="foundation">
       <unit bldFile="/sf/mw/imghandling/3gplibrary/group"/>
@@ -33,9 +33,9 @@
     </collection>
     <collection name="imghandling_info" long-name="Image Handling Info" level="specific">
      <component unofficial="yes" name="imagehandling_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/imghandling/imagehandling_plat/group"/>
-      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build" origin-model="foundation">
       <unit bldFile="/sf/mw/imghandling/group"/>
--- a/3k/mw/imsrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/imsrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,34 +6,34 @@
     <collection name="imservices" long-name="IM Services" level="generic">
      <component name="imfeatureplugin" long-name="IM Feature Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimdatamodel/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimfrontend/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimoperations/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimprocessor/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimdatamodel/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimfrontend/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimoperations/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimprocessor/group"/> -->
      </component>
      <component name="searchfeatureplugin" long-name="Search Feature Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
      </component>
      <component name="xmppsettingsapi" long-name="XMPP Setting Sapi" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsapi/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsapi/tsrc/group"/> -->
      </component>
      <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
      </component>
      <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
       <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
      </component>
      <component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/instantmessagingcache/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="imservices_build" long-name="IM Services Build" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/imservices/group"/>
@@ -41,30 +41,30 @@
     </collection>
     <collection name="ximpfw" long-name="XIMP Framework" level="framework">
      <component name="ximpfw_core" long-name="Core" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/ximpfw/core/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/core/group"/> -->
      </component>
      <component name="presence" long-name="Presence" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/ximpfw/presence/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/presence/group"/> -->
      </component>
      <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_utils"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegrouplistmngt"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_utils"/> -->
      </component>
      <component unofficial="yes" name="ximpfw_build" long-name="XIMP Framework Build" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/ximpfw/group"/>
@@ -72,7 +72,7 @@
     </collection>
     <collection name="brandingserver" long-name="Branding Server" level="specific">
      <component name="tools" long-name="Tools" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/brandingserver/tools/bsimport/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/brandingserver/tools/bsimport/group"/> -->
      </component>
      <component unofficial="yes" name="brandingserver_build" long-name="Branding Server Build" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/brandingserver/group"/>
@@ -81,26 +81,26 @@
     <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
      <component unofficial="yes" name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/imsrv_plat/group"/>
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
+      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build" origin-model="foundation">
       <unit bldFile="/sf/mw/imsrv/group"/>
--- a/3k/mw/inputmethods/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/inputmethods/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -12,8 +12,8 @@
      </component>
      <component name="peninputarc" long-name="Pen Input Arc" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/group"/>
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/src/peninputserverapp"/> -->
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/utils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/src/peninputserverapp"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/utils/group"/> -->
      </component>
      <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonctrls/group"/>
@@ -62,16 +62,16 @@
     <collection name="fep" long-name="FEP" level="engine">
      <component name="aknfep" long-name="AKN FEP" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/fep/aknfep/group"/>
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugincn/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginitut/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginjp/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/avkonimpl/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugincn/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginitut/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginjp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/avkonimpl/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/group"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="frontendprocessor">
-       <unit bldFile="mw/inputmethods/fep/frontendprocessor/test/group"/>
+       <unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/test/group"/>
      </component>-->
     <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/group" mrp="/sf/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
@@ -79,20 +79,20 @@
     </collection>
     <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
      <component unofficial="yes" name="inputmethods_plat" long-name="Input Methods Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/group"/>
      </component>
      <component unofficial="yes" name="inputmethods_pub" long-name="Input Methods Public Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
      </component>
     <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
--- a/3k/mw/ipappprotocols/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/ipappprotocols/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,11 +6,11 @@
     <collection name="rtp" long-name="RTP" level="server">
      <component name="srtpstack" long-name="SRTP Stack" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappprotocols/rtp/srtpstack/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappprotocols/rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
      </component>
      <component name="rtpstack" long-name="RTP Stack" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappprotocols/rtp/rtpstack/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappprotocols/rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
      </component>
     </collection>
     <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
@@ -19,18 +19,18 @@
      </component>
      <component name="sippsipsettingsui" long-name="SIP Settings UI" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
      </component>
      <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
      </component>
      <component name="sippsystemstatemonitor" long-name="SIP System State Monitor" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
      </component>
      <component name="sippsipadapter" long-name="SIP Adapter" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group"/> -->
      </component>
     </collection>
     <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
--- a/3k/mw/ipappsrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/ipappsrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,201 +5,201 @@
 <block name="ipappsrv" long-name="IP App Services" tech_domain="vc" level="specific" levels="framework  generic server  conn plugin">
     <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
      <component name="mmccinterface" long-name="MMCC Interface" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/tsrc/ut_interface/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccinterface/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccinterface/tsrc/ut_interface/group"/> -->
      </component>
      <component name="mmccjitterbuffer" long-name="Jitter Buffer" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/tsrc/ut_jitterbuffer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/tsrc/ut_jitterbuffer/group"/> -->
      </component>
      <component name="mmccqoscontroller" long-name="QoS Controller" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/tsrc/ut_qoscontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/tsrc/ut_qoscontroller/group"/> -->
      </component>
      <component name="mmccmultiplexer" long-name="MMCC Multiplexer" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/tsrc/ut_multiplexer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/tsrc/ut_multiplexer/group"/> -->
      </component>
      <component name="mmccsubcontroller" long-name="MMCC Subcontroller" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_rtpmediaclock/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_rtpmediaclock/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/group"/> -->
      </component>
      <component name="mmcccontroller" long-name="MMCC Controller" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/tsrc/ut_controller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmcccontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmcccontroller/tsrc/ut_controller/group"/> -->
      </component>
      <component name="mmccredpayloadformat" long-name="RED Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/tsrc/ut_redpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/tsrc/ut_redpayloadformat/group"/> -->
      </component>
      <component name="mmccamrpayloadformat" long-name="AMR Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/tsrc/ut_amrpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/tsrc/ut_amrpayloadformat/group"/> -->
      </component>
      <component name="mmccg711payloadformat" long-name="G711 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/tsrc/ut_g711payloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/tsrc/ut_g711payloadformat/group"/> -->
      </component>
      <component name="mmccg729payloadformat" long-name="G729 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/tsrc/ut_g729payloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/tsrc/ut_g729payloadformat/group"/> -->
      </component>
      <component name="mmccilbcpayloadformat" long-name="ILBC Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/tsrc/ut_ilbcpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/tsrc/ut_ilbcpayloadformat/group"/> -->
      </component>
      <component name="mmccdtmfpayloadformat" long-name="DTMF Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/tsrc/ut_dtmfpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/tsrc/ut_dtmfpayloadformat/group"/> -->
      </component>
      <component name="mmccrtpsourcesink" long-name="RTP Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/group"/> -->
      </component>
      <component name="mmccvideosourcesink" long-name="Video Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/tsrc/ut_videosourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/tsrc/ut_videosourcesink/group"/> -->
      </component>
      <component name="mmcch263payloadformat" long-name="H263 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/tsrc/ut_h263payloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/tsrc/ut_h263payloadformat/group"/> -->
      </component>
      <component name="mmccanypayloadformat" long-name="ANY Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/tsrc/ut_anypayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/tsrc/ut_anypayloadformat/group"/> -->
      </component>
      <component name="mmccfilesourcesink" long-name="MMCC File Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/tsrc/ut_filesourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/tsrc/ut_filesourcesink/group"/> -->
      </component>
      <component name="mmccanysourcesink" long-name="Anysource Sink" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/tsrc/ut_anysourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/tsrc/ut_anysourcesink/group"/> -->
      </component>
      <component name="mmccavcpayloadformat" long-name="AVC Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/tsrc/ut_avcpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/tsrc/ut_avcpayloadformat/group"/> -->
      </component>
      <component unofficial="yes" name="multimediacommscontroller_build" long-name="Multimedia Comms Controller Build" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/group"/>
      </component>
      <component unofficial="yes" name="multimediacommscontroller_test" long-name="Multimedia Comms Controller Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/dptests/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/clienttests/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/componenttests/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/subcontrollerstub/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/jitterbuffertestconsole/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/rtpsourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpconsole/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/dptests/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/clienttests/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/componenttests/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/subcontrollerstub/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/jitterbuffertestconsole/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/rtpsourcesink/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpconsole/group"/> -->
      </component>
     </collection>
     <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
      <component name="mmcecli" long-name="MMCE Client" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcecli/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcecli/group"/> -->
      </component>
      <component name="mmcefloorctrlengine" long-name="MMCE Foor Control Engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin2/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin2/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/group"/> -->
      </component>
      <component name="mmcefloorctrlplugin" long-name="MMCE Foor Control Plugin" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/tsrc/ut_floorctrlplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/tsrc/ut_floorctrlplugin/group"/> -->
      </component>
      <component name="mmcesrv" long-name="MMCE Server" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/sip_stub/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmcemediamanager/tsrc/ut_mediamanager/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/sip_stub/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/mmcemediamanager/tsrc/ut_mediamanager/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/group"/> -->
      </component>
      <component unofficial="yes" name="multimediacommsengine_build" long-name="Multimedia Comms Engine Build" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/group"/>
      </component>
      <component unofficial="yes" name="multimediacommsengine_test" long-name="Multimedia Comms Engine Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
      </component>
     </collection>
     <collection name="natfw" long-name="NAT Framework" level="framework">
      <component name="natfwsettings" long-name="NAT Framework Settings" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwsettings/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group"/> -->
      </component>
      <component name="natfwconnectionmultiplexer" long-name="NAT Framework Connection Multiplexer" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/muxtestconsole/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwconnectionmultiplexer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/muxtestconsole/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group"/> -->
      </component>
      <component name="natfwclient" long-name="NAT Framework Client" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/tsrc/ut_natfwclient/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwclient/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwclient/tsrc/ut_natfwclient/group"/> -->
      </component>
      <component name="natfwsocketmediaconnwrapper" long-name="Socket Media Connection Wrapper" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group"/> -->
      </component>
      <component name="natfwunsaf_protocols" long-name="NAT Framework Unsaf Protocols" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwunsaf_protocols/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group"/> -->
      </component>
      <component name="natfwstunturnclient" long-name="NAT Framework Stun Turn Client" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunturnclient/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group"/> -->
      </component>
      <component name="natfwstunserver" long-name="NAT Framework Stun Server" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunserver/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group"/> -->
      </component>
      <component name="natfwicecandidatehandler" long-name="NAT Framework Ice Candidate Handler" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwicecandidatehandler/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group"/> -->
      </component>
      <component name="natfwstunplugin" long-name="NAT Framework STUN Plugin" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group"/> -->
      </component>
      <component name="natfwturnplugin" long-name="NAT Framework TURN Plugin" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwturnplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group"/> -->
      </component>
      <component unofficial="yes" name="natfw_build" long-name="NAT Framework Build" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappsrv/natfw/group"/>
      </component>
      <component unofficial="yes" name="natfw_test" long-name="NAT Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/tsrc/natfwtestconsoles/natfwtestconsole/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/tsrc/natfwtestconsoles/natfwtestconsole/group"/> -->
      </component>
     </collection>
     <collection name="natplugins" long-name="NAT Plugins" level="plugin">
      <component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/tsrc/t_natfwtraversaladapter/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/tsrc/t_natfwtraversaladapter/group"/> -->
      </component>
      <component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/tsrc/ut_cnsmldmnatfwtraversaladapter/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/tsrc/ut_cnsmldmnatfwtraversaladapter/group"/> -->
      </component>
      <component name="natptraversalcontroller" long-name="NAT Traversal Controller" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/tsrc/ut_nattraversalcontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natptraversalcontroller/tsrc/ut_nattraversalcontroller/group"/> -->
      </component>
      <component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider" origin-model="foundation">
       <unit bldFile="/sf/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/testconsole/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/ut_natfwsdpprovider/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/testconsole/group"/> -->
+      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/ut_natfwsdpprovider/group"/> -->
      </component>
     </collection>
     <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
--- a/3k/mw/legacypresence/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/legacypresence/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,13 +5,13 @@
 <block name="legacypresence" long-name="Legacy Presence Services" tech_domain="pr" level="specific" levels="engine fw ui">
     <collection name="xdmengine" long-name="XDM Engine" level="engine">
      <component name="xdmsettingsapi" long-name="XDM Settings Api" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmsettingsapi/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmengine/xdmsettingsapi/group"/> -->
      </component>
      <component name="xdmprovisioning" long-name="XDM Provisioning" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmprovisioning/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmengine/xdmprovisioning/group"/> -->
      </component>
      <component name="xdmdevicemanagement" long-name="XDM Device Management" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmdevicemanagement/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmengine/xdmdevicemanagement/group"/> -->
      </component>
      <component name="xdmengine_build" long-name="XDM Engine" origin-model="foundation">
       <unit bldFile="/sf/mw/legacypresence/xdmengine/group"/>
@@ -45,25 +45,25 @@
     </collection>
     <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
      <component name="presencesettingsapi" long-name="Presence Settings API" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presencesettingsapi/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/presencesettingsapi/group"/> -->
      </component>
      <component name="siputils" long-name="SIP Utils" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/siputils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/siputils/group"/> -->
      </component>
      <component name="xmlutils" long-name="XML Utils" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/xmlutils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/xmlutils/group"/> -->
      </component>
      <component name="simpleengine_engine" long-name="Engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/engine/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/engine/group"/> -->
      </component>
      <component name="xdmrlspres" long-name="XDM Rlspres" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/xdmrlspres/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/xdmrlspres/group"/> -->
      </component>
      <component name="presencedm" long-name="Presence DM" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presencedm/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/presencedm/group"/> -->
      </component>
      <component name="presenceprovisioning" long-name="Presence Provisioning" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presenceprovisioning/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/presenceprovisioning/group"/> -->
      </component>
      <component unofficial="yes" name="simpleengine_build" long-name="SIMPLE Engine Build" origin-model="foundation">
       <unit bldFile="/sf/mw/legacypresence/simpleengine/group"/>
@@ -71,20 +71,20 @@
     </collection>
     <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
      <component name="xdmxmlparser" long-name="XDM XML Parser" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xdmxmlparser/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xdmxmlparser/group"/> -->
      </component>
      <component name="xcapprotocol" long-name="Xcap Protocol" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/server/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaphttptransport/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaputils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/server/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcaphttptransport/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcaputils/group"/> -->
      </component>
      <component name="localprotocol" long-name="Local Protocol" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/localoperations/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/localprotocol/group"/> -->
+      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/localprotocol/localoperations/group"/> -->
      </component>
      <component unofficial="yes" name="xdmprotocols_build" long-name="XDM Protocols Build" origin-model="foundation">
       <unit bldFile="/sf/mw/legacypresence/xdmprotocols/group"/>
--- a/3k/mw/locationsrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/locationsrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -76,26 +76,26 @@
       <unit bldFile="/sf/mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
      </component>
      <component unofficial="yes" name="locationtriggering_test" long-name="Location Triggering Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreatetest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreatetest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/createtest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
      </component>
      <component unofficial="yes" name="locationtriggering_build" long-name="Location Triggering Build" origin-model="foundation">
       <unit bldFile="/sf/mw/locationsrv/locationtriggering/group"/>
@@ -103,45 +103,45 @@
     </collection>
     <collection name="locationsrv_info" long-name="Location Services Info" level="interface">
      <component unofficial="yes" name="locsrv_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
       <unit bldFile="/sf/mw/locationsrv/locsrv_plat/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="genericpositioningplugins" origin-model="foundation">
       <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/group"/>
      </component>
      <component unofficial="yes" name="locationsrv_test" long-name="Location Services Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/locationsrv/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="locationsrv_build" long-name="Location Services Build" origin-model="foundation">
       <unit bldFile="/sf/mw/locationsrv/group"/>
      </component>
      <component unofficial="yes" name="locsrv_pub" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
       <unit bldFile="/sf/mw/locationsrv/locsrv_pub/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
+      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
--- a/3k/mw/mds/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/mds/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -30,7 +30,7 @@
       <unit bldFile="/sf/mw/mds/harvester/composerplugins/group"/>
      </component>
      <component name="harvesterplugins" long-name="Harvester Plugins" origin-model="foundation">
-      <!-- <unit bldFile="mw/mds/harvester/harvesterplugins/audioplaylistplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/harvester/harvesterplugins/audioplaylistplugin/group"/> -->
       <unit bldFile="/sf/mw/mds/harvester/harvesterplugins/group"/>
      </component>
      <component name="monitorplugins" long-name="Monitor Plugins" origin-model="foundation">
@@ -81,7 +81,7 @@
     </collection>
     <collection name="iadstoprestart" long-name="IAD Stop Restart" level="server">
      <component unofficial="yes" name="iadstoprestart_build" long-name="IAD Stop Restart Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/mds/iadstoprestart/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/iadstoprestart/group"/> -->
      </component>
     </collection>
     <collection name="mds_info" long-name="Metadata Services Info" level="int">
@@ -89,17 +89,17 @@
       <unit bldFile="/sf/mw/mds/mds_pub/group"/>
      </component>
      <component unofficial="yes" name="mds_plat" long-name="Metadata Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/mds/mds_plat/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="mds_build" long-name="Metadata Services Build" origin-model="foundation">
       <unit bldFile="/sf/mw/mds/group"/>
--- a/3k/mw/messagingmw/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/messagingmw/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -10,104 +10,104 @@
     </collection>
     <collection name="messagingfw" long-name="Messaging FW" level="fw">
      <component name="alwaysonline" long-name="Always Online" origin-model="foundation">
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
       <unit bldFile="/sf/mw/messagingmw/messagingfw/alwaysonline/group"/>
      </component>
      <component name="msgcommonutils" long-name="Messaging Common Utils" origin-model="foundation">
       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgcommonutils/group"/>
      </component>
      <component name="senduiservices" long-name="Send UI Services" origin-model="foundation">
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/datautils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/datautils/group"/> -->
       <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/group"/>
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/launcher/group"/> -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/serviceresolver/group"/> -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/watcher/group"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/launcher/group"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/serviceresolver/group"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/watcher/group"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="scheduledsendmtm">
-       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendexe/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendmtm/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/test/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendexe/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendmtm/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/test/group"/>
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="msgsrvnstore">
-       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/group"/>
-       -  <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/test/group"/>  -
-       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/group"/>
-       -  <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/test/testrom"/>  -
-       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/serverexe/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/group"/>
+       -  <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/test/group"/>  -
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/server/group"/>
+       -  <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/server/test/testrom"/>  -
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/serverexe/group"/>
      </component>-->
      <!--Component manually removed as empty and name conflicts with an OS component-->
      <!--<component name="biomsgfw">
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bdb"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bifu"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bioc"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bios"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biowatchers"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bits"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biut"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/cbcp"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/enp"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/gfp"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/iacp"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/rom"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/t_biomsg/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/wapp"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bdb"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bifu"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bioc"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bios"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/biowatchers"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bits"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/biut"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/cbcp"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/enp"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/gfp"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/iacp"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/rom"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/t_biomsg/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/wapp"/>
      </component>-->
      <!--Component manually removed as empty and name conflicts with an OS component-->
      <!--<component name="msgconf"/>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="watcherfw">
-       <unit bldFile="mw/messagingmw/messagingfw/watcherfw/test/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/watcherfw/test/group"/>
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="msgtest">
-       <unit bldFile="mw/messagingmw/messagingfw/msgtest/integration/group"/>
-       -  <unit bldFile="mw/messagingmw/messagingfw/msgtest/targetautomation"/>  -
-       <unit bldFile="mw/messagingmw/messagingfw/msgtest/testsuites/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/msgtest/testutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/msgtest/tools/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/integration/group"/>
+       -  <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/targetautomation"/>  -
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/testsuites/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/testutils/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/tools/group"/>
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="biowatchers">
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmanbswatcher/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmasocketwatcher/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatchervmn/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwemt/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwmt/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwpt/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/test/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmanbswatcher/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmasocketwatcher/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmawatchervmn/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmawatcherwemt/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmawatcherwmt/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmawatcherwpt/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/test/group"/>
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="sendas">
-       <unit bldFile="mw/messagingmw/messagingfw/sendas/client/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/sendas/editutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/sendas/server/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/sendas/test/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/client/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/editutils/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/server/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/test/group"/>
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="msgurlhandler">
-       <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/test/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/urlhandler/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgurlhandler/test/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgurlhandler/urlhandler/group"/>
      </component>-->
      <!--Component manually removed and merged to OS-->
      <!--<component name="wappushfw">
-       -  <unit bldFile="mw/messagingmw/messagingfw/wappushfw/examples/pushapphandlerex"/>  -
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/miscpushmsgutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/wapurilookup/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmsgentry/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmtm/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushwatcher/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/roaptcontenthandler/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/rocontenthandler/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/rom"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislcontenthandlers/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislpushmsgutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpush"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpushscriptbased"/>
+       -  <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/examples/pushapphandlerex"/>  -
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/miscpushmsgutils/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/plugins/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/plugins/wapurilookup/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/pushmsgentry/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/pushmtm/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/pushutils/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/pushwatcher/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/roaptcontenthandler/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/rocontenthandler/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/rom"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/sislcontenthandlers/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/sislpushmsgutils/group"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/tpush"/>
+       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/tpushscriptbased"/>
      </component>-->
      <component name="suplsmshandler" origin-model="foundation"/>
      <component name="suplwappushhandler" origin-model="foundation"/>
@@ -152,17 +152,17 @@
      </component>
      <component name="n:suplsmshandler" long-name="SUPL SMS Handler" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/> -->
      </component>
      <component name="n:suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/> -->
      </component>
     </collection>
     <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
      <component unofficial="yes" name="msgfw_pub" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/messagingmw/msgfw_pub/group"/>
-      <!-- <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
       <unit bldFile="/sf/mw/messagingmw/msgfw_pub/send_ui_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="messagingmw_build" long-name="Messaging Middleware Build" origin-model="foundation">
--- a/3k/mw/mmappfw/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/mmappfw/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -24,7 +24,7 @@
      </component>
      <component name="asxparser" long-name="ASX Parser" origin-model="foundation">
       <unit bldFile="/sf/mw/mmappfw/mmappcomponents/asxparser/group"/>
-      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/test"/> -->
+      <!-- <unit bldFile="/sf/mw/mmappfw/mmappcomponents/asxparser/test"/> -->
      </component>
     </collection>
     <collection name="mpx" long-name="MPX" level="fw">
@@ -49,7 +49,7 @@
       <unit bldFile="/sf/mw/mmappfw/group"/>
      </component>
      <component unofficial="yes" name="mmappfw_test" long-name="Multimedia App Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmappfw/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmappfw/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/asx_parser_api/tsrc/group"/>
--- a/3k/mw/mmmw/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/mmmw/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,8 +6,8 @@
     <collection name="radioutility" long-name="Radio Utility" level="generic">
      <component name="radioserver" long-name="Radio Server" origin-model="foundation">
       <unit bldFile="/sf/mw/mmmw/radioutility/radioserver/group"/>
-      <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/server/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/session/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/radioutility/radioserver/server/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/radioutility/radioserver/session/group"/> -->
      </component>
      <component name="radio_utility" long-name="Radio Utility" origin-model="foundation">
       <unit bldFile="/sf/mw/mmmw/radioutility/radio_utility/group"/>
@@ -34,17 +34,17 @@
     </collection>
     <collection name="audioenhancements" long-name="Audio Enhancements" level="generic">
      <component name="enhancedaudioplayerutility" long-name="Enhanced Media Client" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/audioplayer/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/audiostreaming/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/audioplayer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/audiostreaming/group"/> -->
       <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/group"/>
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosource/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosourcefactory/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audioutility/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosource/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosourcefactory/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audioutility/group"/> -->
      </component>
      <component name="progressivedownload" long-name="Progressive Download" origin-model="foundation">
       <unit bldFile="/sf/mw/mmmw/audioenhancements/progressivedownload/group"/>
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/progressivedownloadsource/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/progressivedownloadutility/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/progressivedownload/progressivedownloadsource/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/progressivedownload/progressivedownloadutility/group"/> -->
      </component>
      <component name="enhancedmediaclient" long-name="Enhanced Media Client" origin-model="foundation">
       <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedmediaclient/group"/>
@@ -79,29 +79,29 @@
     </collection>
     <collection name="advancedaudiocontroller" long-name="Advanced Audio Controller" level="plugin">
      <component name="audiocontrollerpluginsvariant" long-name="Audio Controller Plugins Variant" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpdatasourceadapter/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontrollerutility/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/datasourceadapter/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudioinput/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudiooutput/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/fileaudiooutput/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpdatasourceadapter/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontrollerutility/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/datasourceadapter/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudioinput/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudiooutput/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/fileaudiooutput/group"/> -->
       <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/group"/>
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/hxaudiorecognizer/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/metadatawrite/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/hxaudiorecognizer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/metadatawrite/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/group"/> -->
      </component>
      <component name="wavplaycontrollerplugin" long-name="WAV Play Controller Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/wavplaycontrollerplugin/group"/>
      </component>
      <component unofficial="yes" name="advancedaudiocontroller_test" long-name="Advanced Audio Controller Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/> -->
      </component>
      <component unofficial="yes" name="advancedaudiocontroller_build" long-name="Advanced Audio Controller Build" origin-model="foundation">
       <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/group"/>
@@ -158,7 +158,7 @@
       <unit bldFile="/sf/mw/mmmw/group"/>
      </component>
      <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmmw/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmmw/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
--- a/3k/mw/mmuifw/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/mmuifw/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -53,10 +53,10 @@
     </collection>
     <collection name="widgetmodel" long-name="Widget Model" level="mdl">
      <component name="alfwidgetmodel" long-name="ALF Widget Model" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetmodel/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmuifw/widgetmodel/alfwidgetmodel/group"/> -->
      </component>
      <component name="alfwidgetfactory" long-name="ALF Widget Factory" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetfactory/group"/> -->
+      <!-- <unit bldFile="/sf/mw/mmuifw/widgetmodel/alfwidgetfactory/group"/> -->
      </component>
      <component unofficial="yes" name="widgetmodel_build" long-name="Widget Model Build" origin-model="foundation">
       <unit bldFile="/sf/mw/mmuifw/widgetmodel/group"/>
--- a/3k/mw/netprotocols/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/netprotocols/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -72,7 +72,7 @@
     <collection name="n:wapstack" long-name="WAP Stack" level="plugin">
      <component name="n:wapmessageapi" long-name="WAP Message API" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/> -->
      </component>
     </collection>
     <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
--- a/3k/mw/opensrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/opensrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -8,7 +8,7 @@
       <unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
      </component>
      <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/opensrv/loudmouth/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/opensrv/loudmouth/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
@@ -16,7 +16,7 @@
       <unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
      </component>
      <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/opensrv/libtelepathy/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/opensrv/libtelepathy/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
@@ -32,7 +32,7 @@
       <unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
      </component>
      <component unofficial="yes" name="isolationserver_test" long-name="Isloation Server Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/opensrv/isolationserver/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/opensrv/isolationserver/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="isolationserver_build" long-name="Isloation Server Build" origin-model="foundation">
       <unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
@@ -41,7 +41,7 @@
     <collection name="opensrv_info" long-name="Open Services Info" level="eng">
      <component unofficial="yes" name="opensrv_plat" long-name="Open Services Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/opensrv/opensrv_plat/group"/>
-      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="opensrv_build" long-name="Open Services Build" origin-model="foundation">
       <unit bldFile="/sf/mw/opensrv/group"/>
--- a/3k/mw/phonesrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/phonesrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -25,8 +25,8 @@
      </component>
      <component name="spsettings" long-name="SP Settings" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/group"/>
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
+      <!-- <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
      </component>
      <component name="cenrepdatabase" long-name="Cenrep Database" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
@@ -114,12 +114,12 @@
     </collection>
     <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
      <component unofficial="yes" name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
+      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
       <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/group"/>
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="phonesrv_pub" long-name="Telephony and SIM Services Public Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/phonesrv/phonesrv_pub/group"/>
--- a/3k/mw/remoteconn/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/remoteconn/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -28,7 +28,7 @@
    <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
      <component name="n:mrouter" long-name="m-Router" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/> -->
      </component>
      <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group" mrp="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group/connectivity_legacy_plp_plpremotelink.mrp"/>
@@ -48,7 +48,7 @@
     <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
      <component name="n:mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/> -->
      </component>
      <component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="/sf/mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
@@ -60,7 +60,7 @@
      </component>
      <component name="n:mtpwmpextndp" long-name="WMP Extension Data Provider" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group" mrp="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group/mtp_wmpextndp.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpwmpextndp/group" mrp="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group/mtp_wmpextndp.mrp"/> -->
      </component>
     </collection>
     <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
--- a/3k/mw/remotemgmt/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/remotemgmt/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,11 +6,11 @@
     <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
      <component name="pnputil" long-name="PnP Util" origin-model="foundation">
       <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
      </component>
      <component name="provisioning" long-name="provisioning" origin-model="foundation">
       <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
      </component>
     </collection>
     <collection name="policymanagement" long-name="Policy Management" level="generic">
@@ -69,7 +69,7 @@
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/hostserver/dshostservers/bld"/>
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/inc"/>
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/netmon/bld"/>
-      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/ds/ota/bld"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/ota/bld"/> -->
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/provisioningadapter/bld"/>
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/settings/bld"/>
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/syncagent/bld"/>
@@ -87,7 +87,7 @@
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treedbclient/bld"/>
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treedbhandler/bld"/>
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treemodule/bld"/>
-      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/dm/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/tsrc/group"/> -->
       <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/wappushalert/bld"/>
      </component>
      <component name="syncmlnotifier" long-name="SyncML Notifier" origin-model="foundation">
@@ -139,51 +139,51 @@
     <collection name="n:remotemgmttest" long-name="Remote Management Test" level="specific">
      <component name="n:omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
      </component>
      <component name="n:omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/> -->
      </component>
     </collection>
     <collection name="n:syncandremotemgmtfw" long-name="Sync and Remote Management Framework" level="framework">
      <component name="n:omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/> -->
      </component>
      <component name="n:omasyncmlcommonfw" long-name="OMA SyncML Common Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/> -->
      </component>
      <component name="n:omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/> -->
      </component>
      <component name="n:omasyncmlconfig" long-name="OMA SyncML Config" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/> -->
      </component>
      <component name="n:devicemgmtfw" long-name="Device Management Framework" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/> -->
      </component>
      <component name="n:clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/> -->
      </component>
     </collection>
     <collection name="n:syncandremotemgmtservices" long-name="Sync and Remote Management Services" level="plugin">
      <component name="n:datasyncadaptors" long-name="Data Sync Adaptors" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/> -->
      </component>
      <component name="n:devicemgmtadaptors" long-name="Device Management Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/> -->
      </component>
      <component name="n:clientprovisioningadaptors" long-name="Client Provisioning Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/> -->
      </component>
     </collection>
     <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
@@ -194,22 +194,22 @@
       <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/group"/>
      </component>
      <component unofficial="yes" name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
      </component>
     <component name="n:remotemgmt_metadata" long-name="Remote Management Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/mw/remotemgmt/remotemgmt_info/remotemgmt_metadata/remotemgmt_metadata.mrp"/>
--- a/3k/mw/remotestorage/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/remotestorage/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -15,7 +15,7 @@
      </component>
      <component name="mountmanager" long-name="Mount Manager" origin-model="foundation">
       <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountmanager/group"/>
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountmanager/tsrc/public/basic/group"/> -->
      </component>
      <component name="webdavaccessplugin" long-name="WebDAV Access Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
--- a/3k/mw/securitysrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/securitysrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -81,7 +81,7 @@
     </collection>
     <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
      <component name="trkdummy" long-name="Trk Dummy" origin-model="foundation">
-      <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/trkdummy/group"/> -->
+      <!-- <unit bldFile="/sf/mw/securitysrv/boottimeintegritycheck/trkdummy/group"/> -->
      </component>
      <component unofficial="yes" name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build" origin-model="foundation">
       <unit bldFile="/sf/mw/securitysrv/boottimeintegritycheck/group"/>
@@ -112,13 +112,13 @@
       <unit bldFile="/sf/mw/securitysrv/group"/>
      </component>
      <component unofficial="yes" name="secsrv_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
+      <!-- <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
       <unit bldFile="/sf/mw/securitysrv/secsrv_plat/group"/>
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
+      <!-- <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
+      <!-- <unit bldFile="/sf/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
      </component>
      <component unofficial="yes" name="securitysrv_test" long-name="Security Services Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/securitysrv/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/securitysrv/tsrc/group"/> -->
      </component>
     <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
--- a/3k/mw/serviceapi/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/serviceapi/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -7,13 +7,13 @@
      <component name="appmanagerservice" long-name="App Manager Service" origin-model="foundation"/>
      <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
      </component>
     </collection>
     <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
      <component name="calendarservice" long-name="Calendar Service" origin-model="foundation"/>
      <component unofficial="yes" name="sapi_calendar_build" long-name="SAPI Calendar Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
      </component>
     </collection>
@@ -26,59 +26,59 @@
     <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
      <component name="landmarksservice" long-name="Landmarks Service" origin-model="foundation"/>
      <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
      </component>
     </collection>
     <collection name="sapi_location" long-name="SAPI Location" level="mw2">
      <component name="locationservice" long-name="Location Service" origin-model="foundation"/>
      <component unofficial="yes" name="sapi_location_build" long-name="SAPI Location Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
      </component>
     </collection>
     <collection name="sapi_logging" long-name="SAPI Logging" level="app">
      <component name="loggingservice" long-name="Logging Service" origin-model="foundation"/>
      <component unofficial="yes" name="sapi_logging_build" long-name="SAPI Logging Build" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_logging/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/tsrc/dev/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_logging/tsrc/dev/group"/> -->
      </component>
     </collection>
     <collection name="sapi_mediamanagement" long-name="SAPI Media Management" level="mw2">
      <component name="mediamanagementservice" long-name="Media Management Service" origin-model="foundation"/>
      <component unofficial="yes" name="sapi_mediamanagement_build" long-name="SAPI Media Management Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
      </component>
     </collection>
     <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
      <component name="messagingservice" long-name="Messaging Service" origin-model="foundation"/>
      <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
      </component>
     </collection>
@@ -96,7 +96,7 @@
     </collection>
     <collection name="sapi_serviceregistry" long-name="SAPI Service Registry" level="os">
      <component name="serviceregistryprovider" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
      </component>
     </collection>
@@ -105,7 +105,7 @@
       <unit bldFile="/sf/mw/serviceapi/serviceproviders/group"/>
      </component>
      <component unofficial="yes" name="serviceapi_test" long-name="Service API Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapi/tsrc/group"/> -->
      </component>
     </collection>
    </block>
--- a/3k/mw/serviceapifw/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/serviceapifw/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -30,8 +30,8 @@
       <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/group"/>
       <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/tsrc/group"/>
       <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
-      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build" origin-model="foundation">
       <unit bldFile="/sf/mw/serviceapifw/group"/>
--- a/3k/mw/shortlinkconn/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/shortlinkconn/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -9,7 +9,7 @@
      </component>
      <component name="btnotif" long-name="Bluetooth Notifier" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btnotif/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
      </component>
      <component name="btaudioman" long-name="Bluetooth Audio Man" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btaudioman/group"/>
@@ -22,13 +22,13 @@
      </component>
      <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btaudiostreamer/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
      </component>
      <component name="btsap" long-name="Bluetooth SAP" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btsap/group"/>
      </component>
      <component name="btui" long-name="Bluetooth UI" origin-model="foundation">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/ecom/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btui/ecom/group"/> -->
       <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btui/group"/>
      </component>
      <component name="btpbap" long-name="Bluetooth PBAP" origin-model="foundation">
@@ -73,7 +73,7 @@
     <collection name="usbclasses" long-name="USB classes" level="framework">
      <component name="usbobexclasscontroller" long-name="USB Obex Class Controller" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbobexclasscontroller/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbobexclasscontroller/tsrc/group"/> -->
      </component>
      <component name="usbbasicpersonality" long-name="USB Basic Personality" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbbasicpersonality/group"/>
@@ -89,7 +89,7 @@
      </component>
      <component name="ptpserver" long-name="Ptp Server" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/ptpserver/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/ptpclasscontroller/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbclasses/ptpserver/ptpclasscontroller/group"/> -->
      </component>
      <component name="pictbridgeengine" long-name="Pictbridge Engine" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbclasses/pictbridgeengine/group"/>
@@ -102,7 +102,7 @@
      </component>
      <component name="usblocodplugin" long-name="USB Locod Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbengines/usblocodplugin/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbengines/usblocodplugin/tsrc/group"/> -->
      </component>
      <component name="usbdevcon" long-name="USB Devcon" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbengines/usbdevcon/group"/>
@@ -114,11 +114,11 @@
     <collection name="usbuis" long-name="USB UIs" level="specific">
      <component name="usbui" long-name="USB UI" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbui/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbui/tsrc/usbuiapitest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbui/tsrc/usbuiapitest/group"/> -->
      </component>
      <component name="usbuinotif" long-name="USB UI Notif" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbuinotif/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/tsrc/usbuinotifapitest/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbuinotif/tsrc/usbuinotifapitest/group"/> -->
      </component>
      <component name="imageprintuiprovider" long-name="ImagePrint UI Provider" origin-model="foundation">
       <unit bldFile="/sf/mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
@@ -145,10 +145,10 @@
       <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_pub/group"/>
      </component>
      <component unofficial="yes" name="public" origin-model="foundation">
-      <!-- <unit bldFile="mw/shortlinkconn/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/group"/>
      </component>
      <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build" origin-model="foundation">
--- a/3k/mw/svgt/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/svgt/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,7 +5,7 @@
 <block name="svgt" long-name="SVG Tiny" tech_domain="ui" level="generic" levels="util ui">
     <collection name="svgtopt" long-name="SVGT Opt" level="util">
      <component name="svg" origin-model="foundation">
-      <!-- <unit bldFile="mw/svgt/svgtopt/svg/svgrecog/group"/> -->
+      <!-- <unit bldFile="/sf/mw/svgt/svgtopt/svg/svgrecog/group"/> -->
      </component>
      <component name="nvgdecoder" long-name="NVG Decoder" origin-model="foundation"/>
      <component name="svgengineji" long-name="SVG Engine JI" origin-model="foundation"/>
--- a/3k/mw/uiaccelerator/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/uiaccelerator/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,12 +5,12 @@
 <block name="uiaccelerator" long-name="UI Accelerator" tech_domain="ui" level="generic" levels="plugin framework server generic specific">
     <collection name="uiacceltk" long-name="UI Accelerator TK" level="framework">
      <component name="hitchcock" long-name="Hitchcock" origin-model="foundation">
-      <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/coretoolkit/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/coretoolkit/group"/> -->
       <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-      <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/group"/> -->
-      <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/tracer/group"/> -->
-      <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/tracer/traceextclient/group"/> -->
-      <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/tracer/traceextplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/tracer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/tracer/traceextclient/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/tracer/traceextplugin/group"/> -->
      </component>
      <component name="widgeteditors" long-name="Widget Editors" origin-model="foundation">
       <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/widgeteditors/group"/>
@@ -21,15 +21,15 @@
     </collection>
     <collection name="uiaccelexampleapps" long-name="UI Accelerator Example Apps" level="specific">
      <component name="alfexanalogdialer" long-name="ALF Ex Analog Dialer" origin-model="foundation">
-      <!-- <unit bldFile="mw/uiaccelerator/uiaccelexampleapps/alfexanalogdialer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiaccelexampleapps/alfexanalogdialer/group"/> -->
      </component>
      <component name="alfexstickers" long-name="ALF Ex Stickers" origin-model="foundation">
-      <!-- <unit bldFile="mw/uiaccelerator/uiaccelexampleapps/alfexstickers/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiaccelexampleapps/alfexstickers/group"/> -->
      </component>
     </collection>
     <collection name="uiaccelerator_info" long-name="UI Accelerator Info" level="specific">
      <component unofficial="yes" name="inc" origin-model="foundation">
-      <!-- <unit bldFile="mw/uiaccelerator/inc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiaccelerator/inc/group"/> -->
      </component>
      <component unofficial="yes" name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/tsrc/group"/>
--- a/3k/mw/uiresources/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/uiresources/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -7,23 +7,23 @@
      <component name="cdl" long-name="Cdl" origin-model="foundation">
       <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlengine/group"/>
       <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlserver/group"/>
-      <!-- <unit bldFile="mw/uiresources/layouts/cdl/cdlutils/cdlexplorer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlutils/cdlexplorer/group"/> -->
      </component>
      <component name="aknlayout2" long-name="AKN Layout 2" origin-model="foundation">
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/nhd_akn_app"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/nhd_uiaccel"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/qhd_touch_akn_app"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/qhd_touch_uiaccel"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/qvga2_akn_app"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/qvga2_uiaccel"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/qvga_akn_app"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/qvga_uiaccel"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga3_akn_app"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga3_uiaccel"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga_akn_app"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga_touch_akn_app"/> -->
-      <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga_uiaccel"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/nhd_akn_app"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/nhd_uiaccel"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qhd_touch_akn_app"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qhd_touch_uiaccel"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qvga2_akn_app"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qvga2_uiaccel"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qvga_akn_app"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qvga_uiaccel"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga3_akn_app"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga3_uiaccel"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga_akn_app"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga_touch_akn_app"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga_uiaccel"/> -->
       <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/group"/>
      </component>
     </collection>
@@ -35,13 +35,13 @@
     <collection name="pictographs" long-name="Pictographs" level="data">
      <component name="aknpictograph" long-name="AKN Picto Graph" origin-model="foundation">
       <unit bldFile="/sf/mw/uiresources/pictographs/aknpictograph/group"/>
-      <!-- <unit bldFile="mw/uiresources/pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
      </component>
     </collection>
     <collection name="skins" long-name="Skins" level="data">
      <component name="aknskincontent" long-name="AKN Skin Content" origin-model="foundation">
       <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/group"/>
-      <!-- <unit bldFile="mw/uiresources/skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
      </component>
      <component name="aknskins" long-name="AKN Skins" origin-model="foundation">
       <unit bldFile="/sf/mw/uiresources/skins/aknskins/group"/>
@@ -58,7 +58,7 @@
      </component>
      <component name="fontutils" long-name="Font Utils" origin-model="foundation">
       <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/fontutils/group"/>
-      <!-- <unit bldFile="mw/uiresources/fontsupport/fontutils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/group"/> -->
      </component>
     </collection>
     <collection name="uigraphics" long-name="UI Graphics" level="generic">
@@ -75,7 +75,7 @@
       <unit bldFile="/sf/mw/uiresources/uigraphics/aknicon/group"/>
      </component>
      <component name="palette" long-name="Palette" origin-model="foundation">
-      <!-- <unit bldFile="mw/uiresources/uigraphics/palette/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uiresources/uigraphics/palette/group"/> -->
      </component>
     </collection>
     <collection name="helpthemes" long-name="Help Themes" level="data">
--- a/3k/mw/uitools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/uitools/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -20,7 +20,7 @@
      <component name="arabica" origin-model="foundation"/>
      <component name="xercesc" long-name="Xerces C" origin-model="foundation"/>
      <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/uitools/toollibraries/group"/> -->
+      <!-- <unit bldFile="/sf/mw/uitools/toollibraries/group"/> -->
      </component>
     </collection>
     <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
--- a/3k/mw/videoutils/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/videoutils/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -39,11 +39,11 @@
     <collection name="videoutils_info" long-name="Video Utils Info" level="util">
      <component unofficial="yes" name="videoutils_plat" long-name="Video Utils Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/videoutils/videoutils_plat/group"/>
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
+      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
+      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
+      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build" origin-model="foundation">
       <unit bldFile="/sf/mw/videoutils/group"/>
--- a/3k/mw/vpnclient/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/vpnclient/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,13 +5,13 @@
 <block name="vpnclient" long-name="VPN Client" tech_domain="dc" level="specific" levels="engine ui api">
     <collection name="vpnclient_sis" long-name="VPN Client Sis" level="api">
      <component name="ce_sis" long-name="CE SIS" origin-model="foundation">
-      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/ce_sis/group"/> -->
+      <!-- <unit bldFile="/sf/mw/vpnclient/vpnclient_sis/ce_sis/group"/> -->
      </component>
      <component name="stub_sis" long-name="Stub Sis" origin-model="foundation">
-      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/stub_sis/group"/> -->
+      <!-- <unit bldFile="/sf/mw/vpnclient/vpnclient_sis/stub_sis/group"/> -->
      </component>
      <component unofficial="yes" name="vpnclient_sis_build" origin-model="foundation">
-      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/group"/> -->
+      <!-- <unit bldFile="/sf/mw/vpnclient/vpnclient_sis/group"/> -->
      </component>
     </collection>
     <collection name="vpnengine" long-name="VPN Engine" level="engine">
--- a/3k/mw/web/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/web/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -29,7 +29,7 @@
       <unit bldFile="/sf/mw/web/browserutilities/favouritesengine/group"/>
      </component>
      <component name="feedsengine" long-name="Feeds Engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/web/browserutilities/feedsengine/feedsserver/reconizer/group"/> -->
+      <!-- <unit bldFile="/sf/mw/web/browserutilities/feedsengine/feedsserver/reconizer/group"/> -->
       <unit bldFile="/sf/mw/web/browserutilities/feedsengine/group"/>
      </component>
      <component name="multipartparser" long-name="Multipart Parser" origin-model="foundation">
@@ -40,7 +40,7 @@
      </component>
      <component name="webutils" long-name="Web Utils" origin-model="foundation">
       <unit bldFile="/sf/mw/web/browserutilities/webutils/group"/>
-      <!-- <unit bldFile="mw/web/browserutilities/webutils/tsrc/public/adv/group"/> -->
+      <!-- <unit bldFile="/sf/mw/web/browserutilities/webutils/tsrc/public/adv/group"/> -->
      </component>
      <component name="aiwbrowserprovider" long-name="AIW Browser Provider" origin-model="foundation">
       <unit bldFile="/sf/mw/web/browserutilities/aiwbrowserprovider/group"/>
@@ -56,8 +56,8 @@
       <unit bldFile="/sf/mw/web/webengine/osswebengine/npscript/group"/>
       <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group"/>
       <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-      <!-- <unit bldFile="mw/web/webengine/osswebengine/webkit/s60/webview/webview_api_test/group"/> -->
-      <!-- <unit bldFile="mw/web/webengine/osswebengine/webkit/s60/webview/webview_api_test/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/webview/webview_api_test/group"/> -->
+      <!-- <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/webview/webview_api_test/tsrc/group"/> -->
      </component>
      <component name="webkitutils" long-name="WebKit Utils" origin-model="foundation">
       <unit bldFile="/sf/mw/web/webengine/webkitutils/group"/>
@@ -70,7 +70,7 @@
      </component>
      <component name="widgetregistry" long-name="Widget Registry" origin-model="foundation">
       <unit bldFile="/sf/mw/web/webengine/widgetregistry/group"/>
-      <!-- <unit bldFile="mw/web/webengine/widgetregistry/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/mw/web/webengine/widgetregistry/tsrc/public/basic/group"/> -->
      </component>
      <component name="wmlengine" long-name="WML Engine" origin-model="foundation">
       <unit bldFile="/sf/mw/web/webengine/wmlengine/group"/>
@@ -83,7 +83,7 @@
      </component>
      <!--Component manually removed as empty and name conflicts with another component-->
      <!--<component name="memoryplugin" long-name="Memory Plugin">
-       <unit bldFile="mw/web/webengine/memoryplugin/group"/>
+       <unit bldFile="/sf/mw/web/webengine/memoryplugin/group"/>
      </component>-->
      <component name="widgetmemoryplugin" long-name="Widget Memory Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/web/webengine/widgetmemoryplugin/group"/>
@@ -155,9 +155,9 @@
     </collection>
     <collection name="web_info" long-name="Web Info" level="specific">
      <component unofficial="yes" name="web_pub" long-name="Web Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/web/web_pub/browser_control_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/web/web_pub/favourites_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/web/web_pub/browser_control_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/web/web_pub/favourites_engine_api/tsrc/group"/> -->
       <unit bldFile="/sf/mw/web/web_pub/group"/>
      </component>
      <component unofficial="yes" name="web_build" long-name="Web Build" origin-model="foundation">
--- a/3k/mw/websrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/websrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -77,7 +77,7 @@
       <unit bldFile="/sf/mw/websrv/webservices/wshostlettransportplugin/group"/>
      </component>
      <component name="wsstar" long-name="WS Star" origin-model="foundation">
-      <!-- <unit bldFile="mw/websrv/webservices/wsstar/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/webservices/wsstar/group"/> -->
      </component>
      <component name="wsoviplugin" long-name="WS Ovi Plugin" origin-model="foundation">
       <unit bldFile="/sf/mw/websrv/webservices/wsoviplugin/group"/>
@@ -92,38 +92,38 @@
      </component>
      <component unofficial="yes" name="websrv_pub" long-name="Web Services Public Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/mw/websrv/websrv_pub/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
      </component>
     </collection>
    </block>
--- a/3k/mw/wirelessacc/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/mw/wirelessacc/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -7,16 +7,16 @@
      <component name="hsserver" long-name="HotSpot Server" origin-model="foundation"/>
      <component name="hsclient" long-name="HS Client" origin-model="foundation"/>
      <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service" origin-model="foundation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/> -->
+      <!-- <unit bldFile="/sf/mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/> -->
      </component>
      <component name="ictsdialogs" long-name="ICTS Dialogs" origin-model="foundation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/ictsdialogs/group"/> -->
+      <!-- <unit bldFile="/sf/mw/wirelessacc/hotspotfw/ictsdialogs/group"/> -->
      </component>
      <component name="hspluginforagent" long-name="HotSpot Plugin For Agent" origin-model="foundation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hspluginforagent/group"/> -->
+      <!-- <unit bldFile="/sf/mw/wirelessacc/hotspotfw/hspluginforagent/group"/> -->
      </component>
      <component name="hsbrowser" long-name="HotSpot Browser" origin-model="foundation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hsbrowser/group"/> -->
+      <!-- <unit bldFile="/sf/mw/wirelessacc/hotspotfw/hsbrowser/group"/> -->
      </component>
      <component unofficial="yes" name="hotspotfw_build" long-name="Hotspot Framework Build" origin-model="foundation">
       <unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
--- a/3k/os/boardsupport/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/boardsupport/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -9,43 +9,43 @@
      </component>
      <component name="n:unistore2emulatorsupport" long-name="UniStore2 Emulator Support" filter="gt" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/boardsupport/emulator/unistore2emulatorsupport" mrp="os/boardsupport/emulator/unistore2emulatorsupport/base_wins_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/emulator/unistore2emulatorsupport" mrp="os/boardsupport/emulator/unistore2emulatorsupport/base_wins_unistore2.mrp"/> -->
      </component>
     </collection>
     <collection name="n:omaph2" long-name="OMAP H2" level="bsp">
      <component name="n:omaph2bsp" long-name="OMAP H2 BSP" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/boardsupport/omaph2/omaph2bsp/h2" mrp="os/boardsupport/omaph2/omaph2bsp/h2/base_omaph2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2bsp/h2" mrp="os/boardsupport/omaph2/omaph2bsp/h2/base_omaph2.mrp"/> -->
      </component>
      <component name="n:omaph2unistore2" long-name="OMAP H2 UniStore2" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/boardsupport/omaph2/omaph2unistore2" mrp="os/boardsupport/omaph2/omaph2unistore2/base_h2_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2unistore2" mrp="os/boardsupport/omaph2/omaph2unistore2/base_h2_unistore2.mrp"/> -->
      </component>
      <component name="n:omaph2sdio" long-name="OMAP H2 SDIO" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/boardsupport/omaph2/omaph2sdio" mrp="os/boardsupport/omaph2/omaph2sdio/base_h2_sdio.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2sdio" mrp="os/boardsupport/omaph2/omaph2sdio/base_h2_sdio.mrp"/> -->
      </component>
     </collection>
     <collection name="n:omaph4" long-name="OMAP H4" level="bsp">
      <component name="n:omaph4bsp" long-name="OMAP H4 BSP" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/boardsupport/omaph4/omaph4bsp/h4" mrp="os/boardsupport/omaph4/omaph4bsp/h4/base_omaph4hrp.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4bsp/h4" mrp="os/boardsupport/omaph4/omaph4bsp/h4/base_omaph4hrp.mrp"/> -->
      </component>
      <component name="n:h4bootloader" long-name="H4 Boot Loader" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit mrp="os/boardsupport/omaph4/h4bootloader/base_omaph4hrp_bootldr.mrp" bldFile="os/boardsupport/omaph4/h4bootloader"/> -->
+      <!-- <unit mrp="os/boardsupport/omaph4/h4bootloader/base_omaph4hrp_bootldr.mrp" bldFile="/sf/os/boardsupport/omaph4/h4bootloader"/> -->
      </component>
      <component name="n:omaph4minienvbootloader" long-name="OMAP H4 Mini Environment Boot Loader" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit mrp="os/boardsupport/omaph4/omaph4minienvbootloader/base_omaph4hrp_mebootldr.mrp" bldFile="os/boardsupport/omaph4/omaph4minienvbootloader"/> -->
+      <!-- <unit mrp="os/boardsupport/omaph4/omaph4minienvbootloader/base_omaph4hrp_mebootldr.mrp" bldFile="/sf/os/boardsupport/omaph4/omaph4minienvbootloader"/> -->
      </component>
      <component name="n:omaph4unistore2" long-name="OMAP H4 Unistore2" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/boardsupport/omaph4/omaph4unistore2" mrp="os/boardsupport/omaph4/omaph4unistore2/base_omaph4hrp_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4unistore2" mrp="os/boardsupport/omaph4/omaph4unistore2/base_omaph4hrp_unistore2.mrp"/> -->
      </component>
      <component name="n:omaph4sdio" long-name="OMAP H4 SDIO" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/boardsupport/omaph4/omaph4sdio" mrp="os/boardsupport/omaph4/omaph4sdio/base_omaph4hrp_sdio.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4sdio" mrp="os/boardsupport/omaph4/omaph4sdio/base_omaph4hrp_sdio.mrp"/> -->
      </component>
     </collection>
     <collection name="haitest" long-name="HAI Test Suites" level="test">
--- a/3k/os/buildtools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/buildtools/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -21,8 +21,8 @@
     </collection>
     <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
      <component unofficial="yes" name="buildsystem" origin-model="foundation">
-      <!-- <unit bldFile="os/buildtools/toolsandutils/buildsystem/test/helloworld"/> -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/buildsystem/test/binaryvariation"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/buildsystem/test/helloworld"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/buildsystem/test/binaryvariation"/> -->
      </component>
     <component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
@@ -32,26 +32,26 @@
      </component>
      <component name="n:burtestserver" long-name="BUR Test Server" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/burtestserver/Group" mrp="os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/burtestserver/Group" mrp="os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/> -->
      </component>
      <component name="n:cbrtools" long-name="Component Based Release (CBR) Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/cbrtools/group" mrp="os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/cbrtools/group" mrp="os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/> -->
      </component>
      <component name="n:prf" long-name="Product Realisation Framework" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/prf/group" mrp="os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/prf/group" mrp="os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/> -->
      </component>
      <component name="n:cdb" long-name="Code Database" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/cdb/group" mrp="os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/cdb/group" mrp="os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/> -->
      </component>
      <component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
      </component>
      <component name="n:kitcomparator" long-name="Kit Comparator" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/kitcomparator/group" mrp="os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/kitcomparator/group" mrp="os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/> -->
      </component>
      <component name="wincredistribution" long-name="WinC Redistribution" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
@@ -61,40 +61,40 @@
      </component>
      <component name="n:testdriver" long-name="Test Driver" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/testdriver/Group" mrp="os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testdriver/Group" mrp="os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/> -->
      </component>
      <component name="statapi" long-name="STAT API" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/> -->
      </component>
      <component name="n:statsource" long-name="STAT Source" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/statsource/group/testtools_stat_common_source.mrp"/>
      </component>
      <component name="n:statdesktop" long-name="STAT Desktop" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/statdesktop/group" mrp="os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/statdesktop/group" mrp="os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/> -->
      </component>
      <component name="n:systemmonitor" long-name="System Monitor" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/systemmonitor/group" mrp="os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/systemmonitor/group" mrp="os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/> -->
      </component>
      <component name="n:testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/> -->
      </component>
      <component name="wintunnel" long-name="Wintunnel" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp"/>
      </component>
      <component name="n:usecasecontroller" long-name="Use Case Controller" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/> -->
      </component>
      <component name="autotest" long-name="Autotest" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
      </component>
      <component name="n:testconfigfileparser" long-name="Test Config File Parser" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->
      </component>
      <component name="n:kitsetupapp" long-name="Kit Setup App" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/toolsandutils/kitsetupapp/group/tools_devkits_kitsetupapp.mrp"/>
@@ -104,11 +104,11 @@
      </component>
      <component name="n:productinstaller" long-name="Product Installer" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/productinstaller/group" mrp="os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/productinstaller/group" mrp="os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/> -->
      </component>
      <component name="n:stlport" long-name="STL Port" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/toolsandutils/stlport/group" mrp="os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/stlport/group" mrp="os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/> -->
      </component>
     </collection>
    <collection name="n:dist_os" long-name="Redistribution" level="mw">
@@ -119,25 +119,25 @@
     <collection name="n:bintools_os" long-name="Binary Tools" level="fw">
      <component name="n:rcomp" long-name="Resource Compiler" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/bintools_os/rcomp/group" mrp="os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/bintools_os/rcomp/group" mrp="os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/> -->
      </component>
      <component name="n:evalid" long-name="Evalid" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/bintools_os/evalid" mrp="os/buildtools/bintools_os/evalid/tools_evalid.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/bintools_os/evalid" mrp="os/buildtools/bintools_os/evalid/tools_evalid.mrp"/> -->
      </component>
     </collection>
     <collection name="n:perltoolsplat_os" long-name="Perl Tools Platform" level="mw">
      <component name="n:redistribution" long-name="Redistribution" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/perltoolsplat_os/redistribution" mrp="os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/redistribution" mrp="os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/> -->
      </component>
      <component name="n:legacycommonperl" long-name="Legacy Common Perl Libraries" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/> -->
      </component>
      <component name="n:commonperl" long-name="Common Perl Libraries" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/perltoolsplat_os/commonperl/group" mrp="os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/commonperl/group" mrp="os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/> -->
      </component>
     </collection>
     <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
@@ -146,21 +146,21 @@
      </component>
      <component name="n:bldtools" long-name="Build Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/sbsv1_os/bldtools/group" mrp="os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/sbsv1_os/bldtools/group" mrp="os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/> -->
      </component>
     </collection>
     <collection name="n:srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
      <component name="n:leavescan" long-name="Leavescan" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/srcanamdw_os/leavescan/group" mrp="os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/leavescan/group" mrp="os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/> -->
      </component>
      <component name="n:programchecker" long-name="Program Checker" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/srcanamdw_os/programchecker/group" mrp="os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/programchecker/group" mrp="os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/> -->
      </component>
      <component name="n:migrationtool" long-name="Migration Tool" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/srcanamdw_os/migrationtool/group" mrp="os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/migrationtool/group" mrp="os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/> -->
      </component>
     </collection>
     <collection name="imgtools_os" long-name="Image Tools" level="fw">
@@ -171,17 +171,17 @@
     <collection name="n:binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
      <component name="n:captools" long-name="Capability Tools" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/binanamdw_os/captools/group" mrp="os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/binanamdw_os/captools/group" mrp="os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/> -->
      </component>
      <component name="n:depcheck" long-name="Dependency Checker" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/binanamdw_os/depcheck" mrp="os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/binanamdw_os/depcheck" mrp="os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/> -->
      </component>
     </collection>
     <collection name="n:devlib" long-name="Developer Library" level="ui">
      <component name="n:devlibhelp" long-name="Developer Library Help" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/devlib/devlibhelp/group/devlib94" mrp="os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp" version="9.4"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/devlib/devlibhelp/group/devlib94" mrp="os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp" version="9.4"/> -->
      </component>
      <component name="n:toolsdocs" long-name="Tools Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/buildtools/devlib/toolsdocs/tools_documentation.mrp"/>
@@ -190,126 +190,126 @@
     <collection name="misccomponents" long-name="Misc Components" level="mw">
      <component name="n:runperl" long-name="Run PERL" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/runperl/group" mrp="os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/runperl/group" mrp="os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/> -->
      </component>
      <component name="n:assertion" long-name="Assertion" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/assertion/group" mrp="os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/assertion/group" mrp="os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/> -->
      </component>
      <component name="n:enum" long-name="Enum" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/enum/group" mrp="os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/enum/group" mrp="os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/> -->
      </component>
      <component name="n:logger" long-name="Logger" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/logger/group" mrp="os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/logger/group" mrp="os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/> -->
      </component>
      <component name="n:filesys" long-name="Filesys" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/filesys/group" mrp="os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/filesys/group" mrp="os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/> -->
      </component>
      <component name="n:envvar" long-name="Envvar" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/envvar/group" mrp="os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/envvar/group" mrp="os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/> -->
      </component>
      <component name="n:installutils" long-name="Install Utils" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/installutils/group" mrp="os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/installutils/group" mrp="os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/> -->
      </component>
      <component name="n:mnemonicfix" long-name="Mnemonic Fix" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/mnemonicfix/group" mrp="os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/mnemonicfix/group" mrp="os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/> -->
      </component>
      <component name="n:pathbrowser" long-name="Path Browser" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/pathbrowser/group" mrp="os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/pathbrowser/group" mrp="os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/> -->
      </component>
      <component name="n:shellexec" long-name="Shell Exec" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/shellexec/group" mrp="os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/shellexec/group" mrp="os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/> -->
      </component>
      <component name="n:swingworker" long-name="Swing Worker" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/swingworker/group" mrp="os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/swingworker/group" mrp="os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/> -->
      </component>
      <component name="n:testcaserunner" long-name="Test Case Runner" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/testcaserunner/group" mrp="os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/testcaserunner/group" mrp="os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/> -->
      </component>
      <component name="n:toolbarpanel" long-name="Tool Bar Panel" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/toolbarpanel/group" mrp="os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/toolbarpanel/group" mrp="os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/> -->
      </component>
      <component name="n:javahelp" long-name="Java Help" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/javahelp/group" mrp="os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/javahelp/group" mrp="os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/> -->
      </component>
      <component name="n:langconfig" long-name="Language Config" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/langconfig/group" mrp="os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/langconfig/group" mrp="os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/> -->
      </component>
      <component name="n:sdkinfo" long-name="SDK Info" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/sdkinfo/group" mrp="os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkinfo/group" mrp="os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/> -->
      </component>
      <component name="n:jade" long-name="Jade " filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/jade/group" mrp="os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/jade/group" mrp="os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/> -->
      </component>
      <component name="n:sdkpackagemgr" long-name="SDK Package Manager" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/sdkpackagemgr/group" mrp="os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkpackagemgr/group" mrp="os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/> -->
      </component>
      <component name="n:sdkpkgtools" long-name="SDK Package Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/sdkpkgtools/group" mrp="os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkpkgtools/group" mrp="os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/> -->
      </component>
      <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
      </component>
      <component name="n:pkgmgrgui" long-name="SDK Package Manager GUI" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/pkgmgrgui/group" mrp="os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/pkgmgrgui/group" mrp="os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/> -->
      </component>
      <component name="n:launch" long-name="Launch" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/launch/group" mrp="os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/launch/group" mrp="os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/> -->
      </component>
      <component name="n:toolsstubs" long-name="Devices Tools Stubs" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/toolsstubs/group" mrp="os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/toolsstubs/group" mrp="os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/> -->
      </component>
      <component name="n:bspbuilder" long-name="BSP Builder" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/bspbuilder/group" mrp="os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/bspbuilder/group" mrp="os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/> -->
      </component>
      <component name="n:splash" long-name="Splash Screen" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/splash/group" mrp="os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/splash/group" mrp="os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/> -->
      </component>
      <component name="n:sdkbuilder" long-name="SDK Building Tools" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/misccomponents/sdkbuilder/group" mrp="os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkbuilder/group" mrp="os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/> -->
      </component>
     </collection>
     <collection name="n:javatoolsplat" long-name="Java Tools Platform" level="mw">
      <component name="n:javalib" long-name="Java Library " filter="gt" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/javatoolsplat/javalib/group" mrp="os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/javatoolsplat/javalib/group" mrp="os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/> -->
      </component>
     </collection>
     <collection name="n:fileconv" long-name="File Converters" level="mw">
      <component name="n:cjpeg" long-name="CJpeg" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/fileconv/cjpeg/group" mrp="os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/fileconv/cjpeg/group" mrp="os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/> -->
      </component>
      <component name="n:alp2csh" long-name="ALP to CSH" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/fileconv/alp2csh/group" mrp="os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/fileconv/alp2csh/group" mrp="os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/> -->
      </component>
      <component name="n:rtf2ptml" long-name="RTF to PTML" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/buildtools/fileconv/rtf2ptml/group" mrp="os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/buildtools/fileconv/rtf2ptml/group" mrp="os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/> -->
      </component>
     </collection>
     <collection name="buildtools_info" long-name="Build Tools Info" level="ui">
--- a/3k/os/cellularsrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/cellularsrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -19,7 +19,7 @@
      </component>
      <component name="n:cdmasmsstack" long-name="CDMA SMS Stack" introduced="8.0" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/> -->
      </component>
     </collection>
     <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
@@ -69,18 +69,18 @@
      </component>
      <component name="n:etelcdma" long-name="ETel CDMA" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/cellularsrv/telephonyserver/etelcdma/group" mrp="os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelcdma/group" mrp="os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/> -->
      </component>
     </collection>
     <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
      <!--Component manually removed, already declared in OS-->
      <!--<component name="common_tsy">
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/group"/>  -
-       -  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/testsuites/group"/>  -
+       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/component/group"/>  -
+       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/group"/>  -
+       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group"/>  -
+       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group"/>  -
+       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/group"/>  -
+       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/testsuites/group"/>  -
      </component>-->
      <!--Component manually removed as empty and name conflicts with an OS component-->
      <!--<component name="multimodetsy"/>-->
@@ -121,7 +121,7 @@
      </component>
      <!--Component manually removed and merged to OS, unit originately commented out by Bob's script-->
      <!--<component name="basebandchanneladaptor">
-       -  <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/test/te_bca/group"/>  -
+       -  <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/test/te_bca/group"/>  -
      </component>-->
      <!--Component manually removed as empty and name conflicts with an OS component-->
      <!--<component name="intersystemcomm"/>-->
--- a/3k/os/commsfw/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/commsfw/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -94,11 +94,11 @@
     <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
      <!-- Removing GT commdb
 <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
 </component>
 -->
      <!-- <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
 </component> -->
      <component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
--- a/3k/os/deviceplatformrelease/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/deviceplatformrelease/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -20,10 +20,10 @@
     </collection>
     <collection name="sf_config" long-name="SF Config" level="mid">
      <component name="config" origin-model="foundation">
-      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/apac/group"/> -->
-      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/group"/> -->
-      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/japan/group"/> -->
-      <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/western/group"/> -->
+      <!-- <unit bldFile="/sf/os/deviceplatformrelease/sf_config/config/apac/group"/> -->
+      <!-- <unit bldFile="/sf/os/deviceplatformrelease/sf_config/config/group"/> -->
+      <!-- <unit bldFile="/sf/os/deviceplatformrelease/sf_config/config/japan/group"/> -->
+      <!-- <unit bldFile="/sf/os/deviceplatformrelease/sf_config/config/western/group"/> -->
      </component>
     </collection>
     <collection name="s60bld">
--- a/3k/os/devicesrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/devicesrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -6,58 +6,58 @@
     <collection name="accessoryservices" long-name="Accessory Services" level="framework">
      <component name="accessorymonitor" long-name="Accessory Monitor" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmontesttimer/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmontesttimer/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
      </component>
      <component name="accessoryremotecontrol" long-name="Accessory Remote Control" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audio/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audio/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
      </component>
      <component name="accessoryserver" long-name="Accessory Server" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/accessorytestcontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/asystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/accessorytestcontrol/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/asystub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
      </component>
      <component name="headsetstatusapi" long-name="Headset Status Api" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
      </component>
      <component name="tspclientmapper" long-name="TSP Client Mapper" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/group"/>
-      <!-- <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="remotecontrolfw">
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/bearerplugin/group"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/client"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/converterplugin/group"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/reference"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/server/group"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/targetselectorplugin/group"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/test"/>
-       <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
+       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/bearerplugin/group"/>
+       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/client"/>
+       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/converterplugin/group"/>
+       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/reference"/>
+       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/server/group"/>
+       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/targetselectorplugin/group"/>
+       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/test"/>
+       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
      </component>-->
      <component name="reftsp" origin-model="foundation"/>
      <component unofficial="yes" name="accessoryservices_build" long-name="Accessory Services Build" origin-model="foundation">
@@ -70,22 +70,22 @@
     <collection name="commonservices" long-name="Common Services" level="app-if">
      <component name="commonengine" long-name="Common Engine" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/group"/>
-      <!-- <unit bldFile="os/devicesrv/commonservices/commonengine/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/tsrc/public/basic/group"/> -->
      </component>
      <component name="commonengineresources" long-name="Common Engine Resources" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/commonservices/commonengineresources/group"/>
      </component>
      <component name="platformenv" long-name="Platform Env" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
       <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/group"/>
-      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/platformver/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/sysversioninfo/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/platformver/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/sysversioninfo/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/tsrc/public/basic/group"/> -->
      </component>
      <component name="sysutil" long-name="Sysutil" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group"/>
-      <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/tsrc/public/basic/sysutiltests/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/tsrc/public/basic/sysutiltests/group"/> -->
      </component>
      <component name="activitymanager" long-name="Activity Manager" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group"/>
@@ -103,13 +103,13 @@
       <unit bldFile="/sf/os/devicesrv/dosservices/dosserver/group"/>
      </component>
      <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
      </component>
      <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/dosservices/group"/>
@@ -117,32 +117,32 @@
     </collection>
     <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
      <component name="serverexe" long-name="Server Exe" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/serverexe/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/serverexe/group"/> -->
      </component>
      <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
      </component>
      <component name="clientdll" long-name="Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/clientdll/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/clientdll/group"/> -->
      </component>
      <component name="commondll" long-name="Common DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/commondll/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/commondll/group"/> -->
      </component>
      <component name="vibraclientdll" long-name="Vibra Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
      </component>
      <component name="extendedlightclientdll" long-name="Extended Light Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
      </component>
      <component name="lightclientdll" long-name="Light Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
      </component>
      <component name="fmtxclientdll" long-name="FM TX Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
      </component>
      <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
      </component>
      <component name="vibractrl" long-name="Vibra Control" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
@@ -157,7 +157,7 @@
       <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
      </component>
      <component unofficial="yes" name="resourcemgmt_test" long-name="Resource Management Test" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/resourcemgmt/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/tsrc/public/basic/group"/> -->
      </component>
     <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
@@ -188,8 +188,8 @@
     </collection>
     <collection name="mediator" long-name="Mediator" level="app-if">
      <component unofficial="yes" name="mediator_test" long-name="Mediator Test" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/mediator/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
      </component>
      <component unofficial="yes" name="mediator_build" long-name="Mediator Build" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/mediator/group"/>
@@ -198,7 +198,7 @@
     <collection name="psmservices" long-name="PSM Services" level="app-if">
      <component name="psmserver" long-name="PSM Server" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/group"/>
-      <!-- <unit bldFile="os/devicesrv/psmservices/psmserver/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="psmservices_build" long-name="PSM Services Build" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/psmservices/group"/>
@@ -207,12 +207,12 @@
     <collection name="sensorservices" long-name="Sensor Services" level="framework">
      <component name="sensorserver" long-name="Sensor Server" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/group"/>
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/sensrvcondevalplugin/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/sensrvcondevalplugin/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
      </component>
      <component name="orientationssy" long-name="Orientation SSY" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/sensorservices/orientationssy/group"/>
@@ -222,8 +222,8 @@
      </component>
      <component name="sensordatacompensator" long-name="Sensor Data Compensator" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/group"/>
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
      </component>
      <component unofficial="yes" name="sensorservices_build" long-name="Sensor Services Build" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/sensorservices/group"/>
@@ -232,33 +232,33 @@
     <collection name="sysstatemgmt" long-name="System State Management" level="server">
      <component name="starter" long-name="Starter" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/group"/>
-      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="systemstarter">
-       -  <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/sysmondemo/group"/>  -
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tamastarter/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tapstart/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tdscstore/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappgood"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappnorv"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprvafterretry"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprverror"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappslow"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testprocgood"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/trestartsys/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartsafe/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartupproperties/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysmon/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
-       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
+       -  <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/sysmondemo/group"/>  -
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tamastarter/group"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tapstart/group"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tdscstore/group"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappgood"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappnorv"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testapprvafterretry"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testapprverror"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappslow"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testprocgood"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/trestartsys/group"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tstartsafe/group"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tstartupproperties/group"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysmon/group"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
+       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
      </component>-->
      <component unofficial="yes" name="sysstatemgmt_build" long-name="System State Management Build" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/group"/>
      </component>
      <component unofficial="yes" name="sysstatemgmt_test" long-name="System State Management Test" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
      </component>
     <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
@@ -278,26 +278,26 @@
     </collection>
     <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
      <component unofficial="yes" name="devicesrv_pub" long-name="Device Services Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
       <unit bldFile="/sf/os/devicesrv/devicesrv_pub/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
      </component>
      <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/group"/>
      </component>
      <component unofficial="yes" name="devicesrv_plat" long-name="Device Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
       <unit bldFile="/sf/os/devicesrv/devicesrv_plat/group"/>
      </component>
     <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
--- a/3k/os/graphics/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/graphics/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -25,12 +25,12 @@
     </collection>
     <collection name="graphics_info" long-name="Graphics Info" level="app-if">
      <component unofficial="yes" name="graphicssvs" origin-model="foundation">
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
 	  <unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
      </component>
      <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/graphics_pub/group"/> -->
      </component>
      <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="foundation">
       <unit bldFile="/sf/os/graphics/group"/>
@@ -69,11 +69,11 @@
      </component>
      <component name="n:openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
      </component>
      <component name="n:openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
      </component>
     </collection>
     <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
@@ -90,7 +90,7 @@
      </component>
      <component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
      </component>
     </collection>
     <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
@@ -110,7 +110,7 @@
     <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
 	 <!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
 <!--     <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+      <unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
      </component>
 -->
     </collection>
--- a/3k/os/imagingext/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/imagingext/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -29,7 +29,7 @@
       <unit bldFile="/sf/os/imagingext/group"/>
      </component>
      <component unofficial="yes" name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/imagingext/imagingext_pub/exif_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group"/> -->
       <unit bldFile="/sf/os/imagingext/imagingext_pub/group"/>
      </component>
     </collection>
--- a/3k/os/kernelhwsrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/kernelhwsrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -16,18 +16,18 @@
     <collection name="n:unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
      <component name="n:uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/> -->
      </component>
      <component name="n:uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2_undeliverable.mrp"/>
      </component>
      <component name="n:uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/> -->
      </component>
      <component name="n:uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/> -->
      </component>
     </collection>
     <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
@@ -46,15 +46,15 @@
      </component>
      <component name="n:sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/sdiotest" mrp="os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/sdiotest" mrp="os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/> -->
      </component>
      <component name="n:e32utils" long-name="E32 Utilities" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/> -->
      </component>
      <component name="n:f32test" long-name="File Server Tests" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/> -->
      </component>
     </collection>
     <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
@@ -84,11 +84,11 @@
     <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
      <component name="n:sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/> -->
      </component>
      <component name="n:sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/> -->
      </component>
      <component name="mediadrivers" long-name="Media Drivers" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- these are for storage media-->
@@ -110,7 +110,7 @@
      </component>
      <component name="n:nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/> -->
      </component>
      <component name="estart" long-name="Base Starter" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
@@ -143,11 +143,11 @@
      </component>
      <component name="n:ntfs" long-name="NTFS" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/> -->
      </component>
      <component name="n:iso9660fs" long-name="ISO9660 File System" filter="gt" introduced="8.1b" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/> -->
      </component>
     </collection>
     <collection name="halservices" long-name="HAL Services" level="framework">
@@ -170,7 +170,7 @@
     </collection>
     <collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
      <component unofficial="yes" name="localesupport" origin-model="foundation">
-      <!-- <unit bldFile="os/kernelhwsrv/localisation/localesupport/mmpfiles"/> -->
+      <!-- <unit bldFile="/sf/os/kernelhwsrv/localisation/localesupport/mmpfiles"/> -->
      </component>
     <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
--- a/3k/os/lbs/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/lbs/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -21,7 +21,7 @@
      </component>
      <component name="n:agpsintegrationmodule" long-name="A-GPS Integration Module" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
      </component>
     </collection>
     <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
@@ -65,7 +65,7 @@
      </component>
      <component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
      </component>
     </collection>
     <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
--- a/3k/os/mm/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/mm/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -18,8 +18,8 @@
     </collection>
     <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
      <component name="drmaudioplayer" long-name="DRM Audio Player" origin-model="foundation">
-      <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
-      <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
+      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
+      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
       <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/group"/>
      </component>
      <component name="mmextfw" long-name="MM Ext Framework" origin-model="foundation">
@@ -29,7 +29,7 @@
       <unit bldFile="/sf/os/mm/devsoundextensions/audiorouting/group"/>
      </component>
      <component name="effects" long-name="Effects" origin-model="foundation">
-      <!-- <unit bldFile="os/mm/devsoundextensions/effects/effecttest"/> -->
+      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/effects/effecttest"/> -->
       <unit bldFile="/sf/os/mm/devsoundextensions/effects/group"/>
      </component>
      <component name="effectspresets" long-name="Effects Presets" origin-model="foundation">
@@ -37,10 +37,10 @@
      </component>
      <component name="telephonyaudiorouting" long-name="Telephony Audio Routing" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/server/group"/> -->
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/session/group"/> -->
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
-      <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
+      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/server/group"/> -->
+      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/session/group"/> -->
+      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
+      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
      </component>
      <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces" origin-model="foundation">
       <unit bldFile="/sf/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
@@ -128,7 +128,7 @@
       <unit bldFile="/sf/os/mm/group"/>
      </component>
      <component unofficial="yes" name="mm_test" long-name="Multimedia Test" origin-model="foundation">
-      <!-- <unit bldFile="os/mm/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/mm/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="mm_plat" long-name="Multimedia Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_api/tsrc/group"/>
--- a/3k/os/ossrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/ossrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -7,7 +7,7 @@
      <component name="libutils" long-name="Utility Library" origin-model="foundation">
       <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/group"/>
       <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/tsrc/group"/>
-      <!-- <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/nft/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/tsrc/nft/group"/> -->
      </component>
     </collection>
     <collection name="ofdbus" long-name="OF Dbus" level="utilities">
@@ -23,14 +23,14 @@
       <unit bldFile="/sf/os/ossrv/ofdbus/group"/>
      </component>
      <component unofficial="yes" name="ofdbus_test" long-name="OF Dbus Test" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_file_send/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages1/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/file_transfer_time/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages1/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/g_n_messages/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/g_file_send/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/send_messages1/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/file_transfer_time/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/g_n_messages1/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
      </component>
     </collection>
     <collection name="glib" long-name="Glib" level="utilities">
@@ -50,7 +50,7 @@
       <unit bldFile="/sf/os/ossrv/glib/libgobject/group"/>
      </component>
      <component unofficial="yes" name="glib_test" long-name="Glib Test" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/glib/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/glib/tsrc/bc/group"/> -->
       <unit bldFile="/sf/os/ossrv/glib/tsrc/group"/>
      </component>
     </collection>
@@ -63,7 +63,7 @@
      </component>
      <component unofficial="yes" name="ssl_test" long-name="SSL Test" origin-model="foundation">
       <unit bldFile="/sf/os/ossrv/ssl/tsrc/group"/>
-      <!-- <unit bldFile="os/ossrv/ssl/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ssl/tsrc/bc/group"/> -->
      </component>
     </collection>
     <collection name="stdcpp" long-name="Stdcpp" level="translation">
@@ -71,14 +71,14 @@
       <unit bldFile="/sf/os/ossrv/stdcpp/group"/>
      </component>
      <component unofficial="yes" name="stdcpp_test" long-name="Stdcpp Test" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/graph/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/boost_test/graph/manual/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
       <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/group"/>
      </component>
     </collection>
@@ -141,7 +141,7 @@
     </collection>
     <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
      <component unofficial="yes" name="ossrv_test" long-name="Generic OS Services Test" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/os/ossrv/ossrv_plat/libutils/group"/>
@@ -150,11 +150,11 @@
       <unit bldFile="/sf/os/ossrv/group"/>
      </component>
      <component unofficial="yes" name="ossrv_pub" long-name="Generic OS Services Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
       <unit bldFile="/sf/os/ossrv/ossrv_pub/group"/>
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
      </component>
     <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
--- a/3k/os/persistentdata/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/persistentdata/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,10 +5,10 @@
 <block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="featuremgmt" long-name="Feature Management" level="framework">
      <component name="featuremanager" long-name="Feature Manager" origin-model="foundation">
-      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/clientdll/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/featuremgmt/featuremanager/clientdll/group"/> -->
       <unit bldFile="/sf/os/devicesrv/featuremgmt/featuremanager/group"/>
-      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/serverexe/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/featuremgmt/featuremanager/serverexe/group"/> -->
+      <!-- <unit bldFile="/sf/os/devicesrv/featuremgmt/featuremanager/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="featuremgmt_build" long-name="Feature Management Build" origin-model="foundation">
       <unit bldFile="/sf/os/devicesrv/featuremgmt/group"/>
--- a/3k/os/textandloc/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/textandloc/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -37,14 +37,14 @@
      </component>
      <component name="n:itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" introduced="tb92" purpose="development" plugin="Y" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
      </component>
      <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
      </component>
      <component name="n:testfonts" long-name="Test Fonts" filter="gt" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/> -->
+      <!-- <unit bldFile="/sf/os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/> -->
      </component>
     </collection>
     <collection name="textlayout" long-name="Text Layout" level="text">
@@ -108,16 +108,16 @@
     </collection>
     <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
      <component unofficial="yes" name="textandloc_pub" long-name="Text and Localisation Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
       <unit bldFile="/sf/os/textandloc/textandloc_pub/group"/>
      </component>
      <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/group"/>
      </component>
      <component unofficial="yes" name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
       <unit bldFile="/sf/os/textandloc/textandloc_plat/group"/>
-      <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
      </component>
     <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
--- a/3k/os/xmlsrv/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/os/xmlsrv/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -54,19 +54,19 @@
     <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
      <component unofficial="yes" name="xmlsrv_plat" long-name="XML Services Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="xmlsrv_build" long-name="XML Services Build" origin-model="foundation">
       <unit bldFile="/sf/os/xmlsrv/group"/>
      </component>
      <component unofficial="yes" name="xmlsrv_pub" long-name="XML Services Public Interfaces" class="api" origin-model="foundation">
       <unit bldFile="/sf/os/xmlsrv/xmlsrv_pub/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
+      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
      </component>
     <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="/sf/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
--- a/3k/ostools/osrndtools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/ostools/osrndtools/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,97 +5,97 @@
    <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
     <collection name="stif" long-name="STIF" level="fw">
      <component name="testinterface" long-name="Test Interface" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testinterface/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/testinterface/group"/>
      </component>
      <component name="testserver" long-name="Test Server" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testserver/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/testserver/group"/>
      </component>
      <component name="testengine" long-name="Test Engine" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testengine/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/testengine/group"/>
      </component>
      <component name="testserverstarter" long-name="Test Server Starter" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testserverstarter/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/testserverstarter/group"/>
      </component>
      <component name="stiftfwif" long-name="STIF TFwIf" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/stiftfwif/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/stiftfwif/group"/>
      </component>
      <component name="consoleui" long-name="Console UI" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/consoleui/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/consoleui/group"/>
      </component>
      <component name="testcombiner" long-name="Test Combiner" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testcombiner/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/testcombiner/group"/>
      </component>
      <component name="demomodule" long-name="Demo Module" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/demomodule/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/demomodule/group"/>
      </component>
      <component name="atslogger" long-name="ATS Logger" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/atslogger/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/atslogger/group"/>
      </component>
      <component name="atsinterface" long-name="ATS Interface" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/atsinterface/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/atsinterface/group"/>
      </component>
      <component name="testscripter" long-name="Test Scripter" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/testscripter/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/testscripter/group"/>
      </component>
      <component name="suevent" long-name="SU Event" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/suevent/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/suevent/group"/>
      </component>
      <component name="stifkerneltestclassbase" long-name="STIF Kernel Test Class Base" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/stifkerneltestclassbase/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/stifkerneltestclassbase/group"/>
      </component>
      <component name="examples" long-name="Examples" origin-model="foundation">
-      <!-- <unit bldFile="ostools/osrndtools/stif/examples/stiftestmeasurementstub/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/examples/stifhwresetstub/group"/> -->
+      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/examples/stiftestmeasurementstub/group"/> -->
+      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/examples/stifhwresetstub/group"/> -->
      </component>
      <component name="testmoduletemplates" long-name="Test Module Templates" origin-model="foundation">
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/capsmodifierxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/testmodulexxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
+      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
+      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
+      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/capsmodifierxxx/group"/> -->
+      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/testmodulexxx/group"/> -->
+      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
+      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
      </component>
      <component unofficial="yes" name="stif_build" long-name="STIF Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/stif/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/stif/group"/>
      </component>
     </collection>
     <collection name="memspy" long-name="Memspy" level="trace">
      <component name="driver" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/driver/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/memspy/driver/group"/>
      </component>
      <component name="memspy_engine" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/engine/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/memspy/engine/group"/>
      </component>
      <component name="commandline" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/commandline/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/memspy/commandline/group"/>
      </component>
      <component name="console" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/console/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/memspy/console/group"/>
      </component>
      <component unofficial="yes" name="memspy_build" long-name="Memspy Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/memspy/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/memspy/group"/>
      </component>
     </collection>
     <collection name="hti" long-name="HTI" level="trace">
      <component name="hticfg" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/hticfg/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/hti/hticfg/group"/>
      </component>
      <component name="htiautostart" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/htiautostart/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/hti/htiautostart/group"/>
      </component>
      <component name="htiframework" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/htiframework/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/hti/htiframework/group"/>
      </component>
      <!-- Empty duplicate component HtiCommPlugins removed -->
      <!-- Empty duplicate component HtiServicePlugins removed -->
      <component name="htifilehlp" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/htifilehlp/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/hti/htifilehlp/group"/>
      </component>
      <component name="htiwatchdog" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/htiwatchdog/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/hti/htiwatchdog/group"/>
      </component>
      <component unofficial="yes" name="hti_build" long-name="HTI Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/hti/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/hti/group"/>
      </component>
     </collection>
     <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
@@ -110,7 +110,7 @@
     </collection>
     <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
      <component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/group"/>
      </component>
     <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
@@ -118,16 +118,16 @@
     </collection>
 	<collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
      <component unofficial="yes" name="memspy_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
      </component>
      <component unofficial="yes" name="stif_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/stif_api/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/osrndtools_plat/stif_api/group"/>
      </component>
      <component unofficial="yes" name="hti_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/hti_api/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/osrndtools_plat/hti_api/group"/>
      </component>
      <component unofficial="yes" name="open_system_trace_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
+      <unit bldFile="/sf/ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
      </component>
     </collection>
    </block>
--- a/3k/tools/homescreentools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/tools/homescreentools/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,22 +5,22 @@
    <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"/>
+      <unit bldFile="/sf/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"/>
+      <unit bldFile="/sf/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"/>
+      <unit bldFile="/sf/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"/>
+      <unit bldFile="/sf/tools/homescreentools/group"/>
      </component>
     </collection>
    </block>
--- a/3k/tools/platformtools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/tools/platformtools/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,15 +5,15 @@
    <block name="platformtools" long-name="Platform Tools" tech_domain="to" level="generic">
     <collection name="gfxconversion" long-name="Graphics Conversion">
      <component name="bmconv_s60" long-name="Bm Conv S60" origin-model="foundation">
-      <unit bldFile="tools/platformtools/gfxconversion/bmconv_s60/group"/>
+      <unit bldFile="/sf/tools/platformtools/gfxconversion/bmconv_s60/group"/>
      </component>
      <component name="mifconv" long-name="Mifconv" origin-model="foundation">
-      <unit bldFile="tools/platformtools/gfxconversion/mifconv/group"/>
+      <unit bldFile="/sf/tools/platformtools/gfxconversion/mifconv/group"/>
      </component>
     </collection>
     <collection name="platformtools_info" long-name="Platform Tools Info">
      <component unofficial="yes" name="platformtools_build" long-name="Platform Tools Build" origin-model="foundation">
-      <unit bldFile="tools/platformtools/group"/>
+      <unit bldFile="/sf/tools/platformtools/group"/>
      </component>
     </collection>
    </block>
--- a/3k/tools/rndtools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/tools/rndtools/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,70 +5,70 @@
    <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
     <collection name="creator" long-name="Creator" level="app">
      <component name="creator_build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/creator/group"/>
+      <unit bldFile="/sf/tools/rndtools/creator/group"/>
      </component>
     </collection>
     <collection name="filebrowser" long-name="File Browser" level="specific">
      <component name="fileopserver" long-name="File Op Server" origin-model="foundation">
-      <unit bldFile="tools/rndtools/filebrowser/fileopserver/group"/>
+      <unit bldFile="/sf/tools/rndtools/filebrowser/fileopserver/group"/>
      </component>
      <component name="fileopclient" long-name="File Op Client" origin-model="foundation">
-      <unit bldFile="tools/rndtools/filebrowser/fileopclient/group"/>
+      <unit bldFile="/sf/tools/rndtools/filebrowser/fileopclient/group"/>
      </component>
      <component name="filebrowser_build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/filebrowser/group"/>
+      <unit bldFile="/sf/tools/rndtools/filebrowser/group"/>
      </component>
     </collection>
     <collection name="launcher" long-name="Launcher" level="specific">
      <component name="launcher_build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/launcher/group"/>
+      <unit bldFile="/sf/tools/rndtools/launcher/group"/>
      </component>
     </collection>
     <collection name="screengrabber" long-name="Screen Grabber" level="specific">
      <component name="screengrabber_build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/screengrabber/group"/>
+      <unit bldFile="/sf/tools/rndtools/screengrabber/group"/>
      </component>
     </collection>
     <collection name="stifui" long-name="STIF UI" level="generic">
      <component name="stifui_stifui" long-name="STIF UI" origin-model="foundation">
-      <unit bldFile="tools/rndtools/stifui/stifui/group"/>
+      <unit bldFile="/sf/tools/rndtools/stifui/stifui/group"/>
      </component>
      <component name="uitestserverstarter" long-name="UI Test Server Starter" origin-model="foundation">
-      <unit bldFile="tools/rndtools/stifui/uitestserverstarter/group"/>
+      <unit bldFile="/sf/tools/rndtools/stifui/uitestserverstarter/group"/>
      </component>
      <component unofficial="yes" name="stifui_build" long-name="STIF UI Build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/stifui/group"/>
+      <unit bldFile="/sf/tools/rndtools/stifui/group"/>
      </component>
     </collection>
     <collection name="loadgen" long-name="Load Generator" level="app">
      <component name="loadgen_build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/loadgen/group"/>
+      <unit bldFile="/sf/tools/rndtools/loadgen/group"/>
      </component>
     </collection>
     <collection name="perfmon" long-name="Performance Monitor" level="app">
      <component name="perfmon_build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/perfmon/group"/>
+      <unit bldFile="/sf/tools/rndtools/perfmon/group"/>
      </component>
     </collection>
     <collection name="htiui" long-name="HTI UI" level="generic">
      <!-- Empty duplicate component HtiCommPlugins removed -->
      <!-- Empty duplicate component HtiServicePlugins removed -->
      <component name="htidevicereboot" long-name="HTI DeviceR eboot" origin-model="foundation">
-      <unit bldFile="tools/rndtools/htiui/htidevicereboot/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/htidevicereboot/group"/>
      </component>
      <component name="htistartupwait" long-name="HTI Startup Wait" origin-model="foundation">
-      <unit bldFile="tools/rndtools/htiui/htistartupwait/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/htistartupwait/group"/>
      </component>
      <component name="htiadmin" long-name="HTI Admin" origin-model="foundation">
-      <unit bldFile="tools/rndtools/htiui/htiadmin/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/htiadmin/group"/>
      </component>
      <component unofficial="yes" name="htiui_build" long-name="HTI UI Build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/htiui/group"/>
+      <unit bldFile="/sf/tools/rndtools/htiui/group"/>
      </component>
     </collection>
     <collection name="memspyui" long-name="Memspy UI" level="generic">
      <component name="memspyui_build" origin-model="foundation">
-      <unit bldFile="tools/rndtools/memspyui/group"/>
+      <unit bldFile="/sf/tools/rndtools/memspyui/group"/>
      </component>
     </collection>
    </block>
--- a/3k/tools/swconfigtools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
+++ b/3k/tools/swconfigtools/package_definition.xml	Mon Aug 10 14:00:06 2009 +0100
@@ -5,7 +5,7 @@
    <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
     <collection name="gid_pc_tool" long-name="GID PC Tool">
      <component name="dbimporter" long-name="DB Importer" origin-model="foundation">
-      <unit bldFile="tools/swconfigtools/gid_pc_tool/group"/>
+      <unit bldFile="/sf/tools/swconfigtools/gid_pc_tool/group"/>
      </component>
     </collection>
    </block>