--- a/symbian3/single/sysdefs/auto/system_model.xml	Mon Nov 22 17:03:23 2010 +0000
+++ b/symbian3/single/sysdefs/auto/system_model.xml	Thu Nov 25 11:33:48 2010 +0000
@@ -9605,9 +9605,8 @@
 <component name="imconversationview" filter="s60" long-name="IM Conversation View">
 <unit bldFile="app/conversations/imstutils/imconversationview/group"/>
 </component>
-<component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
-<!-- remove the #includes and or moved ithe loc file into one the above components -->
-<unit bldFile="app/conversations/imstutils/group"/>
+<component name="imstutils_loc" filter="s60" long-name="IM Service Tab Utils Localisation" class="config">
+<unit bldFile="app/conversations/imstutils/loc"/>
 </component>
 </collection>
 <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
@@ -9630,9 +9629,8 @@
 <component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
 <unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
 </component>
-<component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
-<!-- can this be distributed into the above bld.infs? -->
-<unit bldFile="app/conversations/uiservicetab/group"/>
+<component name="uiservicetab_exports" filter="s60" long-name="UI Service Tab Exports">
+<unit bldFile="app/conversations/uiservicetab/exports"/>
 </component>
 </collection>
 <collection name="servicewidget" long-name="Service Widget" level="ui">
@@ -9643,9 +9641,8 @@
 <!-- does this really need to have that number in the directory name? -->
 <unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/group"/>
 </component>
-<component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
-<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
-<unit bldFile="app/conversations/servicewidget/group"/>
+<component name="servicewidget_rom" filter="s60" long-name="Service Widget ROM">
+<unit bldFile="app/conversations/servicewidget/rom"/>
 </component>
 </collection>
 <collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
@@ -9662,8 +9659,7 @@
 </collection>
 <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
 <component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
-<!-- can the exports be moved to other components? or this remade into a configuration component?-->
-<unit bldFile="app/conversations/group"/>
+<unit bldFile="app/conversations/exports"/>
 </component>
 </collection>
 </block>