--- a/symbian3/mw/inputmethods/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/inputmethods/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -76,7 +76,50 @@
 <SystemDefinition name="Symbian^3" schema="2.0.1">
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework">
+      <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
+        <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
+          <component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+          </component>
+          <component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+          </component>
+          <component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+          </component>
+        </collection>
+        <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
+          <component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+          </component>
+          <component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+          </component>
+          <component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+          </component>
+          <component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+          </component>
+          <component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+          </component>
+          <component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+          </component>
+          <component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group" filter="test,api_test"/>
+          </component>
+        </collection>
         <collection name="textinput" long-name="Text Input" level="framework">
           <component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
             <!--uncomment when configuration is turned on and textinput_build is removed-->
@@ -158,19 +201,7 @@
             <unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/group" mrp="/sf/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
           </component>
         </collection>
-        <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
-          <component name="inputmethods_plat" filter="s60" long-name="Input Methods Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/group"/>
-          </component>
-          <component name="inputmethods_pub" filter="s60" long-name="Input Methods Public Interfaces" class="api">
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/group"/>
-          </component>
-          <component name="inputmethods_test" filter="s60,test,api_test" long-name="Input Methods Tests" introduced="^2" purpose="development">
-            <!-- can only have one unit, #include from a single bld.inf -->
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/>
-          </component>
+        <collection name="inputmethods_info" long-name="Input Methods Info" level="api">
           <component name="inputmethods_api_tests" filter="s60,test,api_test" long-name="Input Methods API Tests" introduced="^2" purpose="development">
             <unit bldFile="/sf/mw/inputmethods/tsrc/group"/>
           </component>