--- a/symbian3/mw/wirelessacc/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/wirelessacc/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,20 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
+        <collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
+          <component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+          </component>
+          <component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+          </component>
+          <component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+          </component>
+          <component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+          </component>
+        </collection>
         <collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
           <component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
             <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
@@ -119,11 +133,6 @@
             <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
           </component>
         </collection>
-        <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-          <component name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" filter="s60" class="api">
-            <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>