--- a/symbian4/os/devicesrv/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
@@ -346,9 +346,7 @@
 <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
 </component>
 <component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
-      		may need to  -->
-<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+<unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/>
 </component>
 <component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
 <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
@@ -359,9 +357,8 @@
 <component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
 <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
-<component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
-         	This needs to be kept around until configuration is in place -->
+<component name="resourcemgmt_data" filter="s60" long-name="Resource Management Data" class="config">
+<!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
 <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
 </component>
 <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">