--- a/package_definition.xml	Tue Jul 13 12:25:28 2010 +0100
+++ b/package_definition.xml	Wed Sep 08 15:16:57 2010 +0100
@@ -17,8 +17,8 @@
       <component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
         <unit bldFile="datasourcemodules/networkpositioningmodule/group" mrp="datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
       </component>
-      <component id="npeintegmodule" name="NPE Integration Module" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="datasourcemodules/npeintegmodule/group" mrp="datasourcemodules/npeintegmodule/group/lbs_npeintegrationmodule.mrp"/>
+      <component id="locationapesuplpsy" name="APE SUPL Positioning Module" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="datasourcemodules/locationapesuplpsy/group" mrp="datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
       </component>
     </collection>
     <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
@@ -35,6 +35,9 @@
       </component>
     </collection>
     <collection id="lbstest" name="Locating Services Tests" level="application-interface">
+      <component id="testagpsmodules" name="Test AGPS modules" introduced="^3" purpose="development" class="plugin">
+		  <unit bldFile="lbstest/datasourcemodules/group" mrp="lbstest/datasourcemodules/group/lbs_testdatasourcemodules.mrp"/>
+      </component>
       <component id="lbstestproduct" name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
         <unit mrp="lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="lbstest/lbstestproduct/group"/>
       </component>
@@ -63,9 +66,24 @@
       <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 Published" 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">
         <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">
+       <unit bldFile="networkprotocolmodules/suplprotocolmodule/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+      </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">
       <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">