diff -r 1c8fca9ff3fb -r 27d9d356efbf symbian3/mw/securitysrv/package_definition.xml
--- a/symbian3/mw/securitysrv/package_definition.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -77,6 +77,62 @@
   <systemModel>
     <layer name="mw" long-name="Middleware" levels="generic specific">
       <block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
+        <collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
+          <component name="cms_api" long-name="CMS API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/cms_api/group"/>
+          </component>
+          <component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+          </component>
+          <component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+          </component>
+          <component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+          </component>
+          <component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+          </component>
+          <component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+          </component>
+          <component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+          </component>
+          <component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+          </component>
+          <component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+          </component>
+          <component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+          </component>
+          <component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+          </component>
+          <component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+          </component>
+          <component name="gba_api" long-name="GBA API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/gba_api/group"/>
+          </component>
+          <component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+          </component>
+          <component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
+          </component>
+          <component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
+          </component>
+          <component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+          </component>
+          <component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
+            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
+          </component>
+        </collection>
         <collection name="cms" long-name="Certificate Management Service" level="server">
           <!-- collection is really a component. Need to move down a directory-->
           <component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
@@ -194,9 +250,6 @@
           </component>
         </collection>
         <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-          <component name="secsrv_plat" long-name="Security Services Platform Interfaces" filter="s60" class="api">
-            <unit bldFile="/sf/mw/securitysrv/secsrv_plat/group"/>
-          </component>
           <component name="securitysrv_test" filter="s60,test,api_test" purpose="development" long-name="Security Services Test">
             <unit bldFile="/sf/mw/securitysrv/tsrc/group"/>
           </component>