--- a/symbian3/mw/remotemgmt/package_definition.xml	Mon Sep 06 15:02:38 2010 +0100
+++ b/symbian3/mw/remotemgmt/package_definition.xml	Mon Sep 06 17:10:48 2010 +0100
@@ -163,6 +163,9 @@
    <component id="syncml_ds_customization_api" name="SyncML DS Customization API" class="api" filter="s60" introduced="^3">
     <unit bldFile="remotemgmt_plat/syncml_ds_customization_api/group"/>
    </component>
+   <component id="lawmo_plugin_api" name="Lawmo Plugin API" class="api" filter="s60" introduced="^3">
+    <unit bldFile="remotemgmt_plat/lawmo_plugin_api/group"/>
+   </component>
   </collection>
   <collection id="policymanagement" name="Policy Management" level="generic">
    <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">

--- a/symbian3/os/lbs/package_definition.xml	Mon Sep 06 15:02:38 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Mon Sep 06 17:10:48 2010 +0100
@@ -65,19 +65,27 @@
       </component>
       <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
       </component>
       <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+        <unit bldFile="networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+      </component>
+	  <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/suplprotocolmodule/HostSettingsApi/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+      </component>
+      <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+        <unit bldFile="networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
       </component>
       <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
+        <unit bldFile="networkprotocolmodules/suplpmcore/suplrrlpasn1/group"/>
       </component>
       <component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
       </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">