diff -r c2b02bde6e2f -r ffbd2b110bc3 package_definition.xml
--- a/package_definition.xml	Thu Sep 02 21:44:50 2010 +0300
+++ b/package_definition.xml	Fri Sep 17 08:36:27 2010 +0300
@@ -7,84 +7,12 @@
         <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">
-        <unit base="sf_config/config"/>
-      </component>
-    </collection>
-    <collection id="s60bld" name="S60 Build">
-      <component id="buildplatforms" filter="s60" name="Build Platforms">
-        <!-- should be located locally in buildplatforms/group -->
-        <unit bldFile="/tools/buildplatforms/group"/>
-      </component>
-    </collection>
     <collection id="symbianosbld" name="Symbian OS Build" level="bld">
       <component id="cedarutils" name="Cedar Utils" purpose="development">
         <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
@@ -97,6 +25,22 @@
       <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="foundation_system/system_model/system_model.mrp"/>
       </component>
+      <component id="sf_config" filter="s60" name="Foundation Config" introduced="^4">
+        <unit bldFile="foundation_system/sf_config/CI_external/group"/>
+      </component>
+      <component id="config" filter="s60" name="Config" class="config" purpose="development">
+        <unit base="foundation_system/sf_config/config"/>
+      </component>
+      <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
+		<!-- will should give the id/path something more unique than cenrep -->
+        <unit bldFile="foundation_system/sf_config/cenrep/group"/>
+      </component>
+      <component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config" introduced="^3">
+        <unit bldFile="foundation_system/sf_config/rombuild/syborg/group"/>
+      </component>
+      <component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
+        <unit bldFile="foundation_system/sf_config/rombuild/zoom2/group"/>
+      </component>
     </collection>
     <collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
       <component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">