--- a/tip_bulk_s3/app/location/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
+++ b/tip_bulk_s3/app/location/package_definition.xml	Wed Dec 01 15:34:13 2010 +0000
@@ -87,11 +87,9 @@
 <component name="msgviewer" filter="s60" long-name="Landmarks Message Viewer">
 <unit bldFile="/sf/app/location/landmarksui/msgviewer/group"/>
 </component>
-<component name="landmarksui_loc" filter="s60" long-name="Landmarks UI Localisation">
-<unit bldFile="/sf/app/location/landmarksui/loc"/>
-</component>
-<component name="landmarksui_rom" filter="s60" long-name="Landmarks UI ROM">
-<unit bldFile="/sf/app/location/landmarksui/rom"/>
+<component name="landmarksui_build" filter="s60" long-name="Landmarks UI Build">
+<!-- consider distributing this into the other components or collapsing into a single component -->
+<unit bldFile="/sf/app/location/landmarksui/group"/>
 </component>
 </collection>
 <collection name="eventsui" long-name="Location Events UI" level="events">
@@ -113,17 +111,9 @@
 <component name="eventsmgmtui" filter="s60" long-name="Events Management UI">
 <unit bldFile="/sf/app/location/eventsui/eventsmgmtui/group"/>
 </component>
-<component name="eventsui_conf" filter="s60" long-name="Events UI Configuration">
-<unit bldFile="/sf/app/location/eventsui/conf"/>
-</component>
-<component name="eventsui_data" filter="s60" long-name="Events UI Data">
-<unit bldFile="/sf/app/location/eventsui/data"/>
-</component>
-<component name="eventsui_loc" filter="s60" long-name="Events UI Localisation">
-<unit bldFile="/sf/app/location/eventsui/loc"/>
-</component>
-<component name="eventsui_rom" filter="s60" long-name="Events UI ROM">
-<unit bldFile="/sf/app/location/eventsui/rom"/>
+<component name="eventsui_build" filter="s60" long-name="Events UI Build">
+<!-- consider distributing this into the other components or collapsing into a single component -->
+<unit bldFile="/sf/app/location/eventsui/group"/>
 </component>
 </collection>
 <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">