diff -r 4469f26a2533 -r a44ae815a47f symbian3/os/devicesrv/package_definition.xml
--- a/symbian3/os/devicesrv/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/os/devicesrv/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,196 +54,375 @@
 <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">
-    <collection name="accessoryservices" long-name="Accessory Services" level="framework">
-     <component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
-     </component>
-     <component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-     </component>
-     <component name="accessoryserver" filter="s60" long-name="Accessory Server">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/group"/>
-     </component>
-     <component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
-     </component>
-     <component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-     </component>
-     <component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/group"/>
-     </component>
-     <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-     </component>
-     <component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
-     </component>
-    </collection>
-    <collection name="commonservices" long-name="Common Services" level="app-if">
-     <component name="commonengine" filter="s60" long-name="Common Engine">
-      <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/group"/>
-     </component>
-     <component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
-      <unit bldFile="/sf/os/devicesrv/commonservices/commonengineresources/group"/>
-     </component>
-     <component name="platformenv" filter="s60" long-name="Platform Environment">
-      <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/group"/>
-     </component>
-     <component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
-      <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group" mrp="/sf/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
-     </component>
-     <component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
-      <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
-     </component>
-    </collection>
-    <collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
-     <component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
-      <unit bldFile="/sf/os/devicesrv/dosservices/commondsy/group"/>
-     </component>
-     <component name="dosserver" filter="s60" long-name="Domestic OS Server">
-      <unit bldFile="/sf/os/devicesrv/dosservices/dosserver/group"/>
-     </component>
-    </collection>
-    <collection name="sensorservices" long-name="Sensor Services" level="framework">
-     <component name="sensorserver" filter="s60" long-name="Sensor Server">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/group"/>
-     </component>
-     <component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/orientationssy/group"/>
-     </component>
-     <component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-     </component>
-     <component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/group"/>
-     </component>
-    </collection>
-    <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-     <component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-     </component>
-     <component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-     </component>
-     <component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-     </component>
-     <component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-     </component>
-     <component name="hapticsserver" filter="s60" long-name="Haptics Server">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-     </component>
-     <component name="hapticsclient" filter="s60" long-name="Haptics Client">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-     </component>
-     <component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
-      <!-- move these exports into the appropriate above components and delete this component-->
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/group"/>
-     </component>
-    </collection>
-    <collection name="mediator" long-name="Mediator" level="app-if">
-     <!--collection is really a component. Move it down a directory -->
-     <component name="mediator_build" filter="s60" long-name="Mediator Build">
-      <unit bldFile="/sf/os/devicesrv/mediator/group"/>
-     </component>
-    </collection>
-    <collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
-     <component name="psmserver" filter="s60" long-name="PSM Server">
-      <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/group"/>
-     </component>
-    </collection>
-    <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
-      <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, 
+<collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
+<component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
+</component>
+<component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+</component>
+<component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+</component>
+<component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+</component>
+<component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+</component>
+<component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+</component>
+<component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/version_info_api/group"/>
+</component>
+<component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+</component>
+<component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/haptics_api/group"/>
+</component>
+<component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+</component>
+</collection>
+<collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
+<component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+</component>
+<component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+</component>
+<component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+</component>
+<component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+</component>
+<component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+</component>
+<component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+</component>
+<component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+</component>
+<component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+</component>
+<component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+</component>
+<component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+</component>
+<component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_api/group"/>
+</component>
+<component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+</component>
+<component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+</component>
+<component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+</component>
+<component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+</component>
+<component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+</component>
+<component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+</component>
+<component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+</component>
+<component name="sae_api" long-name="SAE API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/sae_api/group"/>
+</component>
+<component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+</component>
+<component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+</component>
+<component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+</component>
+<component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+</component>
+<component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+</component>
+<component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+</component>
+<component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+</component>
+<component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+</component>
+<component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+</component>
+<component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+</component>
+<component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+</component>
+<component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+</component>
+<component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+</component>
+<component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+</component>
+<component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+</component>
+<component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+</component>
+<component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+</component>
+<component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+</component>
+<component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/powersave_api/group"/>
+</component>
+<component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+</component>
+<component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+</component>
+<component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+</component>
+<component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+</component>
+<component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+</component>
+<component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+</component>
+<component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+</component>
+<component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+</component>
+<component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+</component>
+<component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+</component>
+<component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+</component>
+<component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+</component>
+<component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
+<unit bldFile="/sf/os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+</component>
+</collection>
+<collection name="accessoryservices" long-name="Accessory Services" level="framework">
+<component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
+</component>
+<component name="accessoryremotecontrol" filter="s60" long-name="Accessory Remote Control">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+</component>
+<component name="accessoryserver" filter="s60" long-name="Accessory Server">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/group"/>
+</component>
+<component name="pluggeddisplay" filter="s60" long-name="Plugged Display" introduced="^3">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+</component>
+<component name="headsetstatusapi" filter="s60" long-name="Headset Status API">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+</component>
+<component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/group"/>
+</component>
+<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+</component>
+<component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
+<unit bldFile="/sf/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+</component>
+</collection>
+<collection name="commonservices" long-name="Common Services" level="app-if">
+<component name="commonengine" filter="s60" long-name="Common Engine">
+<unit bldFile="/sf/os/devicesrv/commonservices/commonengine/group"/>
+</component>
+<component name="commonengineresources" filter="s60" long-name="Common Engine Resources" class="config">
+<unit bldFile="/sf/os/devicesrv/commonservices/commonengineresources/group"/>
+</component>
+<component name="platformenv" filter="s60" long-name="Platform Environment">
+<unit bldFile="/sf/os/devicesrv/commonservices/platformenv/group"/>
+</component>
+<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
+<unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group" mrp="/sf/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+</component>
+<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
+<unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group" mrp="/sf/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+</component>
+</collection>
+<collection name="dosservices" long-name="Domestic Operating System Services" level="hw-if">
+<component name="commondsy" filter="s60" long-name="Common DSY" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/dosservices/commondsy/group"/>
+</component>
+<component name="dosserver" filter="s60" long-name="Domestic OS Server">
+<unit bldFile="/sf/os/devicesrv/dosservices/dosserver/group"/>
+</component>
+</collection>
+<collection name="sensorservices" long-name="Sensor Services" level="framework">
+<component name="sensorserver" filter="s60" long-name="Sensor Server">
+<unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/group"/>
+</component>
+<component name="orientationssy" filter="s60" long-name="Orientation SSY" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/sensorservices/orientationssy/group"/>
+</component>
+<component name="tiltcompensationssy" filter="s60" long-name="Tilt Compensation SSY" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+</component>
+<component name="sensordatacompensator" filter="s60" long-name="Sensor Data Compensator">
+<unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/group"/>
+</component>
+</collection>
+<collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
+<component name="hapticseffectdatagetterfw" filter="s60" long-name="Haptics Effect Data Getter Framework">
+<unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+</component>
+<component name="hapticspluginservice" filter="s60" long-name="Haptics Plugin Service">
+<unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+</component>
+<component name="hapticspacketizer" filter="s60" long-name="Haptics Packetizer">
+<unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+</component>
+<component name="hapticspluginmanager" filter="s60" long-name="Haptics Plugin Manager">
+<unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+</component>
+<component name="hapticsserver" filter="s60" long-name="Haptics Server">
+<unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+</component>
+<component name="hapticsclient" filter="s60" long-name="Haptics Client">
+<unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+</component>
+<component name="hwrmhaptics_build" filter="s60" long-name="HWRM Haptics Build">
+<!-- move these exports into the appropriate above components and delete this component-->
+<unit bldFile="/sf/os/devicesrv/hwrmhaptics/group"/>
+</component>
+</collection>
+<collection name="mediator" long-name="Mediator" level="app-if">
+<!--collection is really a component. Move it down a directory -->
+<component name="mediator_build" filter="s60" long-name="Mediator Build">
+<unit bldFile="/sf/os/devicesrv/mediator/group"/>
+</component>
+</collection>
+<collection name="psmservices" long-name="Power Save Mode Services" level="app-if">
+<component name="psmserver" filter="s60" long-name="PSM Server">
+<unit bldFile="/sf/os/devicesrv/psmservices/psmserver/group"/>
+</component>
+</collection>
+<collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
+<component name="hwrmfmtxwatcherplugin" filter="s60" long-name="HWRM FM Transmitter Watcher Plugin" plugin="Y">
+<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"/> -->
-     </component>
-     <component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
-     </component>
-     <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
-     </component>
-     <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.
+<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+</component>
+<component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
+<unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
+</component>
+<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
+<unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+</component>
+<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 -->
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
-     </component>
-     <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-     </component>
-    </collection>
-    <collection name="sysstatemgmt" long-name="System State Management" level="server">
-     <component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
-     </component>
-     <component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
-     </component>
-     <component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
-     </component>
-     <component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
-     </component>
-     <component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
-     </component>
-     <component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/syslangutil/group"/>
-     </component>
-     <component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysrestart/group"/>
-     </component>
-     <component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
-     </component>
-     <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-     </component>
-     <component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
-     </component>
-     <component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
-     </component>
-     <component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
-     </component>
-    </collection>
-    <collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
-     <component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
-      <unit bldFile="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
-     </component>
-    </collection>
-    <collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-     <component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
-      <unit bldFile="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
-     </component>
-    </collection>
-    <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
-    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-     <component name="devicesrv_plat" filter="s60" long-name="Device Services Platform Interfaces" class="api">
-      <unit bldFile="/sf/os/devicesrv/devicesrv_plat/group"/>
-     </component>
-     <component name="devicesrv_pub" filter="s60" long-name="Device Services Public Interfaces" class="api">
-      <unit bldFile="/sf/os/devicesrv/devicesrv_pub/group"/>
-      <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group" filter="bldmefirst"/>
-      <!-- separate to another component? -->
-     </component>
-     <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
-      <unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
+<unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
+</component>
+<component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+<unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+</component>
+</collection>
+<collection name="sysstatemgmt" long-name="System State Management" level="server">
+<component name="ssmmapperutility" filter="s60" long-name="SSM Mapper Utility" introduced="^3">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+</component>
+<component name="ssmpolicyplugins" filter="s60" long-name="SSM Policy Plugins" introduced="^3" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+</component>
+<component name="ssmutilityplugins" filter="s60" long-name="SSM Utility Plugins" introduced="^3" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+</component>
+<component name="ssmcmdlists" filter="s60" long-name="SSM Command Lists" introduced="^3">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+</component>
+<component name="ssmcustcmds" filter="s60" long-name="SSM Custom Commands" introduced="^3">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+</component>
+<component name="syslangutil" filter="s60" long-name="System Language Utility" introduced="^3">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/syslangutil/group"/>
+</component>
+<component name="sysrestart" filter="s60" long-name="System Restart" introduced="^3">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysrestart/group"/>
+</component>
+<component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+</component>
+<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+</component>
+<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+</component>
+<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+</component>
+<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+</component>
+</collection>
+<collection name="resourceinterfaces" long-name="Resource Interfaces" level="hw-if">
+<component name="fmtransmittercontrol" long-name="FM Transmitter Control" introduced="^3" purpose="optional">
+<unit bldFile="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/sf/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+</component>
+</collection>
+<collection name="systemhealthmanagement" long-name="System Health Management" level="server">
+<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
+<unit bldFile="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/sf/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+</component>
+</collection>
+<collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
+<collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+<component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
+<unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file