diff -r 424ba1d4ccef -r c8d3143d3c0e symbian3/app/location/package_definition_3.0.xml
--- a/symbian3/app/location/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/app/location/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -55,42 +55,59 @@
       </component>
     </collection>
     <collection id="locationlandmarksrefappfors60" name="Location Landmarks Reference App for S60" level="apps">
+   		<!-- this is a component, needs to be moved down a directory -->
       <component id="lmrefapp" filter="s60" name="Landmarks Reference Application">
         <unit bldFile="locationlandmarksrefappfors60/group"/>
       </component>
     </collection>
     <collection id="locationlandmarksuirefapp" name="Location Landmarks UI Reference App" level="apps">
+   		<!-- this is a component, needs to be moved down a directory -->
       <component id="lmuirefapp" filter="s60" name="Landmarks UI Reference Application">
         <unit bldFile="locationlandmarksuirefapp/group"/>
       </component>
     </collection>
     <collection id="locationsatviewrefapp" name="Location Satellite View Reference App" level="apps">
+   		<!-- this is a component, needs to be moved down a directory -->
       <component id="satellitereference" filter="s60" name="Satellite Info UI Reference Application">
         <unit bldFile="locationsatviewrefapp/group"/>
       </component>
     </collection>
     <collection id="simpsyconfigurator" name="Simulation PSY Configurator" level="ui">
+   		<!-- this is a component, needs to be moved down a directory -->    
       <component id="simpsyui" filter="s60" name="Simulation PSY UI">
         <unit bldFile="simpsyconfigurator/group"/>
       </component>
     </collection>
     <collection id="mapnavproviderrefapp" name="Map and Navigation Provider Reference App" level="apps">
+   		<!-- this is a component, needs to be moved down a directory -->    
       <component id="mapnavproviderrefapp_build" filter="s60" name="Map and Navigation Provider Reference Application">
         <unit bldFile="mapnavproviderrefapp/group"/>
       </component>
     </collection>
+    <collection id="locationcentre" name="Location Centre" level="loc">
+	<component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
+		<unit bldFile="locationcentre/lcutils/group"/>
+	</component>
+	<component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
+		<unit bldFile="locationcentre/lcservice/group"/>
+	</component>
+	<component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
+		<unit bldFile="locationcentre/lcserver/group"/>
+	</component>
+	<component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
+		<unit bldFile="locationcentre/lcapp/group"/>
+	</component>
+	<component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
+		<!-- consider distributing this into the other components or collapsing into a single component -->
+		<unit bldFile="locationcentre/group" />
+	</component>
+</collection>
     <collection id="location_info" name="Location Apps Info" level="loc">
-      <component id="location_test" filter="s60" purpose="development" name="Location Apps Test">
-       	<!-- should this be uncommented? -->
-        <!-- <unit bldFile="tsrc/group"/> -->
-      </component>
       <component id="loc_pub" filter="s60" class="api" name="Location Apps Public Interfaces">
         <unit bldFile="loc_pub/group"/>
-       	<!-- what to do with these test units? -->
-        <!-- <unit bldFile="loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
-        <!-- <unit bldFile="loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
-        <!-- <unit bldFile="loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
-        <!-- <unit bldFile="loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
+      </component>
+      <component id="loc_plat" filter="s60" class="api" name="Location Apps Platform Interfaces" introduced="^3">
+        <unit bldFile="loc_plat/group"/>
       </component>
     </collection>
   </package>