--- a/symbian3/mw/camerasrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,36 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+        <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
+          <component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+          </component>
+          <component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
+          </component>
+          <component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+          </component>
+          <component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
+          </component>
+          <component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+          </component>
+          <component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group" filter="test,api_test"/>
+          </component>
+        </collection>
         <collection name="camappengine" long-name="Camera App Engine" level="fw">
           <!-- is this collection really a component? If so, move down a directory -->
           <component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
@@ -106,16 +136,6 @@
           </component>
         </collection>
         <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-          <component name="camerasrv_plat" filter="s60" long-name="Camera Services Platform Interfaces" class="api">
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/group"/>
-          </component>
-          <component name="camerasrv_test" filter="s60,test,api_test" long-name="Camera Services API Test" purpose="development">
-            <!-- #include from a single bld.inf or split into mutliple componens -->
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/>
-            <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/>
-          </component>
           <component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
             <!-- should split into individual bld.infs -->
             <unit bldFile="/sf/mw/camerasrv/group"/>