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