--- a/symbian3/mw/remotestorage/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/mw/remotestorage/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,45 +54,45 @@
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
-    <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-     <component name="mountstore" filter="s60" long-name="RSFW Mount Store">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountstore/group"/>
-     </component>
-     <component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-     </component>
-     <component name="remotefileengine" filter="s60" long-name="Remote File Engine">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-     </component>
-     <component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountmanager/group"/>
-     </component>
-     <component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-     </component>
-     <component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-     </component>
-     <component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
-      <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-      <!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
-     </component>
-     <component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
-      <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
-      <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
-     </component>
-     <component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-      <!-- move exports to other components.
+<collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
+<component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
+<unit bldFile="/sf/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+</component>
+</collection>
+<collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
+<component name="mountstore" filter="s60" long-name="RSFW Mount Store">
+<unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountstore/group"/>
+</component>
+<component name="rsfwnotifierplugins" filter="s60" long-name="RSFW Notifier Plugins" plugin="Y">
+<unit bldFile="/sf/mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
+</component>
+<component name="remotefileengine" filter="s60" long-name="Remote File Engine">
+<unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefileengine/group"/>
+</component>
+<component name="mountmanager" filter="s60" long-name="RSFW Mount Manager">
+<unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountmanager/group"/>
+</component>
+<component name="webdavaccessplugin" filter="s60" long-name="WebDAV Access Plugin" plugin="Y">
+<unit bldFile="/sf/mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
+</component>
+<component name="remotefilesystemplugin" filter="s60" long-name="Remote Filesystem Plugin" plugin="Y">
+<unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
+</component>
+<component name="remotestoragegsplugin" filter="s60" long-name="RS GS Plugin" plugin="Y">
+<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+<!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
+</component>
+<component name="remotedriveconfigurationbiocontrol" filter="s60" long-name="Remote Drive Configuration BIO Control">
+<!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+<!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
+</component>
+<component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
+<!-- move exports to other components.
 				This is needed for #includes of configured component until congigiration is in place -->
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/group"/>
-     </component>
-    </collection>
-    <collection name="remotestorage_info" long-name="Remote Storage Info" level="if">
-     <component name="rsfw_plat" filter="s60" long-name="Remote Storage Platform Interfaces" class="api">
-      <unit bldFile="/sf/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-     </component>
-    </collection>
-   </block>
+<unit bldFile="/sf/mw/remotestorage/remotestoragefw/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file