diff -r 1c8fca9ff3fb -r 27d9d356efbf symbian3/mw/web/package_definition.xml
--- a/symbian3/mw/web/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/web/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,13 +77,83 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-        <collection name="web_info" long-name="Web Info" level="specific">
-          <component name="web_plat" filter="s60" long-name="Web Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/group"/>
+        <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
+          <component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_pub/browser_control_api/group"/>
+          </component>
+          <component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_pub/download_mgr_client_api/group"/>
+          </component>
+          <component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_pub/download_mgr_ui_api/group"/>
+          </component>
+          <component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_pub/favourites_engine_api/group"/>
+          </component>
+          <component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_pub/browser_plugin_api/group"/>
+          </component>
+          <component name="settings_api" long-name="Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_pub/settings_api/group"/>
+          </component>
+        </collection>
+        <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
+          <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh"/>
+          </component>
+          <component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/aiw_browser_provider_api/group"/>
+          </component>
+          <component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/browser_dialogs_provider_api/group"/>
+          </component>
+          <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/browser_platform_api/group"/>
+          </component>
+          <component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/cod_handler_api/group"/>
+          </component>
+          <component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/connection_manager_api/group"/>
           </component>
-          <component name="web_pub" filter="s60" long-name="Web Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/group"/>
+          <component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/cxml_library_api/group"/>
+          </component>
+          <component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/download_mgr_client_api_extn/group"/>
+          </component>
+          <component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/feeds_engine_api/group"/>
+          </component>
+          <component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/launcher_api/group"/>
+          </component>
+          <component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/multipart_parser_api/group"/>
+          </component>
+          <component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/recent_url_store_api/group"/>
           </component>
+          <component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/scheme_handler_plugin_api/group"/>
+          </component>
+          <component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/scriptable_plugin_api/group"/>
+          </component>
+          <component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/webutils_api/group"/>
+          </component>
+          <component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/widget_registry_api/group"/>
+          </component>
+          <component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/xml_parser_api/group"/>
+          </component>
+          <component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
+            <unit bldFile="/sf/mw/web/web_plat/stmgesturefw_api/group"/>
+          </component>
+        </collection>
+        <collection name="web_info" long-name="Web Info" level="specific">
           <component name="web_build" filter="s60" long-name="Web Build">
             <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
             <unit bldFile="/sf/mw/web/group"/>