--- a/symbian3/app/mmsharinguis/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/app/mmsharinguis/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,17 @@
   <systemModel>
     <layer name="app" long-name="Applications" levels="services apps">
       <block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
+        <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
+          <component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
+            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
+          </component>
+          <component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
+            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
+          </component>
+          <component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
+            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
+          </component>
+        </collection>
         <collection name="mmsharing" long-name="Multimedia Sharing" level="base">
           <component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
             <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshavailability/group"/>
@@ -86,7 +97,8 @@
           </component>
           <!-- consider putting client and server in the same component -->
           <component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
+            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
+            <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group" filter="test,api_test"/>
           </component>
           <component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
             <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
@@ -95,7 +107,7 @@
             <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshengine/group"/>
           </component>
           <component name="mmshui" filter="s60" long-name="Multimedia Sharing UI">
-            <!-- can only have one unti: need to #include one from the other if it's needed -->
+            <!-- can only have one unit: need to #include one from the other if it's needed -->
             <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
             <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
           </component>
@@ -125,12 +137,6 @@
             <!--  consider distributing to other components -->
             <unit bldFile="/sf/app/mmsharinguis/group"/>
           </component>
-          <component name="mmsharinguis_plat" filter="s60" long-name="Multimedia Sharing UIs Platform Interfaces" class="api">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/group"/>
-          </component>
-          <component name="mmsharinguis_plat" filter="s60,test,api_test" long-name="Multimedia Sharing UIs API Tests" class="api">
-            <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/>
-          </component>
         </collection>
       </block>
     </layer>