--- a/symbian3/single/sysdefs/system_model.xml	Fri Jan 15 15:16:55 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Fri Jan 15 18:09:39 2010 +0000
@@ -17,7 +17,7 @@
 </block>
 
 <block name="qemu" long-name="Syborg Adaptation" level="hw-if" levels="hw-if">
-<collection id="baseport" name="Baseport" level="hw-if"> 
+<collection id="baseport" name="Baseport" level="hw-if">
 <component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional" plugin="N">
 <unit bldFile="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
 </component>
@@ -691,12 +691,12 @@
 
 
 
-<component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1" purpose="optional" plugin="N">
+<!--  <component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1" purpose="optional" plugin="N">
 <unit bldFile="/sf/mw/appsupport/tzservices/worldserver/group" mrp="/sf/mw/appsupport/tzservices/worldserver/group/app-services_worldserver.mrp"/>
-</component>
-<component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" purpose="development" plugin="N">
+</component> -->
+<!--  <component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" purpose="development" plugin="N">
 <unit bldFile="/sf/mw/appsupport/tzservices/worldservertest/TestWorldSrv" mrp="/sf/mw/appsupport/tzservices/worldservertest/TestWorldSrv/app-services_testworldsrv.mrp"/>
-</component>
+</component> -->
 
 </collection>
 <collection name="contenthandling" long-name="Content Handling" level="plugin">
@@ -1108,14 +1108,14 @@
 <unit mrp="/sf/mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
 </component>
 </collection>
-<collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
+<!--<collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
 <component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91" purpose="development" plugin="N">
 <unit bldFile="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
 </component>
 <component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" purpose="development" plugin="N">
 <unit mrp="/sf/mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
 </component>
-</collection>
+</collection> -->
 <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
 <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N">
 <unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
@@ -1291,12 +1291,12 @@
 </component>
 </collection>
 <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
-<component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional" plugin="N">
+<!--  <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional" plugin="N">
 <unit bldFile="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group" mrp="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group/connectivity_legacy_plp_plpremotelink.mrp"/>
-</component>
-<component name="plpvariant" long-name="PLP Variant" deprecated="9.0" purpose="optional" plugin="N">
+</component> -->
+<!--   <component name="plpvariant" long-name="PLP Variant" deprecated="9.0" purpose="optional" plugin="N">
 <unit bldFile="/sf/mw/remoteconn/connectivitytransports/plpvariant/group" mrp="/sf/mw/remoteconn/connectivitytransports/plpvariant/group/connectivity_legacy_plp_plpvariant.mrp"/>
-</component>
+</component> -->
 </collection>
 <collection name="mtptransports" long-name="MTP Transports" level="plugin">
 <component name="mtpusbtransport" long-name="MTP USB Transport" introduced="tb91" purpose="optional" plugin="Y">
@@ -2059,7 +2059,7 @@
       </component>
           <component name="activitymanager" long-name="Activity Manager" introduced="ER5" purpose="mandatory" plugin="N">
         <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-      </component>  
+      </component>
     </collection>
 <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
 <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91" purpose="optional" plugin="N">
@@ -2132,18 +2132,18 @@
   <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
 </component>
 </collection>
-<collection name="openWF" long-name="OpenWF"> 
+<collection name="openWF" long-name="OpenWF">
 <component name="openwfcinterface" long-name="openwfcinterface" purpose="optional" plugin="N">
-  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group"/> 
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group"/>
 </component>
 <component name="openwfcompositionengine" long-name="openwfcompositionengine" purpose="optional" plugin="N">
-  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group"/> 
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group"/>
 </component>
 <component name="openwfsupport" long-name="openwfsupport" purpose="optional" plugin="N">
-  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group"/> 
+  <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group"/>
 </component>
 <component name="surfaceupdate" long-name="surfaceupdate" purpose="optional" plugin="N">
-  <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group"/> 
+  <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group"/>
 </component>
 </collection>
 <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
@@ -2186,7 +2186,7 @@
 <unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
 </component>
      <component name="windowserverplugins" long-name="Window Server Plugins" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group"/> 
+      <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group"/>
      </component>
 </collection>
 <collection name="printingservices" long-name="Printing Services" level="app-if">
@@ -2205,7 +2205,7 @@
 <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
 <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional" plugin="N">
 <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-<unit bldFile="/sf/os/graphics/opengles/openglesinterface/group/opengles_stub"/> 
+<unit bldFile="/sf/os/graphics/opengles/openglesinterface/group/opengles_stub"/>
 </component>
 </collection>
 <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
@@ -2213,7 +2213,7 @@
 <unit bldFile="/sf/os/graphics/openvg/openvginterface/group" mrp="/sf/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
 </component>
 <component name="openvg11" long-name="OpenVG11" level="internal-adaptations" purpose="optional" plugin="N">
- <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>  
+ <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>
 </component>
 </collection>
 <collection name="egl" long-name="EGL" level="internal-adaptations">
@@ -2221,10 +2221,10 @@
 <unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
 </component>
 <component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
- <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group/"/>  
+ <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group/"/>
 </component>
 <component name="n:eglswitch" long-name="EGL Emulator Switch" purpose="optional" plugin="N">
- <unit bldFile="/sf/os/graphics/egl/eglswitch/group/"/>  
+ <unit bldFile="/sf/os/graphics/egl/eglswitch/group/"/>
 </component>
 </collection>
 <collection name="KhronosReferenceImplementation" long-name="Khronos Reference Implementation" level="device-interface">
@@ -2528,22 +2528,25 @@
 <unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
 </component>
 <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp"/>
+<unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="/sf/mm/imagingandcamerafws/imagingunittest/group" />
 </component>
 <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
+<unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="/sf/mm/imagingandcamerafws/imaginginttest/group"   />
 </component>
 <component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional" plugin="N">
 <unit bldFile="/sf/os/mm/imagingandcamerafws/camerafw/group" mrp="/sf/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
 </component>
 <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
+<unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"  bldFile="/sf/mm/imagingandcamerafws/cameraunittest/group"  />
 </component>
 </collection>
 <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
 <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory" plugin="N">
 <unit bldFile="/sf/os/mm/mmlibs/mmutilitylib/group" mrp="/sf/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
 </component>
+<component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory" plugin="N">
+<unit bldFile="/sf/mm/mmlibs/mmfw/group" mrp="mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+</component>
 </collection>
 <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
 <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
@@ -2556,7 +2559,10 @@
 <unit bldFile="/sf/os/mm/mmplugins/lib3gp/group" mrp="/sf/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
 </component>
 <component name="lib3gpunittest" long-name="3GP Unit Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
+<unit mrp="/sf/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="/sf/mm/mmplugins/lib3gpunittest/group" />
+</component>
+<component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y">
+<unit bldFile="/sf/mm/mmplugins/mmfwplugins/group" mrp="mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
 </component>
 </collection>
 <collection name="mm_info" long-name="Multimedia Info" level="app-if">
@@ -2580,11 +2586,15 @@
 </component>
 
 <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
-</component>
-<component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory" plugin="N">
+<unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"  bldFile="/sf/mm/mmdevicefw/mdfunittest/group" />
+</component>
+<component name="speechrecogsupport" long-name="Speech Recognition Support" introduced="7.0s" purpose="mandatory" plugin="N">
+<unit bldFile="/sf/mm/mmdevicefw/speechrecogsupport/group" mrp="mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+</component>
+
+<!--   <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory" plugin="N">
 <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
-</component>
+</component> -->
 </collection>
 <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
 <component name="videorenderer" long-name="Video Renderer" introduced="tb92" purpose="optional" plugin="N">
@@ -2593,19 +2603,26 @@
 </collection>
 <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
 <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"/>
+<unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"  bldFile="/sf/mm/mmtestenv/mmtestfw/group" />
 </component>
 <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp"/>
+<unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="/sf/mm/mmtestenv/mmtestfwunittest/group" />
 </component>
 <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
+<unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"  bldFile="/sf/mm/mmtestenv/mmtestagent/group" />
 </component>
 <component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp"/>
-</component>
-</collection>
+<unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="/sf/mm/mmtestenv/mmtesttools/Group" />
+</component>
+</collection>
+
+
+
 <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
+<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional" plugin="N">
+<unit bldFile="/sf/mm/omxil/omxilcomponentcommon/group" mrp="mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+</component>
+
 <component name="omxilapi" long-name="OpenMAX IL API" introduced="tb92" purpose="optional" plugin="N">
 <unit bldFile="/sf/os/mm/omxil/omxilapi/group" mrp="/sf/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp" version="1"/>
 
@@ -2614,16 +2631,19 @@
 <unit bldFile="/sf/os/mm/omxil/omxilcore/group" mrp="/sf/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp" version="1"/>
 
 </component>
+<component name="omxilcomponentcommon" long-name="OpenMAX IL Component Framework" introduced="^3" purpose="optional" plugin="N">
+<unit bldFile="mm/omxil/omxilcomponentcommon/group" mrp="mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp" version="1"/>
+</component>
 
 <component name="omxilrefcomps" long-name="OpenMAX IL Reference Components" introduced="tb92" purpose="optional" plugin="N">
 <unit bldFile="/sf/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/sf/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp" version="1"/>
 
 </component>
 <component name="omxilunittest" long-name="OpenMAX IL Unit Tests" introduced="tb92" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp"/>
+<unit mrp="/sf/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="/sf/mm/omxil/omxilunittest/group" />
 </component>
 <component name="omxilcoreconftest" long-name="OpenMAX IL Core Conformance Suite" introduced="tb92" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp"/>
+<unit mrp="/sf/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="/sf/mm/omxil/omxilcoreconftest/group" />
 </component>
 <component name="mmilapi" long-name="Multimedia Integration Layer API" introduced="tb92" purpose="development" plugin="N">
 <unit bldFile="/sf/os/mm/omxil/mmilapi/group" mrp="/sf/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
@@ -2631,11 +2651,9 @@
 </collection>
 <collection name="devsound" long-name="Sound Device" level="devices">
 <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory" plugin="N">
-
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
-
-
-</component>
+<unit bldFile="/sf/mm/devsound/devsoundapi/group" mrp="mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+</component>
+
 <component name="a3fdevsound" long-name="A3F DevSound" introduced="tb91" purpose="optional" plugin="N">
 <unit bldFile="/sf/os/mm/devsound/a3fdevsound/group" mrp="/sf/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
 </component>
@@ -2643,28 +2661,19 @@
 <unit bldFile="/sf/os/mm/devsound/a3facf/group" mrp="/sf/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
 </component>
 <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional" plugin="N">
-
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
-
-
+<unit bldFile="/sf/mm/devsound/devsoundpluginsupport/group" mrp="mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
 </component>
 <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional" plugin="N">
-
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
-
-
+<unit bldFile="/sf/mm/devsound/devsoundrefplugin/group" mrp="mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
 </component>
 <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y">
-
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-
-
+<unit bldFile="/sf/mm/devsound/sounddevbt/group" mrp="mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
 </component>
 <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb91" purpose="development" plugin="N">
 <unit bldFile="/sf/os/mm/devsound/a3ftrace/group" mrp="/sf/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
 </component>
 <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
+<unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="/sf/mm/devsound/a3fintegrationtest/group" />
 </component>
 <component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb91" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
@@ -2672,10 +2681,7 @@
 </collection>
 <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional" plugin="N">
-
-<unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
-
-
+<unit bldFile="/sf/mm/devsound/hwdevapi/group" mrp="mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
 <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb91" purpose="development" plugin="N">
 <unit bldFile="/sf/os/mm/mmhais/a3facl/group" mrp="/sf/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
@@ -2693,7 +2699,7 @@
 <unit bldFile="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
 </component>
 <component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
+<unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="/sf/mm/mmhais/dvbhunittest/hai/dvbh/group"/>
 </component>
 </collection>
 
@@ -2703,13 +2709,13 @@
 <unit mrp="/sf/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
 </component>
 <component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp"/>
+<unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="/sf/mm/mmapitest/devvideohaitest/group" />
 </component>
 <component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp"/>
+<unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp"  bldFile="/sf/mm/mmapitest/devsoundhaitest/group"/>
 </component>
 <component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development" plugin="N">
-<unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp"/>
+<unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="/sf/mm/mmapitest/devsoundexthaitest/group" />
 </component>
 </collection>
 <collection name="s60">