--- a/symbian3/single/sysdefs/auto/system_model.xml	Mon Nov 22 15:03:21 2010 +0000
+++ b/symbian3/single/sysdefs/auto/system_model.xml	Mon Nov 22 16:34:10 2010 +0000
@@ -9096,9 +9096,11 @@
 <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
 <unit bldFile="app/organizer/calendarui/caldav/group"/>
 </component>
-<component name="calendarui_build" filter="s60" long-name="Calendar UI Build">
-<!-- split contents into separate components -->
-<unit bldFile="app/organizer/calendarui/group"/>
+<component name="calendarui_exports" filter="s60" long-name="Calendar UI Exports">
+<unit bldFile="app/organizer/calendarui/exports"/>
+</component>
+<component name="calendarui_organizerplugin" filter="s60" long-name="Calendar UI Organizer Plugin">
+<unit bldFile="app/organizer/calendarui/organizerplugin/group"/>
 </component>
 </collection>
 <collection name="meetingui" long-name="Meeting UI" level="ui">
@@ -9129,9 +9131,8 @@
 <component name="clock2_help" filter="s60" long-name="Clock Help">
 <unit bldFile="app/organizer/clock2/help/group"/>
 </component>
-<component name="clock2_build" filter="s60" long-name="Clock Build">
-<!-- split contents into separate components, or just make this one component -->
-<unit bldFile="app/organizer/clock2/group"/>
+<component name="clock2_exports" filter="s60" long-name="Clock Exports">
+<unit bldFile="app/organizer/clock2/exports"/>
 </component>
 </collection>
 <collection name="notepad" long-name="Notepad" level="ui">