--- a/symbian3/mw/hapticsservices/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/hapticsservices/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,22 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
+        <collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
+          <component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
+            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+          </component>
+          <component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
+            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+          </component>
+          <component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
+            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+          </component>
+        </collection>
+        <collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
+          <component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
+            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+          </component>
+        </collection>
         <collection name="tacticonserver" long-name="Tacticon Server" level="server">
           <!-- collection is really a component. Move down a directory  -->
           <component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
@@ -105,14 +121,6 @@
             <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/group"/>
           </component>
         </collection>
-        <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
-          <component name="hapticsservices_pub" filter="s60" long-name="Haptics Services Public Interfaces" introduced="^1" class="api">
-            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_pub/group"/>
-          </component>
-          <component name="hapticsservices_plat" filter="s60" long-name="Haptics Services Platform Interfaces" introduced="^1" class="api">
-            <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>