--- a/symbian3/os/wlan/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/os/wlan/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,58 @@
   <systemModel>
     <layer name="os" long-name="OS" levels="hw services">
       <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+        <collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
+          <component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_dbif_api/group"/>
+          </component>
+          <component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_hal_api/group"/>
+          </component>
+          <component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_management_api/group"/>
+          </component>
+          <component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+          </component>
+          <component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_control_api/group"/>
+          </component>
+          <component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+          </component>
+          <component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+          </component>
+          <component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_info_api/group"/>
+          </component>
+          <component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+          </component>
+          <component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_osa_api/group"/>
+          </component>
+          <component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_spia_api/group"/>
+          </component>
+          <component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_hpa_api/group"/>
+          </component>
+          <component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+          </component>
+          <component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+          </component>
+          <component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+          </component>
+        </collection>
+        <collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
+          <component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
+            <unit bldFile="/sf/os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+          </component>
+        </collection>
         <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
           <component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
             <unit bldFile="/sf/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
@@ -104,12 +156,6 @@
           </component>
         </collection>
         <collection name="wlan_info" long-name="WLAN Info" level="test">
-          <component name="wlan_pub" filter="s60" long-name="WLAN Public Interfaces" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_pub/group"/>
-          </component>
-          <component name="wlan_plat" filter="s60" long-name="WLAN Platform Interfaces" class="api">
-            <unit bldFile="/sf/os/wlan/wlan_plat/group"/>
-          </component>
           <component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
             <unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
           </component>