diff -r 424ba1d4ccef -r c8d3143d3c0e symbian3/mw/securitysrv/package_definition_3.0.xml
--- a/symbian3/mw/securitysrv/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -1,36 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="securitysrv" name="Security Services" levels="plugin framework server generic specific">
-    <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
-      <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
-        <unit bldFile="gba/uicc/group"/>
-      </component>
-      <component id="bootstrap" filter="s60" name="Bootstrap" introduced="^2">
-        <unit bldFile="gba/bootstrap/group"/>
-      </component>
-      <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
-        <unit bldFile="gba/gbaserver/group"/>
-      </component>
-      <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
-        <unit bldFile="gba/gbaapi/group"/>
-      </component>
-      <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
-        <unit bldFile="gba/gbafilter/group"/>
-      </component>
-      <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
-        <unit bldFile="gba/group"/>
-      </component>
-    </collection>
-    <collection id="wim" name="Wireless Identity Module " level="framework">
-      <component id="swimreader" filter="s60" name="SWIM Reader"/>
-      <component id="scard" filter="s60" name="Smart Card"/>
-      <component id="wimutil" filter="s60" name="WIM Utils"/>
-      <component id="wimserver" filter="s60" name="WIM Server"/>
-      <component id="wimclient" filter="s60" name="WIM Client"/>
-      <component id="wimplugin" filter="s60" name="WIM Plugin" class="plugin"/>
-      <component id="wim_build" filter="s60" name="WIM Build">
-           <!-- need to distribute bld.inf to empty components or collapse into a single component -->
-        <unit bldFile="wim/group"/>
+    <collection id="cms" name="Certificate Management Service" level="server">
+    	<!-- collection is really a component. Need to move down a directory-->
+      <component id="cms_build" filter="s60" name="CMS" introduced="^3">
+        <unit bldFile="cms/group"/>
       </component>
     </collection>
     <collection id="pkiutilities" name="PKI Utilities" level="plugin">
@@ -56,29 +30,26 @@
         <unit bldFile="pkiutilities/devicetoken/group"/>
       </component>
       <component id="certificates" filter="s60" name="Certificates">
-        <unit bldFile="pkiutilities/certificates/group"/>
+        <unit bldFile="pkiutilities/certificates/group" filter="sf_build"/>
       </component>
       <component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
+      	<!-- need to split this into the above components -->
         <unit bldFile="pkiutilities/group"/>
       </component>
      <component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
        <unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
       </component>
     </collection>
-    <collection id="remotelock" name="Remote Lock" level="generic">
-      <component id="remotelocksettings" filter="s60" name="Remote Lock Settings"/>
-      <component id="remotelockengine" filter="s60" name="Remote Lock Engine"/>
-      <component id="remotelock_build" filter="s60" name="Remote Lock Build">
-           <!-- need to distribute bld.inf to empty components or collapse into a single component -->
-        <unit bldFile="remotelock/group"/>
+    <collection id="wim" name="Wireless Identity Module " level="framework">
+    	<!-- collection is really a component. Need to move down a directory-->
+      <component id="wim_build" filter="s60" name="WIM Build">
+        <unit bldFile="wim/group"/>
       </component>
     </collection>
-    <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
-      <component id="trkdummy" filter="s60" name="Trk Dummy">
-        <!-- <unit bldFile="boottimeintegritycheck/trkdummy/group"/> -->
-      </component>
-      <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
-        <unit bldFile="boottimeintegritycheck/group"/>
+    <collection id="remotelock" name="Remote Lock" level="generic">
+    	<!-- collection is really a component. Need to move down a directory-->
+      <component id="remotelock_build" filter="s60" name="Remote Lock Build">
+        <unit bldFile="remotelock/group"/>
       </component>
     </collection>
     <collection id="securitydialogs" name="Security Dialogs" level="specific">
@@ -94,19 +65,64 @@
       <component id="securitynotifier" filter="s60" name="Security Notifier">
         <unit bldFile="securitydialogs/securitynotifier/group"/>
       </component>
-      <component id="securityobserver" filter="s60" name="Security Observer">
-        <unit bldFile="securitydialogs/securityobserver/group"/>
+      <component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
+        <unit bldFile="securitydialogs/lockclient/group"/>
+      </component>
+      <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
+        <unit bldFile="securitydialogs/lockapp/group"/>
+      </component>
+      <component id="simlockui" filter="s60" name="SIM Lock UI" introduced="^3">
+        <unit bldFile="securitydialogs/simlockui/group"/>
+      </component>
+    </collection>
+    <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
+    	<!-- collection is really a component. Need to move down a directory-->
+      <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
+        <unit bldFile="boottimeintegritycheck/group"/>
+      </component>
+    </collection>
+    <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
+      <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
+        <unit bldFile="gba/uicc/group"/>
+      </component>
+      <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
+        <unit bldFile="gba/gbaserver/group"/>
+      </component>
+      <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
+        <unit bldFile="gba/gbaapi/group"/>
+      </component>
+      <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
+        <unit bldFile="gba/gbafilter/group"/>
+      </component>
+      <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
+      	<!-- need to split this into the above components, or remove #includes and make this GBA ROM  -->
+        <unit bldFile="gba/group"/>
+      </component>
+    </collection>
+    <collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
+      <component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
+        <unit bldFile="devencdiskutils/DevEncCommonUtils/group"/>
+      </component>
+      <component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
+        <unit bldFile="devencdiskutils/DevEncRfsPlugin/group"/>
+      </component>
+      <component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
+        <unit bldFile="devencdiskutils/Pk5Recognizer/group"/>
+      </component>
+      <component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
+        <unit bldFile="devencdiskutils/DevEncStarter/group"/>
+      </component>
+      <component id="devencdiskutils" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+      	<!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
+        <unit bldFile="devencdiskutils/group"/>
       </component>
     </collection>
     <collection id="securitysrv_info" name="Security Services Info" level="specific">
       <component id="secsrv_plat" name="Security Services Platform Interfaces" filter="s60" class="api">
         <unit bldFile="secsrv_plat/group"/>
-        <!-- <unit bldFile="secsrv_plat/devicelock_access_api/group"/> -->
-        <!-- <unit bldFile="secsrv_plat/keyguard_access_api/group"/> -->
-        <!-- <unit bldFile="secsrv_plat/lockapp_server_api/group"/> -->
       </component>
-      <component id="securitysrv_test" filter="s60" purpose="development" name="Security Services Test">
-        <!-- <unit bldFile="tsrc/group"/> -->
+      <component id="securitysrv_test" filter="s60,api_test" purpose="development" name="Security Services Test">
+        <unit bldFile="tsrc/group"/>
       </component>
       <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>