diff -r 424ba1d4ccef -r c8d3143d3c0e symbian3/mw/ipconnmgmt/package_definition_3.0.xml
--- a/symbian3/mw/ipconnmgmt/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/ipconnmgmt/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="ipconnmgmt" name="IP Connectivity Management" levels="plugin framework server generic utils">
+    <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
+      <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
+        <unit bldFile="accesspointcontrol/apcontrollistplugin/group"/>
+      </component>
+    </collection>
     <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
       <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
         <unit bldFile="alwayson_net_plugin/pdpcontextmanager2/group"/>
       </component>
     </collection>
+    <collection id="apengine" name="Access Point Engine" level="framework">
+      <component id="apeng" filter="s60" name="Access Point Engine">
+        <unit bldFile="apengine/apeng/group"/>
+      </component>
+      <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
+        <unit bldFile="apengine/apsettingshandlerui/group"/>
+      </component>
+      <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
+        <unit bldFile="apengine/apsettingsplugin/group"/>
+      </component>
+    </collection>
     <collection id="bearermanagement" name="Bearer Management" level="framework">
       <component id="mpm" filter="s60" name="Mobility Policy Manager">
         <unit bldFile="bearermanagement/mpm/group"/>
@@ -18,6 +34,14 @@
         <unit bldFile="bearermanagement/group"/>
       </component>
     </collection>
+    <collection id="cmmanager" name="Connection Method Manager" level="framework">
+      <component id="cmmgr" filter="s60" name="CM Manager">
+        <unit bldFile="cmmanager/cmmgr/group"/>
+      </component>
+      <component id="gsconnsettingsplugin" filter="s60" name="GS Connection Settings Plugin" introduced="^3" class="plugin">
+        <unit bldFile="cmmanager/gsconnsettingsplugin/group"/>
+      </component>
+    </collection>
     <collection id="connectionmonitoring" name="Connection Monitoring" level="server">
       <component id="connectionmonitorplugin" filter="s60" name="Connection Monitor Plugin" class="plugin">
         <unit bldFile="connectionmonitoring/connectionmonitorplugin/group"/>
@@ -34,25 +58,9 @@
         <unit bldFile="connectionmonitoring/connmonext/group"/>
       </component>
     </collection>
-    <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
-      <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
-        <unit bldFile="accesspointcontrol/apcontrollistplugin/group"/>
-      </component>
-    </collection>
-    <collection id="apengine" name="Access Point Engine" level="framework">
-      <component id="apeng" filter="s60" name="Access Point Engine">
-        <unit bldFile="apengine/apeng/group"/>
-      </component>
-      <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
-        <unit bldFile="apengine/apsettingshandlerui/group"/>
-      </component>
-      <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
-        <unit bldFile="apengine/apsettingsplugin/group"/>
-      </component>
-    </collection>
-    <collection id="cmmanager" name="Connection Method Manager" level="framework">
-      <component id="cmmgr" filter="s60" name="CM Manager">
-        <unit bldFile="cmmanager/cmmgr/group"/>
+    <collection id="connectionutilities" name="Connection Utilities" level="utils">
+      <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
+        <unit bldFile="connectionutilities/connectiondialogs/group"/>
       </component>
     </collection>
     <collection id="dbcreator" name="DB Creator" level="utils">
@@ -60,7 +68,11 @@
         <unit bldFile="dbcreator/commsdatcreator/group"/>
       </component>
       <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
-        <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>
+      	<meta rel="config">
+      		<not-defined condition="WINSCW"/>
+      	</meta>
+      		<!-- uncomment when config is turned on -->
+        <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
       </component>
       <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
         <unit bldFile="dbcreator/commsdatstartup/group"/>
@@ -69,15 +81,10 @@
         <unit bldFile="dbcreator/dbcreatorexe/group"/>
       </component>
       <component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
-		<!-- consider moving exports to another component and getting rid of this one -->
+		<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
         <unit bldFile="dbcreator/group"/>
       </component>
     </collection>
-    <collection id="connectionutilities" name="Connection Utilities" level="utils">
-      <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
-        <unit bldFile="connectionutilities/connectiondialogs/group"/>
-      </component>
-    </collection>
     <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="utils">
       <component id="ipcm_pub" filter="s60" class="api" name="IP Connectivity Management Public Interfaces">
         <unit bldFile="ipcm_pub/group"/>
@@ -85,6 +92,10 @@
       <component id="ipcm_plat" filter="s60" class="api" name="IP Connectivity Management Platform Interfaces">
         <unit bldFile="ipcm_plat/group"/>
       </component>
+      <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
+      	<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
+        <unit bldFile="group"/>
+      </component>
     </collection>
   </package>
 </SystemDefinition>