--- a/symbian3/mw/remotemgmt/package_definition.xml	Tue Oct 26 14:42:13 2010 +0100
+++ b/symbian3/mw/remotemgmt/package_definition.xml	Tue Oct 26 17:20:44 2010 +0100
@@ -120,14 +120,6 @@
     <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_pool_api/diagnostics_plugin_pool_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
    </component>
-   <component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_api/adaptive_history_list_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/adaptive_history_list_api/group"/>
-   </component>
-   <component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_session_api/adaptive_history_list_session_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/adaptive_history_list_session_api/group"/>
-   </component>
    <component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
     <meta rel="Api" href="remotemgmt_plat/fota_engine_api/fota_engine_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/fota_engine_api/group"/>
@@ -163,9 +155,6 @@
    <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	Tue Oct 26 14:42:13 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Tue Oct 26 17:20:44 2010 +0100
@@ -63,12 +63,9 @@
       <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
-	  <component id="networkpmutils" name="Networkpm Utils" introduced="^2" purpose="optional" class="plugin">
-		<unit bldFile="networkprotocolmodules/networkpmutils/group" mrp="networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
-	  </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/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplproxyprotocolmodule/sfgroup/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 -->
@@ -82,13 +79,9 @@
         <!-- 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/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/suplrrlpprotocol/group"/>
+        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
       </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">