--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Tue May 11 13:20:07 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Wed May 12 11:29:16 2010 +0100
@@ -99,13 +99,13 @@
           <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
           <component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
             <!-- will should give the id/path something more unique than cenrep -->
-            <unit bldFile="/sf/os/deviceplatformrelease/sf_config/cenrep/group"/>
+            <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
           </component>
           <component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
+            <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
           </component>
           <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-            <unit bldFile="/sf/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
+            <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
           </component>
         </collection>
         <!-- should be located locally in buildplatforms/group 

--- a/symbian4/os/deviceplatformrelease/package_definition_3.0.xml	Tue May 11 13:20:07 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition_3.0.xml	Wed May 12 11:29:16 2010 +0100
@@ -23,17 +23,17 @@
     
     <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"/>
+        <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="sf_config/cenrep/group"/>
+        <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="sf_config/rombuild/syborg/group"/>
+        <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="sf_config/rombuild/zoom2/group"/>
+        <unit bldFile="foundation_system/sf_config/rombuild/zoom2/group"/>
       </component>
     </collection>
         <!-- should be located locally in buildplatforms/group