diff -r 5b9ea224ada6 -r f99df75e4e8e tip_bulk_s3/mw/ipconnmgmt/package_definition.xml
--- a/tip_bulk_s3/mw/ipconnmgmt/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
+++ b/tip_bulk_s3/mw/ipconnmgmt/package_definition.xml	Wed Dec 01 15:34:13 2010 +0000
@@ -53,8 +53,8 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server utils api">
-<collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="api">
+   <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
+<collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="utils">
 <component name="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
 </component>
@@ -92,7 +92,7 @@
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
 </component>
 </collection>
-<collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="api">
+<collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="utils">
 <component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
 </component>
@@ -184,7 +184,8 @@
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
 </component>
 <component name="commsdatcreatorrfsplugin" filter="s60" long-name="Comms Database Creator RFS Plugin" introduced="9.3" plugin="Y">
-<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
 </component>
 <component name="commsdatstartup" filter="s60" long-name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -192,16 +193,15 @@
 <component name="dbcreatorexe" filter="s60" long-name="DB Creator" introduced="9.3">
 <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
 </component>
-<component name="dbcreator_conf" filter="s60" long-name="DB Creator Configuration" introduced="9.3">
-<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/conf"/>
-</component>
-<component name="dbcreator_rom" filter="s60" long-name="DB Creator ROM" introduced="9.3">
-<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/rom"/>
+<component name="dbcreator_build" filter="s60" long-name="DB Creator Build" introduced="9.3">
+<!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+<unit bldFile="/sf/mw/ipconnmgmt/dbcreator/group"/>
 </component>
 </collection>
-<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="api">
-<component name="ipcm_config" filter="s60" long-name="IP Connectivity Management Configuration">
-<unit bldFile="/sf/mw/ipconnmgmt/data"/>
+<collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
+<component name="ipcm_build" filter="s60" long-name="IP Connectivity Management Build">
+<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
+<unit bldFile="/sf/mw/ipconnmgmt/group"/>
 </component>
 </collection>
 </block>