--- a/symbian4/os/lbs/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml	Wed Jun 30 16:05:11 2010 +0100
@@ -63,21 +63,23 @@
       <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="Network Protocol Module Utilities" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/networkpmutils/group" mrp="networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
+      </component>
+      <component id="suplpmcore" name="SUPL Protocol Module Core" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/suplpmcore/group" mrp="networkprotocolmodules/suplpmcore/group/lbs_suplpmcore.mrp"/>
+      </component>
+      <component id="networkpmasn1_pub" name="Network Protocol Module ASN1 Public Interfaces" introduced="^3" purpose="optional" class="api">
+        <unit bldFile="networkprotocolmodules/networkpmasn1_pub/group" mrp="networkprotocolmodules/networkpmasn1_pub/group/lbs_networkpmasn1_pub.mrp"/>
+      </component>
+      <component id="suplcontrolplaneprotocols" name="SUPL Control Plane Protocols" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/group" mrp="networkprotocolmodules/suplcontrolplaneprotocols/group/lbs_suplcontrolplaneprotocols.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/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"/>
-      </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"/>
-      </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/suplprotocolmodule/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
       </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">