diff -r 6d65d5acee06 -r 96f7513ad2d7 package_definition.xml
--- a/package_definition.xml	Tue Feb 02 01:12:20 2010 +0200
+++ b/package_definition.xml	Fri Apr 16 16:15:22 2010 +0300
@@ -2,27 +2,81 @@
 <SystemDefinition schema="3.0.0">
   <package id="deviceplatformrelease" name="Device Platform Release" levels="bld mid top">
     <collection id="s60extras" name="S60 Extras" level="mid">
+    	<!-- collection is really a component. Need to move down a directory -->
       <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
         <unit bldFile="s60extras/group"/>
       </component>
     </collection>
     <collection id="s60locfiles" name="S60 Locale Files" level="mid">
       <component id="s60locfiles_build" filter="s60" name="S60 Locale Files Build" class="config" purpose="development">
+      	<!-- need to move component down a directory -->
         <unit bldFile="s60locfiles/group"/>
       </component>
+	<component id="locfiles_set1" name="Locale Files Set 1" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set1"/>
+	</component>
+	<component id="locfiles_set2" name="Locale Files Set 2" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set2"/>
+	</component>
+	<component id="locfiles_set3" name="Locale Files Set 3" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set3"/>
+	</component>
+	<component id="locfiles_set4" name="Locale Files Set 4" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set4"/>
+	</component>
+	<component id="locfiles_set5" name="Locale Files Set 5" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set5"/>
+	</component>
+	<component id="locfiles_set6" name="Locale Files Set 6" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set6"/>
+	</component>
+	<!-- is the a problem with SF builds with the following? -->
+	<component id="locfiles_set7" name="Locale Files Set 7" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set7"/>
+	</component>
+	<component id="locfiles_set8" name="Locale Files Set 8" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set8"/>
+	</component>
+	<component id="locfiles_set9" name="Locale Files Set 9" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set9"/>
+	</component>
+	<component id="locfiles_set10" name="Locale Files Set 10" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set10"/>
+	</component>
+	<component id="locfiles_set11" name="Locale Files Set 11" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set11"/>
+	</component>
+	<component id="locfiles_set12" name="Locale Files Set 12" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set12"/>
+	</component>
+	<component id="locfiles_set13" name="Locale Files Set 13" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set13"/>
+	</component>
+	<component id="locfiles_set14" name="Locale Files Set 14" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set14"/>
+	</component>
+	<component id="locfiles_set15" name="Locale Files Set 15" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set15"/>
+	</component>
+	<component id="locfiles_set16" name="Locale Files Set 16" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set16"/>
+	</component>      
     </collection>
     <collection id="version" name="Version" level="top">
+    	<!-- collection is really a component. Need to move down a directory -->    
       <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
         <unit bldFile="version/group"/>
       </component>
     </collection>
+   <collection id="helps_loc2" name="Helps Locale 2" level="top">
+    	<!-- collection is really a component. Need to move down a directory -->    
+      <component id="helps_loc2_build" name="Helps Locale 2 Build" filter="s60">
+        <unit bldFile="helps_loc2/group"/>
+      </component>
+     </collection>
     <collection id="sf_config" name="SF Config" level="mid">
       <component id="config" filter="s60" name="Config" class="config" purpose="development">
-         <!-- there should only be one unit. Can any of these be uncommented? -->
-        <!-- <unit bldFile="sf_config/config/apac/group"/> -->
-        <!-- <unit bldFile="sf_config/config/group"/> -->
-        <!-- <unit bldFile="sf_config/config/japan/group"/> -->
-        <!-- <unit bldFile="sf_config/config/western/group"/> -->
+        <unit base="sf_config/config"/>
       </component>
     </collection>
     <collection id="s60bld" name="S60 Build">
@@ -38,9 +92,6 @@
       <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
         <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
       </component>
-      <component id="foundation_s60_packages" name="Foundation S60 Packages" class="config" introduced="^3" purpose="development" target="desktop">
-        <unit mrp="symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-      </component>
     </collection>
     <collection id="foundation_system" name="Foundation System" level="top">
       <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">