Put in full details on the first set of packages in app layer HighFidelityModel
authorBob Rosenberg <bob.rosenberg@nokia.com>
Wed, 27 Jan 2010 15:59:56 +0000
branchHighFidelityModel
changeset 38 12159035c0ef
parent 37 01eda22956f2
child 39 bd4651024dad
Put in full details on the first set of packages in app layer
symbian3/app/camera/package_definition.xml
symbian3/app/camera/package_definition_3.0.xml
symbian3/app/commonemail/package_definition.xml
symbian3/app/commonemail/package_definition_3.0.xml
symbian3/app/conntools/package_definition.xml
symbian3/app/conntools/package_definition_3.0.xml
symbian3/app/contacts/package_definition.xml
symbian3/app/contacts/package_definition_3.0.xml
symbian3/app/contentcontrol/package_definition.xml
symbian3/app/contentcontrol/package_definition_3.0.xml
symbian3/app/conversations/package_definition.xml
symbian3/app/conversations/package_definition_3.0.xml
symbian3/app/devicecontrol/package_definition.xml
symbian3/app/devicecontrol/package_definition_3.0.xml
symbian3/app/dictionary/package_definition.xml
symbian3/app/dictionary/package_definition_3.0.xml
symbian3/app/files/package_definition.xml
symbian3/app/files/package_definition_3.0.xml
symbian3/app/graphicsuis/package_definition_3.0.xml
symbian3/app/helps/package_definition_3.0.xml
symbian3/app/homescreen/package_definition_3.0.xml
symbian3/app/homescreentools/package_definition_3.0.xml
symbian3/app/im/package_definition_3.0.xml
symbian3/app/iptelephony/package_definition_3.0.xml
symbian3/app/location/package_definition_3.0.xml
symbian3/app/messaging/package_definition_3.0.xml
symbian3/app/mmsharinguis/package_definition_3.0.xml
symbian3/app/musicplayer/package_definition_3.0.xml
symbian3/app/organizer/package_definition_3.0.xml
symbian3/app/phone/package_definition_3.0.xml
symbian3/app/photos/package_definition_3.0.xml
symbian3/app/poc/package_definition_3.0.xml
symbian3/app/printing/package_definition_3.0.xml
symbian3/app/profile/package_definition_3.0.xml
symbian3/app/radio/package_definition_3.0.xml
symbian3/app/rndtools/package_definition_3.0.xml
symbian3/app/screensaver/package_definition_3.0.xml
symbian3/app/settingsuis/package_definition_3.0.xml
symbian3/app/speechsrv/package_definition_3.0.xml
symbian3/app/techview/package_definition_3.0.xml
symbian3/app/utils/package_definition_3.0.xml
symbian3/app/videoplayer/package_definition_3.0.xml
symbian3/app/videotelephony/package_definition_3.0.xml
symbian3/app/voicerec/package_definition_3.0.xml
symbian3/app/webuis/package_definition_3.0.xml
--- a/symbian3/app/camera/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/camera/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,112 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="camera" level="apps" long-name="Camera Apps">
-<collection name="s60">
-<component name="camera">
-<unit bldFile="/sf/app/camera/group" mrp=""/>
-</component>
-<component name="camera_help">
-<unit bldFile="/sf/app/camera/camerauis/cameraapp/help/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="camera" level="apps" long-name="Camera Apps">
+        <collection name="camerauis" long-name="Camera UIs">
+          <component name="activepalette" filter="s60" long-name="Active Palette">
+            <unit bldFile="/sf/app/camera/camerauis/activepalette/group"/>
+          </component>
+          <component name="cameraapp" filter="s60" long-name="Camera Application">
+            <unit bldFile="/sf/app/camera/camerauis/cameraapp/group"/>
+          </component>
+        </collection>
+        <collection name="camera_info" long-name="Camera Apps Info">
+          <component name="camera_plat" filter="s60,api_test" long-name="Camera Apps Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/camera/camera_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/camera/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="camera" name="Camera Apps">
+    <collection id="camerauis" name="Camera UIs">
+      <component id="activepalette" filter="s60" name="Active Palette">
+        <unit bldFile="camerauis/activepalette/group"/>
+      </component>
+      <component id="cameraapp" filter="s60" name="Camera Application">
+        <unit bldFile="camerauis/cameraapp/group"/>
+      </component>
+    </collection>
+    <collection id="camera_info" name="Camera Apps Info">
+      <component id="camera_plat" filter="s60,api_test" name="Camera Apps Platform Interfaces" class="api">
+        <unit bldFile="camera_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- a/symbian3/app/commonemail/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/commonemail/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,109 +1,228 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="commonemail" level="apps" long-name="Email Apps">
-<collection name="s60">
-<component name="commonemail">
-<unit bldFile="/sf/app/commonemail/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="commonemail" level="apps" long-name="Email Apps" levels="service support ui app">
+        <collection name="emailservices" long-name="Email Services" level="service">
+          <component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailservices/emailframework/group"/>
+          </component>
+          <component name="emailclientapi" filter="s60" long-name="Email Client API" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailservices/emailclientapi/group"/>
+          </component>
+          <component name="emailserver" filter="s60" long-name="Email Server" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailservices/emailserver/group"/>
+          </component>
+          <component name="emailservermonitor" filter="s60" long-name="Email Server Monitor" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailservices/emailservermonitor/group"/>
+          </component>
+          <component name="psmruadapter" filter="s60" long-name="Predictive Search Most Recent Used Adapter" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/emailservices/psmruadapter/group"/>
+          </component>
+          <component name="emailstore" filter="s60" long-name="Email Store" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailservices/emailstore/group"/>
+          </component>
+          <component name="emaildebug" filter="s60" long-name="Email Debug" introduced="^2" class="api">
+            <unit bldFile="/sf/app/commonemail/emailservices/emaildebug/group"/>
+          </component>
+          <component name="emailinstallationinitiator" filter="s60" long-name="Email Installation Initiator" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailservices/emailinstallationinitiator/group"/>
+          </component>
+          <component name="emailservices_test" filter="s60,test" long-name="Email Services Tests">
+            <!--  can these be #included in their relevant components or a single test bld.inf? 
+      		Can only have one unit -->
+            <unit bldFile="/sf/app/commonemail/emailservices/emailframework/tsrc/group"/>
+            <unit bldFile="/sf/app/commonemail/emailservices/emailserver/tsrc/group"/>
+            <unit bldFile="/sf/app/commonemail/emailservices/emailserver/cmailhandlerplugin/tsrc/group"/>
+            <unit bldFile="/sf/app/commonemail/emailservices/emailserver/mailserverautostart/tsrc/group"/>
+            <unit bldFile="/sf/app/commonemail/emailcontacts/contactactionservice/saveascontactplugin/tsrc/group"/>
+          </component>
+        </collection>
+        <collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
+          <component name="ipssossettings" filter="s60" long-name="IPS SOS Settings" introduced="^2">
+            <!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+            <unit bldFile="/sf/app/commonemail/ipsservices/ipssossettings/group"/>
+          </component>
+          <component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/ipsservices/ipssosplugin/group"/>
+          </component>
+          <component name="ipssosaoplugin" filter="s60" long-name="IPS SOS Always Online Plugin" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/ipsservices/ipssosaoplugin/group"/>
+          </component>
+          <component name="ipsservices_build" filter="s60" long-name="IPS Services Build" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/ipsservices/group"/>
+            <!-- can the exports be broken up into the other components or made a config component?-->
+          </component>
+        </collection>
+        <collection name="emailcontacts" long-name="Email Contacts" level="support">
+          <component name="contactactionservice" filter="s60" long-name="Contact Action Service" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/emailcontacts/contactactionservice/group"/>
+          </component>
+          <component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/emailcontacts/contactactionmenu/group"/>
+          </component>
+          <component name="remotecontactlookup" filter="s60" long-name="Remote Contact Lookup" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/emailcontacts/remotecontactlookup/group"/>
+          </component>
+        </collection>
+        <collection name="meetingrequest" long-name="Meeting Request" level="ui">
+          <component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrcommon/group"/>
+          </component>
+          <component name="mrdb" filter="s60" long-name="MR Database" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrdb/group"/>
+          </component>
+          <component name="mrpolicy" filter="s60" long-name="MR Policy" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrpolicy/group"/>
+          </component>
+          <component name="mrservices" filter="s60" long-name="MR Services" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrservices/group"/>
+          </component>
+          <component name="mrgui" filter="s60" long-name="MR GUI" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrgui/group"/>
+          </component>
+          <component name="mrentry" filter="s60" long-name="MR Entry" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrentry/group"/>
+          </component>
+          <component name="mrtasks" filter="s60" long-name="MR Tasks" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrtasks/group"/>
+          </component>
+          <component name="mrutils" filter="s60" long-name="MR Utils" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrutils/group"/>
+          </component>
+          <component name="mrutilscalplugin" filter="s60" long-name="MR Utils Calendar Plugin" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrutilscalplugin/group"/>
+          </component>
+          <component name="mrviewer" filter="s60" long-name="MR Viewer" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrviewer/group"/>
+          </component>
+          <component name="mrviewercalplugin" filter="s60" long-name="MR Viewer Calendar Plugin" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrviewercalplugin/group"/>
+          </component>
+          <component name="mricalviewer" filter="s60" long-name="MR iCal Viewer" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mricalviewer/group"/>
+          </component>
+          <component name="mrversit2" filter="s60" long-name="MR Versit2" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrversit2/group"/>
+          </component>
+          <component name="mragnversit2" filter="s60" long-name="MR Agenda Versit2" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mragnversit2/group"/>
+          </component>
+          <component name="mrcasplugin" filter="s60" long-name="MR Contact Action Service Plugin" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrcasplugin/group"/>
+          </component>
+          <component name="mrurlparserplugin" filter="s60" long-name="MR URL Parser Plugin" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
+          </component>
+          <component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
+            <!-- can the exports be broken up into the other components ?
+			alternatively, move the exports into a RM Config component-->
+            <unit bldFile="/sf/app/commonemail/meetingrequest/group"/>
+          </component>
+        </collection>
+        <collection name="emailuis" long-name="Email UIs" level="app">
+          <component name="emailui" filter="s60" long-name="Email UI" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailuis/emailui/group"/>
+          </component>
+          <component name="gsemailsettings" filter="s60" long-name="Email GS Settings" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/commonemail/emailuis/gsemailsettings/group"/>
+          </component>
+          <component name="uicomponents" filter="s60" long-name="Email UI Components" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailuis/uicomponents/group"/>
+          </component>
+          <component name="widget" filter="s60" long-name="Email Widget" introduced="^2">
+            <unit bldFile="/sf/app/commonemail/emailuis/widget/group"/>
+          </component>
+          <!-- until config is supported, may need to just use emailuis/group/bld.inf -->
+        </collection>
+        <collection name="commonemail_info" long-name="Email Apps Info" level="app">
+          <component name="emailhelp" filter="s60" long-name="Email Help" class="placeholder">
+            <!-- should this be commented out or not? -->
+            <!-- <unit bldFile="emailhelp/group"/> -->
+          </component>
+          <component name="commonemail_help" filter="s60" long-name="Email Help" introduced="^2" class="placeholder">
+            <!-- should this be commented out or not? -->
+            <!-- <unit bldFile="help/group"/> -->
+          </component>
+          <component name="email_plat" filter="s60" long-name="Email Apps Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/commonemail/email_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/commonemail/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="commonemail" name="Email Apps" levels="service support ui app">
+    <collection id="emailservices" name="Email Services" level="service">
+      <component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
+        <unit bldFile="emailservices/emailframework/group"/>
+      </component>
+      <component id="emailclientapi" filter="s60" name="Email Client API" introduced="^2">
+        <unit bldFile="emailservices/emailclientapi/group"/>
+      </component>
+      <component id="emailserver" filter="s60" name="Email Server" introduced="^2">
+        <unit bldFile="emailservices/emailserver/group"/>
+      </component>
+      <component id="emailservermonitor" filter="s60" name="Email Server Monitor" introduced="^2">
+        <unit bldFile="emailservices/emailservermonitor/group"/>
+      </component>
+      <component id="psmruadapter" filter="s60" name="Predictive Search Most Recent Used Adapter" class="plugin" introduced="^2">
+        <unit bldFile="emailservices/psmruadapter/group"/>
+      </component>
+      <component id="emailstore" filter="s60" name="Email Store" introduced="^2">
+        <unit bldFile="emailservices/emailstore/group"/>
+      </component>
+      <component id="emaildebug" filter="s60" name="Email Debug" class="api" introduced="^2">
+        <unit bldFile="emailservices/emaildebug/group"/>
+      </component>
+      <component id="emailinstallationinitiator" filter="s60" name="Email Installation Initiator" introduced="^2">
+        <unit bldFile="emailservices/emailinstallationinitiator/group"/>
+      </component>
+      <component id="emailservices_test" filter="s60,test" name="Email Services Tests">
+      	<!--  can these be #included in their relevant components or a single test bld.inf? 
+      		Can only have one unit -->
+		<unit bldFile="emailservices/emailframework/tsrc/group" />
+		<unit bldFile="emailservices/emailserver/tsrc/group"  />
+		<unit bldFile="emailservices/emailserver/cmailhandlerplugin/tsrc/group"/>
+		<unit bldFile="emailservices/emailserver/mailserverautostart/tsrc/group"/>
+		<unit bldFile="emailcontacts/contactactionservice/saveascontactplugin/tsrc/group"/>
+      </component>
+    </collection>
+    <collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
+      <component id="ipssossettings" filter="s60" name="IPS SOS Settings" introduced="^2">
+    		<!-- SOS? Consider spelling it out since the abbreviation is ambiguous -->
+        <unit bldFile="ipsservices/ipssossettings/group"/>
+      </component>
+      <component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
+        <unit bldFile="ipsservices/ipssosplugin/group"/>
+      </component>
+      <component id="ipssosaoplugin" filter="s60" name="IPS SOS Always Online Plugin" class="plugin" introduced="^2">
+        <unit bldFile="ipsservices/ipssosaoplugin/group"/>
+      </component>
+      <component id="ipsservices_build" filter="s60" name="IPS Services Build" introduced="^2">
+        <unit bldFile="ipsservices/group"/>
+		<!-- can the exports be broken up into the other components or made a config component?-->
+      </component>
+    </collection>
+    <collection id="emailcontacts" name="Email Contacts" level="support">
+      <component id="contactactionservice" filter="s60" name="Contact Action Service"  class="plugin" introduced="^2">
+        <unit bldFile="emailcontacts/contactactionservice/group"/>
+      </component>
+      <component id="contactactionmenu" filter="s60" name="Contact Action Menu" class="plugin" introduced="^2">
+        <unit bldFile="emailcontacts/contactactionmenu/group"/>
+      </component>
+      <component id="remotecontactlookup" filter="s60" name="Remote Contact Lookup" class="plugin" introduced="^2">
+        <unit bldFile="emailcontacts/remotecontactlookup/group"/>
+      </component>
+    </collection>
+    <collection id="meetingrequest" name="Meeting Request" level="ui">
+      <component id="mrcommon" filter="s60" name="MR Common" introduced="^2">
+        <unit bldFile="meetingrequest/mrcommon/group"/>
+      </component>
+      <component id="mrdb" filter="s60" name="MR Database" introduced="^2">
+        <unit bldFile="meetingrequest/mrdb/group"/>
+      </component>
+      <component id="mrpolicy" filter="s60" name="MR Policy" introduced="^2">
+        <unit bldFile="meetingrequest/mrpolicy/group"/>
+      </component>
+      <component id="mrservices" filter="s60" name="MR Services" introduced="^2">
+        <unit bldFile="meetingrequest/mrservices/group"/>
+      </component>
+      <component id="mrgui" filter="s60" name="MR GUI" introduced="^2">
+        <unit bldFile="meetingrequest/mrgui/group"/>
+      </component>
+      <component id="mrentry" filter="s60" name="MR Entry" introduced="^2">
+        <unit bldFile="meetingrequest/mrentry/group"/>
+      </component>
+      <component id="mrtasks" filter="s60" name="MR Tasks" introduced="^2">
+        <unit bldFile="meetingrequest/mrtasks/group"/>
+      </component>
+      <component id="mrutils" filter="s60" name="MR Utils" introduced="^2">
+        <unit bldFile="meetingrequest/mrutils/group"/>
+      </component>
+      <component id="mrutilscalplugin" filter="s60" name="MR Utils Calendar Plugin" class="plugin" introduced="^2">
+        <unit bldFile="meetingrequest/mrutilscalplugin/group"/>
+      </component>
+      <component id="mrviewer" filter="s60" name="MR Viewer" introduced="^2">
+        <unit bldFile="meetingrequest/mrviewer/group"/>
+      </component>
+      <component id="mrviewercalplugin" filter="s60" name="MR Viewer Calendar Plugin" introduced="^2">
+        <unit bldFile="meetingrequest/mrviewercalplugin/group"/>
+      </component>
+      <component id="mricalviewer" filter="s60" name="MR iCal Viewer" class="plugin" introduced="^2">
+        <unit bldFile="meetingrequest/mricalviewer/group"/>
+      </component>
+      <component id="mrversit2" filter="s60" name="MR Versit2" introduced="^2">
+        <unit bldFile="meetingrequest/mrversit2/group"/>
+      </component>
+      <component id="mragnversit2" filter="s60" name="MR Agenda Versit2" introduced="^2">
+        <unit bldFile="meetingrequest/mragnversit2/group"/>
+      </component>
+      <component id="mrcasplugin" filter="s60" name="MR Contact Action Service Plugin" class="plugin" introduced="^2">
+        <unit bldFile="meetingrequest/mrcasplugin/group"/>
+      </component>
+      <component id="mrurlparserplugin" filter="s60" name="MR URL Parser Plugin" class="plugin" introduced="^2">
+        <unit bldFile="meetingrequest/mrurlparserplugin/group"/>
+      </component>
+      <component id="meetingrequest_build" filter="s60" name="MR Build" introduced="^2">
+		<!-- can the exports be broken up into the other components ?
+			alternatively, move the exports into a RM Config component-->
+        <unit bldFile="meetingrequest/group"/>
+      </component>
+    </collection>
+    <collection id="emailuis" name="Email UIs" level="app">
+      <component id="emailui" filter="s60" name="Email UI" introduced="^2">
+        <unit bldFile="emailuis/emailui/group"/>
+      </component>
+      <component id="gsemailsettings" filter="s60" name="Email GS Settings" class="plugin" introduced="^2">
+        <unit bldFile="emailuis/gsemailsettings/group"/>
+      </component>
+      <component id="uicomponents" filter="s60" name="Email UI Components" introduced="^2">
+        <unit bldFile="emailuis/uicomponents/group"/>
+      </component>
+      <component id="widget" filter="s60" name="Email Widget" introduced="^2">
+        <meta rel="config">
+        	<condition not-defined="FF_CMAIL_INTEGRATION"/>
+        </meta>      
+        <unit bldFile="emailuis/widget/group"/>
+      </component>
+      	<!-- until config is supported, may need to just use emailuis/group/bld.inf -->
+    </collection>
+    <collection id="commonemail_info" name="Email Apps Info" level="app">
+      <component id="emailhelp" filter="s60" name="Email Help">
+      	<!-- should this be commented out or not? -->
+        <!-- <unit bldFile="emailhelp/group"/> -->
+      </component>
+      <component id="commonemail_help" filter="s60" name="Email Help" introduced="^2">
+      	<!-- should this be commented out or not? -->
+        <!-- <unit bldFile="help/group"/> -->
+      </component>
+      <component id="email_plat" filter="s60" class="api" name="Email Apps Platform Interfaces">
+        <unit bldFile="email_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- a/symbian3/app/conntools/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/conntools/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,109 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app">
-<block name="conntools">
-<collection name="s60">
-<component name="conntools">
-<unit bldFile="/sf/app/conntools/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
+        <collection name="nettools" long-name="Net Tools" level="app">
+          <component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
+            <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
+          </component>
+        </collection>
+        <collection name="emulatorlan" long-name="Emulator LAN" level="config">
+          <!-- component is actually a colleciton, should be moved down a directory -->
+          <component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
+            <unit bldFile="/sf/app/conntools/emulatorlan/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/conntools/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="conntools" name="Connectivity Tools" levels="config app">
+    <collection id="nettools" name="Net Tools" level="app">
+      <component id="conntest" filter="s60" name="Connection Test" purpose="development">
+        <unit bldFile="nettools/conntest/group"/>
+      </component>
+    </collection>
+    <collection id="emulatorlan" name="Emulator LAN" level="config">
+    	<!-- component is actually a colleciton, should be moved down a directory -->
+      <component id="emulatorlan_build" filter="s60" name="Emulator LAN Build" class="config" purpose="development">
+        <unit bldFile="emulatorlan/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- a/symbian3/app/contacts/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/contacts/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,127 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
-<collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-<component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/sf/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
-</component>
-</collection>
-<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-<component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-<unit bldFile="/sf/app/contacts/pimprotocols/phonebooksync/group" mrp="/sf/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-</component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-<unit bldFile="/sf/app/contacts/pimprotocols/pbap/group" mrp="/sf/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-</component>
-</collection>
-<collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-<component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="contacts">
-<unit bldFile="/sf/app/contacts/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
+        <collection name="contactextensions" long-name="Contacts Extensions" level="services">
+          <component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
+            <unit bldFile="/sf/app/contacts/contactextensions/predefinedcontacts/group"/>
+          </component>
+        </collection>
+        <collection name="logsui" long-name="Logs UI" level="ui">
+          <component name="logsui_build" filter="s60" long-name="Logs UI Build">
+            <!-- component at too high a rank, should move down one directory -->
+            <unit bldFile="/sf/app/contacts/logsui/group"/>
+          </component>
+        </collection>
+        <collection name="phonebookui" long-name="Phonebook UI" level="ui">
+          <component name="phonebook" filter="s60" long-name="Phonebook">
+            <unit bldFile="/sf/app/contacts/phonebookui/phonebook/group"/>
+          </component>
+          <component name="speeddial" filter="s60" long-name="Speed Dial">
+            <unit bldFile="/sf/app/contacts/phonebookui/speeddial/group"/>
+          </component>
+          <component name="phonebook2" filter="s60" long-name="Phone Book 2">
+            <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/group"/>
+          </component>
+          <component name="phonebook2_test" filter="s60,test" long-name="Phonebook 2 Tests">
+            <!-- can only have one unit, consider #including from phonebook2 or a common bld.inf  -->
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/spbcontentprovider/tsrc/ut_contentprovider/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/NamesListExtension/tsrc/group"/>
+          </component>
+          <component name="phonebook2_other_test" filter="s60,test" long-name="Phonebook 2 Other Tests">
+            <!-- can only have one unit. Why is this separate from the other tests? -->
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/UIControls/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/Presentation/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/USIMExtension/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/xSPExtensionManager/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccacontactorservice/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccapp/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookui/Phonebook2/ccapplication/ccamycardplugin/tsrc/group"/>
+          </component>
+        </collection>
+        <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
+          <component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/contacts/phonebookengines/cntfindplugin/group"/>
+          </component>
+          <component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/contacts/phonebookengines/cntsortplugin/group"/>
+          </component>
+          <component name="virtualphonebook" filter="s60" long-name="Virtual Phonebook" introduced="^2">
+            <unit bldFile="/sf/app/contacts/phonebookengines/virtualphonebook/group"/>
+          </component>
+          <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
+            <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/sf/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+          </component>
+          <component name="virtualphonebook_test" long-name="Virtual Phonebook Tests" filter="s60,test">
+            <!-- can only have one bld.inf, #include the latter from the former, or #include both from virtualphonebook-->
+            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkCntModel/tsrc/group"/>
+          </component>
+          <component name="vpbk_test" filter="s60,test" long-name="Virtual Phonebook Other Tests">
+            <!-- can only have one bld.inf, #include from the first, or #include both from virtualphonebook
+      		Why is this separate from virtualphonebook_test?-->
+            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkEng/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkEngUtils/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/VirtualPhonebook/VPbkSimStoreService/tsrc/group"/>
+          </component>
+        </collection>
+        <collection name="pimprotocols" long-name="PIM Protocols" level="services">
+          <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/app/contacts/pimprotocols/phonebooksync/group" mrp="/sf/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+          </component>
+          <component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+            <unit bldFile="/sf/app/contacts/pimprotocols/pbap/group" mrp="/sf/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+          </component>
+        </collection>
+        <collection name="ccservices" long-name="Contacts Centric Services" level="services">
+          <component name="cmsservices" filter="s60" long-name="Contact Method Selector Services" introduced="^2">
+            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/group"/>
+          </component>
+          <component name="cms_test" filter="s60,test" long-name="Contact Method Selector Tests">
+            <!-- can only have one unit, #include from the first, or #include from cmsservices  -->
+            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/bpas/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/contactpresence/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/ccservices/cmsservices/presencetrafficlights/tsrc/group"/>
+          </component>
+        </collection>
+        <collection name="presencecache" long-name="Presence Cache" level="support">
+          <component name="presencecacheutils" filter="s60" long-name="Presence Cache Utils" introduced="^2" class="placeholder">
+            <!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
+          </component>
+          <component name="presencecacheserver2" filter="s60" long-name="Presence Cache Server" introduced="^2" class="placeholder">
+            <!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
+          </component>
+          <component name="presencecacheclient2" filter="s60" long-name="Presence Cache Client" introduced="^2" class="placeholder">
+            <!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
+          </component>
+          <component name="presencecache_build" filter="s60" long-name="Presence Cache Build" introduced="^2">
+            <!-- should divide this bld.inf into the other components, or collapse them into a single component -->
+            <unit bldFile="/sf/app/contacts/presencecache/group"/>
+          </component>
+          <component name="presencecache_test" filter="s60,test" long-name="Presence Cache Tests">
+            <!-- can this be #included from presencecacheutils?  -->
+            <unit bldFile="/sf/app/contacts/presencecache/presencecacheutils/tsrc/group"/>
+          </component>
+        </collection>
+        <collection name="predictivesearch" long-name="Predictive Search" level="support">
+          <component name="pcsutils" filter="s60" long-name="PCS Utils" introduced="^2">
+            <unit bldFile="/sf/app/contacts/predictivesearch/pcsutils/group"/>
+          </component>
+          <component name="pcsserverclientapi" filter="s60" long-name="PCS Server Client API" introduced="^2">
+            <unit bldFile="/sf/app/contacts/predictivesearch/pcsserverclientapi/group"/>
+          </component>
+          <component name="pcsserver" filter="s60" long-name="PCS Server" introduced="^2">
+            <unit bldFile="/sf/app/contacts/predictivesearch/pcsserver/group"/>
+          </component>
+          <component name="pcsadapters" filter="s60" long-name="PCS Adapters" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/contacts/predictivesearch/adapters/contacts/group"/>
+          </component>
+          <component name="pcsalgorithm" filter="s60" long-name="PCS Algorithm" introduced="^2" plugin="Y">
+            <unit bldFile="/sf/app/contacts/predictivesearch/pcsalgorithm/group"/>
+          </component>
+          <component name="predictivesearch_build" filter="s60" long-name="Predictive Search Build" introduced="^2">
+            <!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
+            <unit bldFile="/sf/app/contacts/predictivesearch/group"/>
+          </component>
+        </collection>
+        <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
+          <component name="contacts_plat" filter="s60" long-name="Contacts Apps Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_plat/group"/>
+          </component>
+          <component name="contacts_plat_test" filter="s60,api_test" long-name="Contacts Apps Platform API Test">
+            <unit bldFile="/sf/app/contacts/contacts_plat/cms_contactor_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/cca_launch_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/contactpresence_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/presence_cache_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_engine_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_rcl_api/tsrc/group"/>
+            <unit bldFile="/sf/app/contacts/contacts_plat/phonebook_2_icon_api/tsrc/ut_CPbk2IconArray/group"/>
+          </component>
+          <component name="contacts_pub" filter="s60" long-name="Contacts Apps Public Interfaces" class="api">
+            <unit bldFile="/sf/app/contacts/contacts_pub/group"/>
+          </component>
+          <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
+            <unit mrp="/sf/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/contacts/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="contacts" name="Contacts Apps" levels="engine support services ui">
+    <collection id="contactextensions" name="Contacts Extensions" level="services">
+      <component id="predefinedcontacts" filter="s60" name="Predefined Contacts">
+        <unit bldFile="contactextensions/predefinedcontacts/group"/>
+      </component>
+    </collection>
+    <collection id="logsui" name="Logs UI" level="ui">
+      <component id="logsui_build" filter="s60" name="Logs UI Build">
+          <!-- component at too high a rank, should move down one directory -->
+        <unit bldFile="logsui/group"/>
+      </component>
+    </collection>
+    <collection id="phonebookui" name="Phonebook UI" level="ui">
+      <component id="phonebook" filter="s60" name="Phonebook">
+        <unit bldFile="phonebookui/phonebook/group"/>
+      </component>
+      <component id="speeddial" filter="s60" name="Speed Dial">
+        <unit bldFile="phonebookui/speeddial/group"/>
+      </component>
+      <component id="phonebook2" filter="s60" name="Phone Book 2">
+        <unit bldFile="phonebookui/phonebook2/group"/>
+      </component>
+      <component id="phonebook2_test" filter="s60,test" name="Phonebook 2 Tests">
+       	<!-- can only have one unit, consider #including from phonebook2 or a common bld.inf  -->
+          <unit bldFile="phonebookui/Phonebook2/tsrc/group" />
+          <unit bldFile="phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/tsrc/group" />
+          <unit bldFile="phonebookui/Phonebook2/spbcontentprovider/tsrc/ut_contentprovider/group" />      
+          <unit bldFile="phonebookui/Phonebook2/NamesListExtension/tsrc/group" />      
+      </component>
+      <component id="phonebook2_other_test" filter="s60,test" name="Phonebook 2 Other Tests">
+      	<!-- can only have one unit. Why is this separate from the other tests? -->
+         <unit bldFile="phonebookui/Phonebook2/UIControls/tsrc/group" />
+         <unit bldFile="phonebookui/Phonebook2/Presentation/tsrc/group" />
+         <unit bldFile="phonebookui/Phonebook2/USIMExtension/tsrc/group" />
+         <unit bldFile="phonebookui/Phonebook2/xSPExtensionManager/tsrc/group" />
+         <unit bldFile="phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/group" />
+         <unit bldFile="phonebookui/Phonebook2/ccapplication/ccacontactorservice/tsrc/group" />
+         <unit bldFile="phonebookui/Phonebook2/ccapplication/ccapp/tsrc/group" />
+         <unit bldFile="phonebookui/Phonebook2/ccapplication/ccamycardplugin/tsrc/group" />
+       </component>
+    </collection>
+    <collection id="phonebookengines" name="Phonebook Engines" level="engine">
+      <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
+        <unit bldFile="phonebookengines/cntfindplugin/group"/>
+      </component>
+      <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
+        <unit bldFile="phonebookengines/cntsortplugin/group"/>
+      </component>
+      <component id="virtualphonebook" filter="s60" name="Virtual Phonebook" introduced="^2">
+        <unit bldFile="phonebookengines/virtualphonebook/group"/>
+      </component>
+      <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+        <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+      </component>
+      <component id="virtualphonebook_test" name="Virtual Phonebook Tests" filter="s60,test">
+      	<!-- can only have one bld.inf, #include the latter from the former, or #include both from virtualphonebook-->
+          <unit bldFile="phonebookengines/VirtualPhonebook/tsrc/group" />
+          <unit bldFile="phonebookengines/VirtualPhonebook/VPbkCntModel/tsrc/group" />
+      </component>
+      <component id="vpbk_test" filter="s60,test" name="Virtual Phonebook Other Tests">
+      	<!-- can only have one bld.inf, #include from the first, or #include both from virtualphonebook
+      		Why is this separate from virtualphonebook_test?-->
+        <unit bldFile="phonebookengines/VirtualPhonebook/VPbkEng/tsrc/group" />
+        <unit bldFile="phonebookengines/VirtualPhonebook/VPbkEngUtils/tsrc/group" />
+        <unit bldFile="phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/tsrc/group" />
+        <unit bldFile="phonebookengines/VirtualPhonebook/VPbkSimStoreService/tsrc/group" />
+      </component>      
+    </collection>
+    <collection id="pimprotocols" name="PIM Protocols" level="services">
+      <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
+        <unit bldFile="pimprotocols/phonebooksync/group" mrp="pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+      </component>
+      <component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+        <unit bldFile="pimprotocols/pbap/group" mrp="pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
+      </component>
+    </collection>
+    <collection id="ccservices" name="Contacts Centric Services" level="services">
+      <component id="cmsservices" filter="s60" name="Contact Method Selector Services" introduced="^2">
+        <unit bldFile="ccservices/cmsservices/group"/>
+      </component>
+      <component id="cms_test" filter="s60,test" name="Contact Method Selector Tests">
+     	<!-- can only have one unit, #include from the first, or #include from cmsservices  -->
+        <unit bldFile="ccservices/cmsservices/bpas/tsrc/group" />
+        <unit bldFile="ccservices/cmsservices/cmsengine/tsrc/group" />
+        <unit bldFile="ccservices/cmsservices/contactpresence/tsrc/group" />
+        <unit bldFile="ccservices/cmsservices/presencetrafficlights/tsrc/group" />
+      </component>           
+    </collection>
+    <collection id="presencecache" name="Presence Cache" level="support">
+      <component id="presencecacheutils" filter="s60" name="Presence Cache Utils" introduced="^2">
+        <!-- <unit bldFile="presencecache/presencecacheutils/group"/> -->
+      </component>
+      <component id="presencecacheserver2" filter="s60" name="Presence Cache Server" introduced="^2">
+        <!-- <unit bldFile="presencecache/presencecacheserver2/group"/> -->
+      </component>
+      <component id="presencecacheclient2" filter="s60" name="Presence Cache Client" introduced="^2">
+        <!-- <unit bldFile="presencecache/presencecacheclient2/group"/> -->
+      </component>
+      <component id="presencecache_build" filter="s60" name="Presence Cache Build" introduced="^2">
+		<!-- should divide this bld.inf into the other components, or collapse them into a single component -->
+        <unit bldFile="presencecache/group"/>
+      </component>
+      <component id="presencecache_test"  filter="s60,test" name="Presence Cache Tests">
+      	<!-- can this be #included from presencecacheutils?  -->
+        <unit bldFile="presencecache/presencecacheutils/tsrc/group" />
+      </component>
+    </collection>
+    <collection id="predictivesearch" name="Predictive Search" level="support">
+      <component id="pcsutils" filter="s60" name="PCS Utils" introduced="^2">
+        <unit bldFile="predictivesearch/pcsutils/group"/>
+      </component>
+      <component id="pcsserverclientapi" filter="s60" name="PCS Server Client API" introduced="^2">
+        <unit bldFile="predictivesearch/pcsserverclientapi/group"/>
+      </component>
+      <component id="pcsserver" filter="s60" name="PCS Server" introduced="^2">
+        <unit bldFile="predictivesearch/pcsserver/group"/>
+      </component>
+      <component id="pcsadapters" filter="s60" name="PCS Adapters" class="plugin" introduced="^2">
+        <unit bldFile="predictivesearch/adapters/contacts/group"/>
+      </component>
+      <component id="pcsalgorithm" filter="s60" name="PCS Algorithm" class="plugin" introduced="^2">
+        <unit bldFile="predictivesearch/pcsalgorithm/group"/>
+      </component>
+      <component id="predictivesearch_build" filter="s60" name="Predictive Search Build" introduced="^2">
+      	<!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
+        <unit bldFile="predictivesearch/group"/>
+      </component>
+    </collection>
+    <collection id="contacts_info" name="Contacts Apps Info" level="ui">
+      <component id="contacts_plat" filter="s60" name="Contacts Apps Platform Interfaces" class="api">
+        <unit bldFile="contacts_plat/group"/>
+      </component>
+     <component id="contacts_plat_test" filter="s60,api_test" name="Contacts Apps Platform API Test">
+       <unit bldFile="contacts_plat/cms_contactor_api/tsrc/group" />
+       <unit bldFile="contacts_plat/cca_launch_api/tsrc/group" />
+       <unit bldFile="contacts_plat/cca_view_plugin_api/tsrc/group" />
+       <unit bldFile="contacts_plat/contactpresence_api/tsrc/group" />
+       <unit bldFile="contacts_plat/presence_cache_api/tsrc/group" />
+       <unit bldFile="contacts_plat/virtual_phonebook_policy_api/tsrc/group" />
+       <unit bldFile="contacts_plat/virtual_phonebook_sim_services_api/tsrc/group" />        
+       <unit bldFile="contacts_plat/virtual_phonebook_store_api/tsrc/group" />        
+       <unit bldFile="contacts_plat/virtual_phonebook_vcard_api/tsrc/group" />        
+       <unit bldFile="contacts_plat/virtual_phonebook_view_definition_api/tsrc/group" />     
+       <unit bldFile="contacts_plat/virtual_phonebook_engine_api/tsrc/group" />     
+       <unit bldFile="contacts_plat/predictivesearch_client_api/tsrc/group" />        
+       <unit bldFile="contacts_plat/predictivesearch_utils_api/tsrc/group" />     
+       <unit bldFile="contacts_plat/phonebook_2_rcl_api/tsrc/group" />     
+       <unit bldFile="contacts_plat/phonebook_2_icon_api/tsrc/ut_CPbk2IconArray/group" />  
+     </component>
+      <component id="contacts_pub" filter="s60" name="Contacts Apps Public Interfaces" class="api">
+        <unit bldFile="contacts_pub/group"/>
+      </component>
+      <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>  
+</SystemDefinition>
--- a/symbian3/app/contentcontrol/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/contentcontrol/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,46 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
   name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
   name CDATA #REQUIRED
   long-name CDATA #IMPLIED
   levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
   levels NMTOKENS #IMPLIED
   span CDATA #IMPLIED
   level NMTOKEN #IMPLIED
   name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
   name CDATA #REQUIRED
   long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
   name CDATA #REQUIRED
   long-name CDATA #IMPLIED
   deprecated CDATA #IMPLIED
   introduced CDATA #IMPLIED
   contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
+  plugin (Y|N) "N"
   filter CDATA #IMPLIED
   class NMTOKENS #IMPLIED
   supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
   mrp CDATA #IMPLIED
   filter CDATA #IMPLIED
   bldFile CDATA #IMPLIED
@@ -48,62 +70,33 @@
   version NMTOKEN #IMPLIED
   prebuilt NMTOKEN #IMPLIED
   late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
+  priority CDATA #IMPLIED
+>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="contentcontrol" level="services" long-name="Content Control Daemons">
-<collection name="s60">
-<component name="contentcontrol">
-<unit bldFile="/sf/app/contentcontrol/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
+        <collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
+          <!-- Component at wrong rank, should move down a directory -->
+          <component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
+            <unit bldFile="/sf/app/contentcontrol/dsdcmoadapter/group"/>
+          </component>
+        </collection>
+        <collection name="omads" long-name="OMA Data Sync" level="app">
+          <component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
+            <unit bldFile="/sf/app/contentcontrol/omads/omadsappui/group"/>
+          </component>
+          <component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
+            <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
+          </component>
+        </collection>
+        <collection name="contentcontrol_info" long-name="Content Control Daemons Info" level="app">
+          <component name="contentctrl_plat" filter="s60" long-name="Content Control Daemons Platforn Interfaces" class="api">
+            <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
 </SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/contentcontrol/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="contentcontrol" name="Content Control Daemons" levels="plugin app">
+    <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
+	   	<!-- Component at wrong rank, should move down a directory --> 
+      <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
+        <unit bldFile="dsdcmoadapter/group"/>
+      </component>
+    </collection>
+    <collection id="omads" name="OMA Data Sync" level="app">
+      <component id="omadsappui" filter="s60" name="OMA DS Application UI">
+        <unit bldFile="omads/omadsappui/group"/>
+      </component>
+      <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+        <unit bldFile="omads/omadsextensions/group"/>
+      </component>
+    </collection>
+    <collection id="contentcontrol_info" name="Content Control Daemons Info" level="app">
+      <component id="contentctrl_plat" filter="s60" class="api" name="Content Control Daemons Platforn Interfaces">
+        <unit bldFile="contentctrl_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- a/symbian3/app/conversations/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/conversations/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,109 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="conversations" level="apps" long-name="Conversation Apps">
-<collection name="s60">
-<component name="conversations">
-<unit bldFile="/sf/app/conversations/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
+        <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
+          <!-- this is really at the wrong rank. should move down a directory -->
+          <component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
+            <unit bldFile="/sf/app/conversations/uiservicetabsettings/group"/>
+          </component>
+        </collection>
+        <collection name="instantmessagesalert" long-name="Instant Messages Alert" level="utils">
+          <!-- this is really at the wrong rank. should move down a directory -->
+          <component name="instantmessagesalert_build" filter="s60" long-name="Instant Messages Alert build" introduced="^3">
+            <unit bldFile="/sf/app/conversations/instantmessagesalert/group"/>
+          </component>
+        </collection>
+        <collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
+          <component name="imstutils_help" filter="s60" long-name="IM Service Tab Help">
+            <unit bldFile="/sf/app/conversations/imstutils/help/group"/>
+          </component>
+          <component name="imconnectionprovider" filter="s60" long-name="IM Connection Provider" plugin="Y">
+            <unit bldFile="/sf/app/conversations/imstutils/imconnectionprovider/group"/>
+          </component>
+          <component name="xmppadapter" filter="s60" long-name="XMPP Settings Adapter" plugin="Y">
+            <unit bldFile="/sf/app/conversations/imstutils/xmppadapter/group"/>
+          </component>
+          <component name="imconversationview" filter="s60" long-name="IM Conversation View">
+            <unit bldFile="/sf/app/conversations/imstutils/imconversationview/group"/>
+          </component>
+          <component name="imstutils_config" filter="s60" long-name="IM Service Tab Utils config" class="config">
+            <!-- remove the #includes and or moved ithe loc file into one the above components -->
+            <unit bldFile="/sf/app/conversations/imstutils/group"/>
+          </component>
+        </collection>
+        <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
+          <component name="vimpstutils" filter="s60" long-name="VIMP Service Tab Utilities">
+            <!-- need to spell out VIMP at least once -->
+            <unit bldFile="/sf/app/conversations/uiservicetab/vimpstutils/group"/>
+          </component>
+          <component name="vimpststorage" filter="s60" long-name="VIMP Service Tab Storage">
+            <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/group"/>
+          </component>
+          <component name="vimpstengine" filter="s60" long-name="VIMP Service Tab Engine">
+            <unit bldFile="/sf/app/conversations/uiservicetab/vimpstengine/group"/>
+          </component>
+          <component name="vimpstcmdprocess" filter="s60" long-name="VIMP Service Tab Command Process">
+            <unit bldFile="/sf/app/conversations/uiservicetab/vimpstcmdprocess/group"/>
+          </component>
+          <component name="vimpstui" filter="s60" long-name="VIMP Service Tab UI">
+            <unit bldFile="/sf/app/conversations/uiservicetab/vimpstui/group"/>
+          </component>
+          <component name="vimpstdetailsviewplugin" filter="s60" long-name="VIMP ST Details View Plugin" plugin="Y">
+            <unit bldFile="/sf/app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
+          </component>
+          <component name="uiservicetab_build" filter="s60" long-name="UI Service Tab Build">
+            <!-- can this be distributed into the above bld.infs? -->
+            <unit bldFile="/sf/app/conversations/uiservicetab/group"/>
+          </component>
+        </collection>
+        <collection name="servicewidget" long-name="Service Widget" level="ui">
+          <component name="servicewidgetdatapublisher" filter="s60" long-name="Service Widget Data Publisher" plugin="Y">
+            <unit bldFile="/sf/app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
+          </component>
+          <component name="themes" filter="s60" long-name="Service Widget Themes" class="config">
+            <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget/group"/>
+          </component>
+          <component name="servicewidget_build" filter="s60" long-name="Service Widget Build">
+            <!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
+            <unit bldFile="/sf/app/conversations/servicewidget/group"/>
+          </component>
+        </collection>
+        <collection name="instantmsgindicatorplugin" long-name="Instant Message Indicator Plugin" level="plugin">
+          <!--  collection is really a component. should move down a directory -->
+          <component name="instantmsgindicatorplugin_build" filter="s60" long-name="Instant Message Indicator Plugin Build" introduced="^3" plugin="Y">
+            <unit bldFile="/sf/app/conversations/instantmsgindicatorplugin/group"/>
+          </component>
+        </collection>
+        <collection name="imstatuspaneindicatorplugin" long-name="IM Status Pane Indicator Plugin" level="plugin">
+          <!--  collection is really a component. should move down a directory -->
+          <component name="imstatuspaneindicatorplugin_build" filter="s60" long-name="IM Status Pane Indicator Plugin Build" introduced="^3" plugin="Y">
+            <unit bldFile="/sf/app/conversations/imstatuspaneindicatorplugin/group"/>
+          </component>
+        </collection>
+        <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
+          <component name="conversations_plat" filter="s60" long-name="Conversation Apps Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/conversations/conversations_plat/group"/>
+          </component>
+          <component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
+            <!-- can the exports be moved to other components? or this remade into a configuration component?-->
+            <unit bldFile="/sf/app/conversations/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/conversations/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="conversations" name="Conversation Apps" levels="settings utils plugin ui">
+    <collection id="uiservicetabsettings" name="UI Service Tab Settings" level="settings">
+    	<!-- this is really at the wrong rank. should move down a directory -->
+      <component id="vimpstsettings" filter="s60" name="VIMP Service Tab Settings">
+        <unit bldFile="uiservicetabsettings/group"/>
+      </component>
+    </collection>
+    <collection id="instantmessagesalert" name="Instant Messages Alert" level="utils">
+    	<!-- this is really at the wrong rank. should move down a directory -->
+      <component id="instantmessagesalert_build" filter="s60" name="Instant Messages Alert build" introduced="^3">
+        <unit bldFile="instantmessagesalert/group"/>
+      </component>
+    </collection>
+    <collection id="imstutils" name="IM Service Tab Utils" level="utils">
+      <component id="imstutils_help" filter="s60" name="IM Service Tab Help">
+        <unit bldFile="imstutils/help/group"/>
+      </component>
+      <component id="imconnectionprovider" filter="s60" name="IM Connection Provider" class="plugin">
+        <unit bldFile="imstutils/imconnectionprovider/group"/>
+      </component>
+      <component id="xmppadapter" filter="s60" name="XMPP Settings Adapter" class="plugin">
+        <unit bldFile="imstutils/xmppadapter/group"/>
+      </component>
+      <component id="imconversationview" filter="s60" name="IM Conversation View">
+        <unit bldFile="imstutils/imconversationview/group"/>
+      </component>
+      <component id="imstutils_config" filter="s60" name="IM Service Tab Utils config" class="config">
+      	<!-- remove the #includes and or moved ithe loc file into one the above components -->
+        <unit bldFile="imstutils/group"/>
+      </component>
+    </collection>
+    <collection id="uiservicetab" name="UI Service Tab" level="ui">
+      <component id="vimpstutils" filter="s60" name="VIMP Service Tab Utilities">
+      	<!-- need to spell out VIMP at least once -->
+        <unit bldFile="uiservicetab/vimpstutils/group"/>
+      </component>
+      <component id="vimpststorage" filter="s60" name="VIMP Service Tab Storage">
+        <unit bldFile="uiservicetab/vimpststorage/group"/>
+      </component>
+      <component id="vimpstengine" filter="s60" name="VIMP Service Tab Engine">
+        <unit bldFile="uiservicetab/vimpstengine/group"/>
+      </component>
+      <component id="vimpstcmdprocess" filter="s60" name="VIMP Service Tab Command Process">
+        <unit bldFile="uiservicetab/vimpstcmdprocess/group"/>
+      </component>
+      <component id="vimpstui" filter="s60" name="VIMP Service Tab UI">
+        <unit bldFile="uiservicetab/vimpstui/group"/>
+      </component>
+      <component id="vimpstdetailsviewplugin" filter="s60" name="VIMP ST Details View Plugin" class="plugin">
+        <unit bldFile="uiservicetab/vimpstdetailsviewplugin/group"/>
+      </component>
+      <component id="uiservicetab_build" filter="s60" name="UI Service Tab Build">
+      	<!-- can this be distributed into the above bld.infs? -->
+        <unit bldFile="uiservicetab/group"/>
+      </component>
+    </collection>
+    <collection id="servicewidget" name="Service Widget" level="ui">
+      <component id="servicewidgetdatapublisher" filter="s60" name="Service Widget Data Publisher" class="plugin">
+        <unit bldFile="servicewidget/servicewidgetdatapublisher/group"/>
+      </component>
+      <component id="themes" filter="s60" name="Service Widget Themes" class="config">
+        <unit bldFile="servicewidget/themes/install-themes/install/servicewidget/group"/>
+      </component>
+      <component id="servicewidget_build" filter="s60" name="Service Widget Build">
+      	<!-- Either move the whole collection down one directory into a single component, or move the ROM and SIS parts into a Service Widget ROM component -->
+        <unit bldFile="servicewidget/group"/>
+      </component>
+    </collection>
+    <collection id="instantmsgindicatorplugin" name="Instant Message Indicator Plugin" level="plugin">
+    	<!--  collection is really a component. should move down a directory -->
+      <component id="instantmsgindicatorplugin_build" filter="s60" name="Instant Message Indicator Plugin Build" class="plugin" introduced="^3">
+        <unit bldFile="instantmsgindicatorplugin/group"/>
+      </component>
+    </collection>
+    <collection id="imstatuspaneindicatorplugin" name="IM Status Pane Indicator Plugin" level="plugin">
+    	<!--  collection is really a component. should move down a directory -->
+      <component id="imstatuspaneindicatorplugin_build" filter="s60" name="IM Status Pane Indicator Plugin Build" class="plugin"  introduced="^3">
+        <unit bldFile="imstatuspaneindicatorplugin/group"/>
+      </component>
+    </collection>
+    <collection id="conversations_info" name="Conversation Apps Info" level="ui">
+      <component id="conversations_plat" filter="s60" name="Conversation Apps Platform Interfaces" class="api">
+        <unit bldFile="conversations_plat/group"/>
+      </component>
+      <component id="conversations_build" filter="s60" name="Conversation Apps Build">
+      	<!-- can the exports be moved to other components? or this remade into a configuration component?-->
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- a/symbian3/app/devicecontrol/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/devicecontrol/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,109 +1,181 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="devicecontrol" level="services" long-name="Device Control Daemons">
-<collection name="s60">
-<component name="devicecontrol">
-<unit bldFile="/sf/app/devicecontrol/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
+        <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
+          <component name="devdiagapp" filter="s60" long-name="Device Diagnostics App">
+            <unit bldFile="/sf/app/devicecontrol/devicediagnostics/devdiagapp/group"/>
+          </component>
+          <component name="devdiaggsplugin" filter="s60" long-name="Device Diagnostics GS Plugin" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
+          </component>
+          <component name="diagplugins" filter="s60" long-name="Diagnostics Plugins" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/devicediagnostics/diagplugins/group"/>
+          </component>
+          <component name="diagsuites" filter="s60" long-name="Diagnostics Suites" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/devicediagnostics/diagsuites/group"/>
+          </component>
+          <component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
+            <!-- can the exports be moved to one of the other components?
+			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
+            <unit bldFile="/sf/app/devicecontrol/devicediagnostics/group"/>
+          </component>
+        </collection>
+        <collection name="omadm" long-name="OMA Device Management" level="oma">
+          <component name="omadmappui" filter="s60" long-name="OMA DM Application UI">
+            <unit bldFile="/sf/app/devicecontrol/omadm/omadmappui/group"/>
+          </component>
+          <component name="omadmextensions" filter="s60" long-name="OMA DM Extensions" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/group"/>
+          </component>
+          <component name="dcmo" filter="s60" long-name="Device Capabilities Management Object" introduced="^3" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/omadm/dcmo/group"/>
+          </component>
+        </collection>
+        <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
+          <component name="pnpms" filter="s60" long-name="PnP MS">
+            <unit bldFile="/sf/app/devicecontrol/pnpmobileservices/pnpms/group"/>
+          </component>
+        </collection>
+        <collection name="applicationmanagement" long-name="Application Management" level="app">
+          <!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? -->
+          <component name="applicationmanagement_options" filter="s60" long-name="AM Install Options">
+            <unit bldFile="/sf/app/devicecontrol/applicationmanagement/options/group"/>
+          </component>
+          <component name="applicationmanagement_client" filter="s60" long-name="AM Client">
+            <unit bldFile="/sf/app/devicecontrol/applicationmanagement/client/group"/>
+          </component>
+          <component name="applicationmanagement_server" filter="s60" long-name="AM Server">
+            <unit bldFile="/sf/app/devicecontrol/applicationmanagement/server/group"/>
+          </component>
+          <component name="rfsplugin" filter="s60" long-name="AM RFS Plugin" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/applicationmanagement/rfsplugin/group"/>
+          </component>
+          <component name="amadapter2" filter="s60" long-name="AM Adapter" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/applicationmanagement/amadapter2/group"/>
+          </component>
+          <component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/applicationmanagement/amadapter2/group"/>
+          </component>
+          <component name="applicationmanagement_build" filter="s60" long-name="AM Build">
+            <!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed AM ROM? -->
+            <unit bldFile="/sf/app/devicecontrol/applicationmanagement/group"/>
+          </component>
+        </collection>
+        <collection name="customization" long-name="DM Customization Adapters" level="mid">
+          <component name="dmutils" long-name="DM Utils" filter="s60">
+            <unit bldFile="/sf/app/devicecontrol/customization/dmutils/bld"/>
+          </component>
+          <component name="uisettingssrv" filter="s60" long-name="UI Settings Server">
+            <unit bldFile="/sf/app/devicecontrol/customization/uisettingssrv/bld"/>
+          </component>
+          <component name="isadapter" filter="s60" long-name="Idle State Adapter" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/customization/isadapter/bld"/>
+          </component>
+          <component name="supadapter" filter="s60" long-name="Startup Adapter" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/customization/supadapter/bld"/>
+          </component>
+          <component name="wallpaperadapter" filter="s60" long-name="Wallpaper Adapter" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/customization/wallpaperadapter/bld"/>
+          </component>
+          <component name="operatorlogoadapter" filter="s60" long-name="Operator Logo Adapter" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/customization/operatorlogoadapter/bld"/>
+          </component>
+          <component name="screensaveradapter" filter="s60" long-name="Screen Saver Adapter" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/customization/screensaveradapter/bld"/>
+          </component>
+          <component name="themesadapter" filter="s60" long-name="Themes Adapter" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/customization/themesadapter/bld"/>
+          </component>
+          <component name="embeddedlinkadapter" filter="s60" long-name="Embedded Link Adapter" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/customization/embeddedlinkadapter/bld"/>
+          </component>
+          <component name="customization_build" filter="s60" long-name="DM Customization Build">
+            <!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed DM Customization ROM? -->
+            <unit bldFile="/sf/app/devicecontrol/customization/group"/>
+          </component>
+        </collection>
+        <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
+          <component name="omacpadapters" filter="s60" long-name="OMA CP Adapters" plugin="Y">
+            <unit bldFile="/sf/app/devicecontrol/omacp/omacpadapters/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/devicecontrol/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="devicecontrol" name="Device Control Daemons" levels="oma mid app">
+    <collection id="devicediagnostics" name="Device Diagnostics" level="app">
+      <component id="devdiagapp" filter="s60" name="Device Diagnostics App">
+        <unit bldFile="devicediagnostics/devdiagapp/group"/>
+      </component>
+      <component id="devdiaggsplugin" filter="s60" name="Device Diagnostics GS Plugin" class="plugin">
+        <unit bldFile="devicediagnostics/devdiaggsplugin/group"/>
+      </component>
+      <component id="diagplugins" filter="s60" name="Diagnostics Plugins" class="plugin">
+        <unit bldFile="devicediagnostics/diagplugins/group"/>
+      </component>
+      <component id="diagsuites" filter="s60" name="Diagnostics Suites" class="plugin">
+        <unit bldFile="devicediagnostics/diagsuites/group"/>
+      </component>
+      <component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build">
+      	<!-- can the exports be moved to one of the other components?
+			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
+        <unit bldFile="devicediagnostics/group"/>
+      </component>
+    </collection>
+    <collection id="omadm" name="OMA Device Management" level="oma">
+      <component id="omadmappui" filter="s60" name="OMA DM Application UI">
+        <unit bldFile="omadm/omadmappui/group"/>
+      </component>
+      <component id="omadmextensions" filter="s60" name="OMA DM Extensions" class="plugin">
+        <unit bldFile="omadm/omadmextensions/group"/>
+      </component>
+      <component id="dcmo" filter="s60" name="Device Capabilities Management Object" class="plugin" introduced="^3">
+        <unit bldFile="omadm/dcmo/group"/>
+      </component>
+    </collection>
+    <collection id="pnpmobileservices" name="PnP Mobile Services" level="mid">
+      <component id="pnpms" filter="s60" name="PnP MS">
+        <unit bldFile="pnpmobileservices/pnpms/group"/>
+      </component>
+    </collection>
+    <collection id="applicationmanagement" name="Application Management" level="app">
+	   	<!-- could this collection be collapsed into a single component and moved down a dir? Do all these need to be noted separately? --> 
+      <component id="applicationmanagement_options" filter="s60" name="AM Install Options">
+        <unit bldFile="applicationmanagement/options/group"/>
+      </component>
+      <component id="applicationmanagement_client" filter="s60" name="AM Client">
+        <unit bldFile="applicationmanagement/client/group"/>
+      </component>
+      <component id="applicationmanagement_server" filter="s60" name="AM Server">
+        <unit bldFile="applicationmanagement/server/group"/>
+      </component>
+      <component id="rfsplugin" filter="s60" name="AM RFS Plugin" class="plugin">
+        <unit bldFile="applicationmanagement/rfsplugin/group"/>
+      </component>
+      <component id="amadapter2" filter="s60" name="AM Adapter" class="plugin">
+        <unit bldFile="applicationmanagement/amadapter2/group"/>
+      </component>
+      <component id="omascomoadapter" filter="s60" name="OMA SCOMO Adapter" class="plugin" introduced="^3">
+        <unit bldFile="applicationmanagement/amadapter2/group"/>
+      </component>
+      <component id="applicationmanagement_build" filter="s60" name="AM Build">
+      	<!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed AM ROM? -->
+        <unit bldFile="applicationmanagement/group"/>
+      </component>
+    </collection>
+    <collection id="customization" name="DM Customization Adapters" level="mid">
+      <component id="dmutils" name="DM Utils" filter="s60">
+        <unit bldFile="customization/dmutils/bld"/>
+      </component>
+      <component id="uisettingssrv" filter="s60" name="UI Settings Server">
+        <unit bldFile="customization/uisettingssrv/bld"/>
+      </component>
+      <component id="isadapter" filter="s60" name="Idle State Adapter" class="plugin">
+        <unit bldFile="customization/isadapter/bld"/>
+      </component>
+      <component id="supadapter" filter="s60" name="Startup Adapter" class="plugin">
+        <unit bldFile="customization/supadapter/bld"/>
+      </component>
+      <component id="wallpaperadapter" filter="s60" name="Wallpaper Adapter" class="plugin">
+        <unit bldFile="customization/wallpaperadapter/bld"/>
+      </component>
+      <component id="operatorlogoadapter" filter="s60" name="Operator Logo Adapter" class="plugin">
+        <unit bldFile="customization/operatorlogoadapter/bld"/>
+      </component>
+      <component id="screensaveradapter" filter="s60" name="Screen Saver Adapter" class="plugin">
+        <unit bldFile="customization/screensaveradapter/bld"/>
+      </component>
+      <component id="themesadapter" filter="s60" name="Themes Adapter" class="plugin">
+        <unit bldFile="customization/themesadapter/bld"/>
+      </component>
+      <component id="embeddedlinkadapter" filter="s60" name="Embedded Link Adapter" class="plugin">
+        <unit bldFile="customization/embeddedlinkadapter/bld"/>
+      </component>
+      <component id="customization_build" filter="s60" name="DM Customization Build">
+      	<!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed DM Customization ROM? -->
+        <unit bldFile="customization/group"/>
+      </component>
+    </collection>
+    <collection id="omacp" name="OMA Content Provisioning" level="oma">
+      <component id="omacpadapters" filter="s60" name="OMA CP Adapters" class="plugin">
+        <unit bldFile="omacp/omacpadapters/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- a/symbian3/app/dictionary/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/dictionary/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,109 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="dictionary" level="services" long-name="Dictionary">
-<collection name="s60">
-<component name="dictionary">
-<unit bldFile="/sf/app/dictionary/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
+        <collection name="userdict" long-name="User Dictionary" level="ui">
+          <!-- collection is really a component, move down a dir -->
+          <component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
+            <unit bldFile="/sf/app/dictionary/userdict/group"/>
+          </component>
+        </collection>
+        <collection name="dictionary_info" long-name="Dictionary Info" level="ui">
+          <component name="dictionary_plat" filter="s60" long-name="Dictionary Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/dictionary/dictionary_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/dictionary/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="dictionary" name="Dictionary" levels="utils ui">
+    <collection id="userdict" name="User Dictionary" level="ui">
+    	<!-- collection is really a component, move down a dir -->
+      <component id="userdict_build" filter="s60" name="Japanese User Dictionary">
+        <unit bldFile="userdict/group"/>
+      </component>
+    </collection>
+    <collection id="dictionary_info" name="Dictionary Info" level="ui">
+      <component id="dictionary_plat" filter="s60" name="Dictionary Platform Interfaces" class="api">
+        <unit bldFile="dictionary_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- a/symbian3/app/files/package_definition.xml	Wed Jan 27 11:36:41 2010 +0000
+++ b/symbian3/app/files/package_definition.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -1,109 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
-]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="files" level="apps" long-name="File Manager Apps">
-<collection name="s60">
-<component name="files">
-<unit bldFile="/sf/app/files/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+  <systemModel>
+    <layer name="app" long-name="Applications" levels="services apps">
+      <block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
+        <collection name="deviceencryption" long-name="Device Encryption" level="support">
+          <!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
+          <component name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
+            <unit bldFile="/sf/app/files/devencnotifplugin/group"/>
+          </component>
+          <component name="devencui" filter="s60" long-name="Device Encryption UI" introduced="^3">
+            <unit bldFile="/sf/app/files/devencui/group"/>
+          </component>
+          <component name="devencdmadapter" filter="s60" long-name="Device Encryption DM Adapter" introduced="^3" plugin="Y">
+            <unit bldFile="/sf/app/files/devencdmadapter/group"/>
+          </component>
+          <component name="devencgsplugin" filter="s60" long-name="Device Encryption GS Plugin" introduced="^3" plugin="Y">
+            <unit bldFile="/sf/app/files/devencgsplugin/group"/>
+          </component>
+          <component name="deviceencryption_help" filter="s60" long-name="Device Encryption Help" introduced="^3">
+            <unit bldFile="/sf/app/files/help/group"/>
+          </component>
+          <component name="deviceencryption_build" filter="s60" long-name="Device Encryption Build" introduced="^3">
+            <unit bldFile="/sf/app/files/deviceencryption/group"/>
+          </component>
+        </collection>
+        <collection name="filemanager" long-name="File Manager" level="apps">
+          <!-- this is really a component, should move down a directory -->
+          <component name="filemanager_build" filter="s60" long-name="File Manager Build">
+            <unit bldFile="/sf/app/files/filemanager/group"/>
+          </component>
+        </collection>
+        <collection name="filesystemuis" long-name="File System UIs" level="support">
+          <component name="memscaneng" filter="s60" long-name="Memory Scan Server">
+            <unit bldFile="/sf/app/files/filesystemuis/memscaneng/group"/>
+          </component>
+          <component name="memstatepopup" filter="s60" long-name="Memory State Popup">
+            <unit bldFile="/sf/app/files/filesystemuis/memstatepopup/group"/>
+          </component>
+        </collection>
+        <collection name="files_info" long-name="File Manager Apps Info" level="apps">
+          <component name="files_plat" filter="s60" long-name="File Manager Apps Platform Interfaces" class="api">
+            <unit bldFile="/sf/app/files/files_plat/group"/>
+          </component>
+        </collection>
+      </block>
+    </layer>
+  </systemModel>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/files/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="files" name="File Manager Apps" levels="support apps">
+    <collection id="deviceencryption" name="Device Encryption" level="support">
+		<!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->		
+      <component id="devencnotifplugin" filter="s60" name="Device Encryption Notifier Plugin" class="plugin" introduced="^3">
+        <unit bldFile="devencnotifplugin/group"/>
+      </component>
+      <component id="devencui" filter="s60" name="Device Encryption UI" introduced="^3">
+        <unit bldFile="devencui/group"/>
+      </component>
+      <component id="devencdmadapter" filter="s60" name="Device Encryption DM Adapter" class="plugin" introduced="^3">
+        <unit bldFile="devencdmadapter/group"/>
+      </component>
+      <component id="devencgsplugin" filter="s60" name="Device Encryption GS Plugin" class="plugin" introduced="^3">
+        <unit bldFile="devencgsplugin/group"/>
+      </component>
+      <component id="deviceencryption_help" filter="s60" name="Device Encryption Help" introduced="^3">
+        <unit bldFile="help/group"/>
+      </component>
+      <component id="deviceencryption_build" filter="s60" name="Device Encryption Build" introduced="^3">
+        <unit bldFile="deviceencryption/group"/>
+      </component>
+    </collection>
+    <collection id="filemanager" name="File Manager" level="apps">
+		<!-- this is really a component, should move down a directory -->
+      <component id="filemanager_build" filter="s60" name="File Manager Build">
+        <unit bldFile="filemanager/group"/>
+      </component>
+    </collection>
+    <collection id="filesystemuis" name="File System UIs" level="support">
+      <component id="memscaneng" filter="s60" name="Memory Scan Server">
+        <unit bldFile="filesystemuis/memscaneng/group"/>
+      </component>
+      <component id="memstatepopup" filter="s60" name="Memory State Popup">
+        <unit bldFile="filesystemuis/memstatepopup/group"/>
+      </component>
+    </collection>
+    <collection id="files_info" name="File Manager Apps Info" level="apps">
+      <component id="files_plat" filter="s60" name="File Manager Apps Platform Interfaces" class="api">
+        <unit bldFile="files_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/graphicsuis/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="graphicsuis" name="Graphics UIs" levels="util ui">
+    <collection id="graphicsuis_info" name="Graphics UIs Info" level="ui">
+      <component id="graphicsuis_plat" filter="s60" name="Graphics UIs Platform Interfaces" class="api">
+        <unit bldFile="graphicsuis_plat/group"/>
+      </component>
+    </collection>
+    <collection id="svgtviewer" name="SVG-T Viewer" level="ui">
+      <component id="svgtviewerplugin" filter="s60" name="SVG-T Viewer Plugin">
+        <unit bldFile="svgtviewer/svgtviewerplugin/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/helps/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="helps" name="Help Apps" levels="eng tools if ui">
+    <collection id="csxhelp" name="Context Sensitive Extended Help" level="if">
+    	<!-- this is really a component. Should move it down a directory -->
+      <component id="csxhelp_build" filter="s60" name="Context Sensitive Extended Help Build">
+        <unit bldFile="csxhelp/group"/>
+      </component>
+    </collection>
+    <collection id="symhelp" name="Symbian Help" level="eng">
+      <component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
+        <unit bldFile="symhelp/helpmodel/group" mrp="symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
+      </component>
+    </collection>
+    <collection id="helps_info" name="Help Apps Info" level="ui">
+      <component id="helps_metadata" name="Help Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="helps_info/helps_metadata/helps_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/homescreen/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="homescreen" name="Home Screen Apps" levels="fw apps">
+    <collection id="idlehomescreen" name="Idle Home Screen" level="apps">
+      <component id="nativeuicontroller" filter="s60" name="Native UI Controller">
+        <unit bldFile="idlehomescreen/nativeuicontroller/group"/>
+      </component>
+      <component id="exths" filter="s60" name="Active Idle Container" class="plugin">
+      	<!-- why is the ID so different from the name? Is one wrong? -->
+        <unit bldFile="idlehomescreen/exths/group"/>
+      </component>
+      <component id="hscontentcontrol" filter="s60" name="Home Screen Content Control" introduced="^3">
+        <unit bldFile="idlehomescreen/hscontentcontrol/group"/>
+      </component>
+      <component id="hssapiwrapper" filter="s60" name="HS SAPI Wrapper" introduced="^3">
+      	<!--  can only have one unit. #include from a common bld.inf, or split into two components -->
+        <unit bldFile="idlehomescreen/sapiwrapper/cpswrapper/group"/>
+        <unit bldFile="idlehomescreen/sapiwrapper/hspswrapper/group"/>
+      </component>
+      <component id="xmluirendering" filter="s60" name="XML UI Rendering" introduced="^3">
+        <unit bldFile="idlehomescreen/xmluirendering/group"/>
+      </component>
+      <component id="xmluicontroller" filter="s60" name="XML UI Controller" introduced="^3">
+        <unit bldFile="idlehomescreen/xmluicontroller/group"/>
+      </component>
+      <component id="widgetmanager" filter="s60" name="Widget Manager" introduced="^3">
+        <unit bldFile="idlehomescreen/widgetmanager/group"/>
+      </component>
+      <component id="idlehomescreen_help" filter="s60" name="Idle Home Screen Help">
+        <unit bldFile="idlehomescreen/help/group"/>
+      </component>
+      <component id="idlehomescreen_data" filter="s60" name="Idle Home Screen Data">
+        <meta rel="config">
+        	<condition not-defined="FF_HOMESCREEN_COMMON_IDLEFW"/>
+        		<!-- currently always on, so safe to define here for now -->
+        </meta>
+        <unit bldFile="idlehomescreen/data/group"/>
+      </component>
+      <component id="idlehomescreen_build" filter="s60" name="Idle Home Screen Build">
+      	<!-- can the loc file be moved to another comopnent and this one removed?f -->
+        <unit bldFile="idlehomescreen/group"/>
+      </component>
+      <component id="homescreen_test" filter="s60,test" purpose="development" name="Home Screen Apps Test">
+      	<!--  why isn't this #included from widgetmanager? -->
+        <unit bldFile="idlehomescreen/widgetmanager/tsrc/wmunittest/group"/>
+      </component>      
+    </collection>
+    <collection id="menufw" name="Menu Framework" level="fw">
+      <component id="hierarchynavigator" filter="s60" name="Hierarchy Navigator">
+        <unit bldFile="menufw/hierarchynavigator/group"/>
+      </component>
+      <component id="menufwui" filter="s60" name="Menu Framework UI">
+        <unit bldFile="menufw/menufwui/group"/>
+      </component>
+      <component id="menusuites" filter="s60" name="Menu Suites">
+        <unit bldFile="menufw/menusuites/group"/>
+      </component>
+      <component id="menufw_build" filter="s60" name="Menu Framework Build">
+      	<!-- can the exports be exported by the other components? -->
+        <unit bldFile="menufw/group"/>
+      </component>
+    </collection>
+    <collection id="taskswitcher" name="Task Switcher" level="apps">
+      <component id="contextengine" filter="s60" name="Context Engine" introduced="^3">
+        <unit bldFile="taskswitcher/contextengine/group"/>
+      </component>
+      <component id="taskswitcherui" filter="s60" name="Task Switcher UI" introduced="^3">
+        <unit bldFile="taskswitcher/taskswitcherui/group"/>
+      </component>
+    </collection>
+    <collection id="homescreen_info" name="Home Screen Apps Info" level="apps">
+      <component id="homescreen_plat" filter="s60" name="Home Screen Apps Platform Interfaces" class="api">
+        <unit bldFile="homescreen_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/homescreentools/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="homescreentools" name="Home Screen Tools" levels="tool install">
+    <collection id="dtdinstaller" name="DTD Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+    	<!-- this needs to be built first, does build order need to be forced with filters? -->
+      <component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/dtdinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themeinstaller" name="Theme Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/themeinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="widgettools" name="Widget Tools" level="install">
+      <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="/tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
+      </component>
+      <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="/tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themetool" name="Theme Tool" level="tool">
+      <component id="themetool_build" filter="s60" name="Theme Tool Build"  target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/themetool/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/im/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="im" name="Instant Messaging Apps" levels="support prot engine apps">
+    <collection id="wvsettings20" name="Wireless Village Settings Engine" level="support">
+      	<!-- this is really a component. should move down a directory -->
+      <component id="wvsapsettingsstore" name="WV SAP Settings Store" filter="s60" introduced="9.3">
+        <unit bldFile="wvsettings20/group"/>
+      </component>
+    </collection>
+    <collection id="im_info" name="Instant Messaging Apps Info" level="apps">
+      <component id="im_plat" filter="s60" name="Instant Messaging Apps Platform Interfaces" class="api">
+        <unit bldFile="im_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/iptelephony/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="iptelephony" name="IP Telephony" levels="eng plugin util ui">
+    <collection id="iptelcommsconfig" name="IP Telephony Comms Config" level="ui">
+      <component id="cscgsplugin" filter="s60" name="CSC GS Plugin" class="plugin" introduced="^2">
+        <unit bldFile="commsconfig/cscgsplugin/group"/>
+      </component>
+      <component id="cscsipvoipcleanupplugin" filter="s60" name="CSC SIP VoIP Cleanup Plugin" class="plugin" introduced="^2">
+        <unit bldFile="commsconfig/cscsipvoipcleanupplugin/group"/>
+      </component>
+      <component id="cscengine" filter="s60" name="Connection Service Configurator Engine" introduced="^2">
+        <unit bldFile="commsconfig/cscengine/group"/>
+      </component>
+      <component id="cscsettingsui" filter="s60" name="CSC Settings UI" introduced="^2">
+        <unit bldFile="commsconfig/cscsettingsui/group"/>
+      </component>
+      <component id="cscapplicationui" filter="s60" name="CSC Application UI" introduced="^2">
+        <unit bldFile="commsconfig/cscapplicationui/group"/>
+      </component>
+      <component id="commsconfig_build" filter="s60" name="Comms Config Build" introduced="^2">
+      	<!--  consider distributing this into the above components -->
+        <unit bldFile="commsconfig/group"/>
+      </component>
+    </collection>
+    <collection id="convergedconnectionhandler" name="Converged Connection Handler" level="eng">
+      <component id="cchserver" filter="s60" name="CCH Server" introduced="^2">
+        <unit bldFile="convergedconnectionhandler/cchserver/group"/>
+      </component>
+      <component id="cchclient" filter="s60" name="CCH Client" introduced="^2">
+        <unit bldFile="convergedconnectionhandler/cchclient/group"/>
+      </component>
+      <component id="cchclientapi" filter="s60" name="CCH Client API" introduced="^2">
+        <unit bldFile="convergedconnectionhandler/cchclientapi/group"/>
+      </component>
+      <component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
+      	<!--  consider distributing this into the above components, or collapse the collection into a single component. 
+      		The latter is a better option since clients and sevrers are rarely separate components -->
+        <unit bldFile="convergedconnectionhandler/group"/>
+      </component>
+    </collection>
+    <collection id="richcallsettingsengine" name="Rich Call Settings Engine" level="eng">
+      <component id="rcse2" filter="s60" name="Rich Call Settings Engine Build" introduced="^2">
+        <unit bldFile="richcallsettingsengine/rcse2/group"/>
+      </component>
+    </collection>
+    <collection id="sipvoipprovider" name="SIP VoIP Provider" level="plugin">
+    	<!-- collection is really a component. Should move down a directory -->
+      <component id="svp" filter="s60" name="SIP VoIP Provider Build" class="plugin" introduced="^2">
+        <unit bldFile="sipvoipprovider/group"/>
+      </component>
+    </collection>
+    <collection id="voipplugins" name="VoIP Plugins" level="plugin">
+      <component id="sipmxresolver" filter="s60" name="SIP MX Resolver" class="plugin" introduced="^2">
+        <unit bldFile="voipplugins/sipmxresolver/group"/>
+      </component>
+      <component id="sipconnectionprovider" filter="s60" name="SIP Connection Provider" class="plugin" introduced="^2">
+        <unit bldFile="voipplugins/sipconnectionprovider/group"/>
+        	<!-- can only have one unit, can the next be #'included from the above? -->
+        <unit bldFile="voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
+      </component>
+      <component id="ipapputils" filter="s60" name="IP App Utils" introduced="^2">
+        <unit bldFile="voipplugins/ipapputils/group"/>
+      </component>
+      <component id="voipadapters" filter="s60" name="VoIP Adapters" class="plugin" introduced="^2">
+        <unit bldFile="voipplugins/voipadapters/group"/>
+      </component>
+      <component id="accountcreationplugin" filter="s60" name="Account Creation Plugin" class="plugin" introduced="^2">
+        <unit bldFile="voipplugins/accountcreationplugin/group"/>
+      </component>
+      <component id="dhcppositionprovider" filter="s60" name="DHCP Position Provider" class="plugin" introduced="^2">
+        <unit bldFile="voipplugins/dhcppositionprovider/group"/>
+      </component>
+      <component id="svtmatching" filter="s60" name="SIP VoIP Telephony Matching" class="plugin" introduced="^2">
+        <unit bldFile="voipplugins/svtmatching/group"/>
+      </component>
+      <component id="svtlogging" filter="s60" name="SVT Logging" class="plugin" introduced="^2">
+        <unit bldFile="voipplugins/svtlogging/group"/>
+      </component>
+      <component id="svtcallmenu" filter="s60" name="SVT Call Menu" class="plugin" introduced="^2">
+        <unit bldFile="voipplugins/svtcallmenu/group"/>
+      </component>
+      <component id="sipimresolver" filter="s60" name="SIP IM Resolver" class="plugin" introduced="^3">
+        <unit bldFile="voipplugins/sipimresolver/group"/>
+      </component>
+    </collection>
+    <collection id="callcontinuity" name="Call Continuity" level="util">
+      <component id="vccutils" filter="s60" name="VCC Utils" introduced="^2">
+        <unit bldFile="callcontinuity/vccutils/group"/>
+      </component>
+      <component id="nsmldmvccadapter" filter="s60" name="SyncML DM VCC Adapter" class="plugin" introduced="^2">
+        <unit bldFile="callcontinuity/nsmldmvccadapter/group"/>
+      </component>
+      <component id="vccclientprovisioningadapter" filter="s60" name="VCC Client Provisioning Adapter" class="plugin" introduced="^2">
+        <unit bldFile="callcontinuity/vccclientprovisioningadapter/group"/>
+      </component>
+      <component id="vccpropertyhandler" filter="s60" name="VCC Property Handler" introduced="^2">
+        <unit bldFile="callcontinuity/vccpropertyhandler/group"/>
+      </component>
+      <component id="vcchotrigger" filter="s60" name="VCC HO Trigger" introduced="^2">
+        <unit bldFile="callcontinuity/vcchotrigger/group"/>
+      </component>
+      <component id="vcc" filter="s60" name="VoIP Call Continuity" class="plugin" introduced="^2">
+        <unit bldFile="callcontinuity/vcc/group"/>
+      </component>
+      <component id="callcontinuity_build" filter="s60" name="Call Continuity Build" introduced="^2">
+      	<!--  consider distributing this into the above components -->
+        <unit bldFile="callcontinuity/group"/>
+      </component>
+    </collection>
+    <collection id="iptelephony_info" name="IP Telephony Info" level="ui">
+      <component id="iptel_plat" filter="s60" class="api" name="IP Telephony Platform Interfaces" introduced="^2">
+        <unit bldFile="iptel_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/location/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="location" name="Location Apps" levels="ui events loc apps">
+    <collection id="basiclocationinfodisplay" name="Basic Location Info Display" level="ui">
+      <component id="blid" filter="s60" name="Basic Location Info Display Build">
+        <unit bldFile="basiclocationinfodisplay/blid/group"/>
+      </component>
+    </collection>
+    <collection id="landmarksui" name="Landmarks UI" level="loc">
+      <component id="landmarksui_help" filter="s60" name="Landmarks UI Help">
+        <unit bldFile="landmarksui/help/group"/>
+      </component>
+      <component id="landmarksui_engine" filter="s60" name="Landmarks UI Engine">
+        <unit bldFile="landmarksui/engine/group"/>
+      </component>
+      <component id="uicontrols" filter="s60" name="Landmarks UI Controls">
+        <unit bldFile="landmarksui/uicontrols/group"/>
+      </component>
+      <component id="landmarksui_commonui" filter="s60" name="Landmarks Common UI">
+        <unit bldFile="landmarksui/commonui/group"/>
+      </component>
+      <component id="landmarksui_app" filter="s60" name="Landmarks Application">
+        <unit bldFile="landmarksui/app/group"/>
+      </component>
+      <component id="msgviewer" filter="s60" name="Landmarks Message Viewer">
+        <unit bldFile="landmarksui/msgviewer/group"/>
+      </component>
+      <component id="landmarksui_build" filter="s60" name="Landmarks UI Build">
+      	<!-- consider distributing this into the other components or collapsing into a single component -->
+        <unit bldFile="landmarksui/group"/>
+      </component>
+    </collection>
+    <collection id="eventsui" name="Location Events UI" level="events">
+      <component id="eventsui_help" filter="s60" name="Events Help">
+        <unit bldFile="eventsui/help/group"/>
+      </component>
+      <component id="eventsutils" filter="s60" name="Events Utils">
+        <unit bldFile="eventsui/eventsutils/group"/>
+      </component>
+      <component id="eventsengine" filter="s60" name="Events Engine">
+        <unit bldFile="eventsui/eventsengine/group"/>
+      </component>
+      <component id="eventshandlerui" filter="s60" name="Events Handler UI">
+        <unit bldFile="eventsui/eventshandlerui/group"/>
+      </component>
+      <component id="eventseditor" filter="s60" name="Events Editor">
+        <unit bldFile="eventsui/eventseditor/group"/>
+      </component>
+      <component id="eventsmgmtui" filter="s60" name="Events Management UI">
+        <unit bldFile="eventsui/eventsmgmtui/group"/>
+      </component>
+      <component id="eventsui_build" filter="s60" name="Events UI Build">
+      	<!-- consider distributing this into the other components or collapsing into a single component -->
+        <unit bldFile="eventsui/group"/>
+      </component>
+    </collection>
+    <collection id="locationlandmarksrefappfors60" name="Location Landmarks Reference App for S60" level="apps">
+      <component id="lmrefapp" filter="s60" name="Landmarks Reference Application">
+        <unit bldFile="locationlandmarksrefappfors60/group"/>
+      </component>
+    </collection>
+    <collection id="locationlandmarksuirefapp" name="Location Landmarks UI Reference App" level="apps">
+      <component id="lmuirefapp" filter="s60" name="Landmarks UI Reference Application">
+        <unit bldFile="locationlandmarksuirefapp/group"/>
+      </component>
+    </collection>
+    <collection id="locationsatviewrefapp" name="Location Satellite View Reference App" level="apps">
+      <component id="satellitereference" filter="s60" name="Satellite Info UI Reference Application">
+        <unit bldFile="locationsatviewrefapp/group"/>
+      </component>
+    </collection>
+    <collection id="simpsyconfigurator" name="Simulation PSY Configurator" level="ui">
+      <component id="simpsyui" filter="s60" name="Simulation PSY UI">
+        <unit bldFile="simpsyconfigurator/group"/>
+      </component>
+    </collection>
+    <collection id="mapnavproviderrefapp" name="Map and Navigation Provider Reference App" level="apps">
+      <component id="mapnavproviderrefapp_build" filter="s60" name="Map and Navigation Provider Reference Application">
+        <unit bldFile="mapnavproviderrefapp/group"/>
+      </component>
+    </collection>
+    <collection id="location_info" name="Location Apps Info" level="loc">
+      <component id="location_test" filter="s60" purpose="development" name="Location Apps Test">
+       	<!-- should this be uncommented? -->
+        <!-- <unit bldFile="tsrc/group"/> -->
+      </component>
+      <component id="loc_pub" filter="s60" class="api" name="Location Apps Public Interfaces">
+        <unit bldFile="loc_pub/group"/>
+       	<!-- what to do with these test units? -->
+        <!-- <unit bldFile="loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
+        <!-- <unit bldFile="loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
+        <!-- <unit bldFile="loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
+        <!-- <unit bldFile="loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/messaging/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="messaging" name="Messaging Apps" levels="mail eng base ui">
+    <collection id="mobilemessaging" name="Mobile Messaging" level="ui">
+      <component id="audiomsg" filter="s60" name="Audio Message">
+        <unit bldFile="mobilemessaging/audiomsg/group"/>
+      </component>
+      <component id="msgmedia" filter="s60" name="Message Media">
+        <unit bldFile="mobilemessaging/msgmedia/group"/>
+      </component>
+      <component id="unieditor" filter="s60" name="Unified Editor">
+        <unit bldFile="mobilemessaging/unieditor/group"/>
+      </component>
+      <component id="mmsui" filter="s60" name="MMS UI">
+        <unit bldFile="mobilemessaging/mmsui/group"/>
+      </component>
+      <component id="postcard" filter="s60" name="Postcard">
+        <unit bldFile="mobilemessaging/postcard/group"/>
+      </component>
+      <component id="smilui" filter="s60" name="SMIL UI">
+        <unit bldFile="mobilemessaging/smilui/group"/>
+      </component>
+      <component id="smum" filter="s60" name="SMS UI MTM and UI Data MTM" class="plugin">
+        <unit bldFile="mobilemessaging/smum/group"/>
+      </component>
+      <component id="smsui" filter="s60" name="SMS UI">
+        <unit bldFile="mobilemessaging/smsui/group"/>
+		<!-- does this bld.inf need to be included in the group one? -->
+        <!-- <unit bldFile="mobilemessaging/smsui/viewer"/> -->
+      </component>
+      <component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
+        <unit bldFile="mobilemessaging/smsmtm/group" mrp="mobilemessaging/smsmtm/group/messaging_sms.mrp"/>
+      </component>
+    </collection>
+    <collection id="mmsengine" name="MMS Engine" level="eng">
+      <component id="mmsconninit" filter="s60" name="MMS Connection Initiator">
+        <!-- <unit bldFile="mmsengine/mmsconninit/bld"/> -->
+      </component>
+      <component id="genutils" filter="s60" name="General Utils">
+        <!-- <unit bldFile="mmsengine/genutils/bld"/> -->
+      </component>
+      <component id="mmsserversettings" filter="s60" name="MMS Server Settings">
+        <!-- <unit bldFile="mmsengine/mmsserversettings/bld"/> -->
+      </component>
+      <component id="mmsmessage" filter="s60" name="MMS Message">
+        <!-- <unit bldFile="mmsengine/mmsmessage/bld"/> -->
+      </component>
+      <component id="mmshttptransport" filter="s60" name="MMS HTTP Transport">
+        <!-- <unit bldFile="mmsengine/mmshttptransport/bld"/> -->
+      </component>
+      <component id="mmscodec" filter="s60" name="MMS Codec">
+        <!-- <unit bldFile="mmsengine/mmscodec/bld"/> -->
+      </component>
+      <component id="mmsserver" filter="s60" name="MMS Server">
+        <!-- <unit bldFile="mmsengine/mmsserver/bld"/> -->
+      </component>
+      <component id="clientmtm" filter="s60" name="MMS Client MTM" class="plugin">
+        <!-- <unit bldFile="mmsengine/clientmtm/bld"/> -->
+      </component>
+      <component id="mmswatcher" filter="s60" name="MMS Watcher" class="plugin">
+        <!-- <unit bldFile="mmsengine/mmswatcher/bld"/> -->
+      </component>
+      <component id="mmspushhandler" filter="s60" name="MMS Push Handler" class="plugin">
+        <!-- <unit bldFile="mmsengine/mmspushhandler/bld"/> -->
+      </component>
+      <component id="applicationadapter" filter="s60" name="MMS Application Adapter">
+        <!-- <unit bldFile="mmsengine/applicationadapter/bld"/> -->
+      </component>
+      <component id="mmscodecclient" filter="s60" name="MMS Codec Client">
+        <!-- <unit bldFile="mmsengine/mmscodecclient/bld"/> -->
+      </component>
+      <component id="mmssettings" name="MMS Settings" introduced="9.2" purpose="optional">
+        <unit bldFile="mmsengine/mmssettings/group" mrp="mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+      </component>
+      <component id="mmsconf" name="MMS Configuration" purpose="optional">
+		<unit bldFile="mmsengine/mmsconf" mrp="mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
+      </component>
+      <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
+	   <!-- this bld.inf should be broken up into the individual other components -->
+        <unit bldFile="mmsengine/group"/>
+      </component>
+    </collection>
+    <collection id="messagingappbase" name="Messaging App Base" level="base">
+      <component id="msgavkon" filter="s60" name="Messaging Avkon UI">
+        <unit bldFile="messagingappbase/msgavkon/group"/>
+      </component>
+      <component id="mce" filter="s60" name="Message Center Application">
+        <unit bldFile="messagingappbase/mce/group"/>
+      </component>
+      <component id="mceextraitems" filter="s60" name="Message Center Extra Items">
+        <unit bldFile="messagingappbase/mceextraitems/group"/>
+      </component>
+      <component id="mcesettings" filter="s60" name="Message Center Settings">
+        <unit bldFile="messagingappbase/mcesettings/group"/>
+      </component>
+      <component id="msgerrorwatcher" filter="s60" name="Messaging Error Watcher" class="plugin">
+        <unit bldFile="messagingappbase/msgerrorwatcher/group"/>
+      </component>
+      <component id="ncnlist" filter="s60" name="New Contacts Note List">
+        <unit bldFile="messagingappbase/ncnlist/group"/>
+      </component>
+      <component id="schemeplugin" filter="s60" name="Scheme Handler Plugin" class="plugin">
+        <unit bldFile="messagingappbase/schemeplugin/group"/>
+      </component>
+      <component id="sendui" filter="s60" name="Send UI" class="plugin">
+        <unit bldFile="messagingappbase/sendui/group"/>
+		<!-- do these bld.infs need to be included in the group one? -->
+        <!-- <unit bldFile="messagingappbase/sendui/drmlinksender/group"/> -->
+        <!-- <unit bldFile="messagingappbase/sendui/genericmtmplugin/group"/> -->
+        <!-- <unit bldFile="messagingappbase/sendui/meetingrequestsender/group"/> -->
+      </component>
+      <component id="smilengine" filter="s60" name="SMIL Engine">
+        <unit bldFile="messagingappbase/smilengine/group"/>
+      </component>
+      <component id="bium" filter="s60" name="BIO UI MTM" class="plugin">
+        <unit bldFile="messagingappbase/bium/group"/>
+      </component>
+      <component id="smartmessaging" filter="s60" name="Smart Messaging">
+        <unit bldFile="messagingappbase/smartmessaging/group"/>
+      </component>
+      <component id="msgeditor" filter="s60" name="Messaging Editor">
+        <unit bldFile="messagingappbase/msgeditor/group"/>
+      </component>
+      <component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
+        <unit bldFile="messagingappbase/smilparser/GROUP" mrp="messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+      </component>
+      <component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
+        <unit bldFile="messagingappbase/obexmtms/Group" mrp="messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
+      </component>
+    </collection>
+    <collection id="email" name="Email" level="mail">
+		<!-- use commonemail instead -->
+      <component id="alwaysonlineemailplugin" filter="s60" name="Always Online Mail Plugin" class="plugin" deprecated="^3">
+        <unit bldFile="email/alwaysonlineemailplugin/group"/>
+      </component>
+      <component id="emailnotificationhandler" filter="s60" name="Email Notification Handler" class="plugin" deprecated="^3">
+        <unit bldFile="email/emailnotificationhandler/group"/>
+      </component>
+      <component id="imum" filter="s60" name="Internet Mail UI MTM" class="plugin" deprecated="^3">
+        <unit bldFile="email/imum/group"/>
+		<!-- do these bld.infs need to be included in the group one? -->
+        <!-- <unit bldFile="email/imum/domainapi/group"/> -->
+        <!-- <unit bldFile="email/imum/mtms/group"/> -->
+        <!-- <unit bldFile="email/imum/utils/group"/> -->
+      </component>
+      <component id="mail" filter="s60" name="Mail Application" deprecated="^3">
+        <unit bldFile="email/mail/group"/>
+      </component>
+      <component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
+        <unit bldFile="email/pop3andsmtpmtm/group" mrp="email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+      </component>
+      <component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
+        <unit bldFile="email/imap4mtm/group" mrp="email/imap4mtm/group/messaging_email_imap.mrp"/>
+      </component>
+    </collection>
+    <collection id="messaging_info" name="Messaging Apps Info" level="ui">
+      <component id="messaging_test" filter="s60" name="Messaging Apps Test" purpose="development">
+        <!-- <unit bldFile="tsrc/group"/> -->
+      </component>
+      <component id="msg_plat" name="Messaging Apps Platform APIs"  filter="s60" class="api">
+        <unit bldFile="msg_plat/group"/>
+        <unit bldFile="msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
+        <unit bldFile="msg_plat/messaging_editor_api/tsrc/group"/>
+        <unit bldFile="msg_plat/messaging_media_resolver_api/tsrc/group"/>
+        <unit bldFile="msg_plat/mms_application_api/tsrc/group"/>
+        <unit bldFile="msg_plat/mms_codec_client_api/tsrc/group"/>
+        <unit bldFile="msg_plat/mms_conformance_api/tsrc/group"/>
+        <unit bldFile="msg_plat/mms_server_settings_api/tsrc/group"/>
+        <!-- <unit bldFile="msg_plat/email_domain_utilities_api/tsrc/group"/> -->
+        <!-- <unit bldFile="msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
+        <unit bldFile="msg_plat/smil_engine_api/tsrc/group"/>
+        <unit bldFile="msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
+      </component>
+      <component id="msg_pub" name="Messaging Apps Public APIs" filter="s60" class="api">
+        <unit bldFile="msg_pub/group"/>
+        <unit bldFile="msg_pub/mms_client_mtm_api/tsrc/group"/>
+        <unit bldFile="msg_pub/plugin_bio_control_api/tsrc/group"/>
+        <!-- <unit bldFile="msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
+        <!-- <unit bldFile="msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
+      </component>
+      <component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/mmsharinguis/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="mmsharinguis" name="Multimedia Sharing UIs" levels="base plugin if">
+    <collection id="mmsharing" name="Multimedia Sharing" level="base">
+      <component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
+        <unit bldFile="mmsharing/mmshavailability/group"/>
+    	   <!-- is this test unit needed? -->
+        <!-- <unit bldFile="mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
+      </component>
+      <component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
+        <unit bldFile="mmsharing/mmshindicator/group"/>
+      	 <!-- are these test units needed? -->
+        <!-- <unit bldFile="mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
+        <!-- <unit bldFile="mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
+      </component>
+      <!-- consider putting client and server in the same component -->
+      <component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
+        <unit bldFile="mmsharing/mmshmanagercli/group"/>
+	       <!-- is this test unit needed? -->
+        <!-- <unit bldFile="mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
+      </component>
+      <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
+        <unit bldFile="mmsharing/mmshmanagersrv/group"/>
+	       <!-- is this test unit needed? -->
+        <!-- <unit bldFile="mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
+      </component>
+      <component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
+        <unit bldFile="mmsharing/mmshengine/group"/>
+	       <!-- is this test unit needed? -->
+        <!-- <unit bldFile="mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
+      </component>
+      <component id="mmshui" filter="s60" name="Multimedia Sharing UI">
+      	<!-- can only have one unti: need to #include one from the other if it's needed -->
+        <unit bldFile="mmsharing/mmshui/group"/>
+        <unit bldFile="mmsharing/mmshui/help/group"/>
+               <!-- is this test unit needed? -->
+        <!-- <unit bldFile="mmsharing/mmshui/tsrc/ut_ui/group"/> -->
+      </component>
+      <component id="mmsharing_build" filter="s60" name="MM Sharing Build">
+        <unit bldFile="mmsharing/group"/>
+      </component>
+    </collection>
+    <collection id="mmshplugins" name="Multimedia Sharing Plugins" level="plugin">
+      <component id="mmshaoplugin" filter="s60" name="Multimedia Sharing Always Online Plugin" class="plugin">
+        <unit bldFile="mmshplugins/mmshaoplugin/group"/>
+        <!-- <unit bldFile="mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
+      </component>
+      <component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
+        <unit bldFile="mmshplugins/mmshaiwplugin/group"/>
+        <!-- <unit bldFile="mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group"/> -->
+      </component>
+      <component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
+        <unit bldFile="mmshplugins/mmshsipcrplugin/group"/>
+        <!-- <unit bldFile="mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
+      </component>
+      <component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
+        <unit bldFile="mmshplugins/mmshsettingsuiplugin/group"/>
+      </component>
+      <component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
+        <unit bldFile="mmshplugins/mmshwpadapterplugin/group"/>
+        <!-- <unit bldFile="mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
+      </component>
+      <component id="mmcctranscoder" filter="s60" name="MMCC Transcoder" class="plugin">
+     		<!-- MMCC? What's that stand for? -->
+        <unit bldFile="mmshplugins/mmcctranscoder/group"/>
+        <!-- <unit bldFile="mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
+        <!-- <unit bldFile="mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group"/> -->
+      </component>
+      <component id="mmshplugins_build" filter="s60" name="MM Sharing Plugins Build">
+        <unit bldFile="mmshplugins/group"/>
+      </component>
+    </collection>
+    <collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
+      <component id="mmsharinguis_build" filter="s60" name="Multimedia Sharing UIs Build">
+      	<!--  consider distributing to other components -->
+        <unit bldFile="group"/>
+      </component>
+      <component id="mmsharinguis_plat" filter="s60" name="Multimedia Sharing UIs Platform Interfaces" class="api">
+        <unit bldFile="mmsharinguis_plat/group"/>
+        <!-- <unit bldFile="mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/musicplayer/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="musicplayer" name="Music Player Apps" levels="plugins support hs app">
+    <collection id="musicvisualization" name="Music Visualization" level="plugins">
+      <component id="musicvisualizationplugin" filter="s60" name="Music Visualization Plugin" class="plugin">
+        <unit bldFile="musicvisualization/musicvisualizationplugin/group"/>
+      </component>
+      <component id="mpxvisualizationplugins" filter="s60" name="MPX Visualization Plugins" class="plugin">
+        <unit bldFile="musicvisualization/mpxvisualizationplugins/group"/>
+      </component>
+    </collection>
+    <collection id="mpxmusicplayer" name="MPX Music Player" level="app">
+      <component id="mpxmusicplayer_help" filter="s60" name="Help">
+        <unit bldFile="mpxmusicplayer/help/group"/>
+      </component>
+      <component id="mpxmusicplayer_commonui" filter="s60" name="MPX Common UI">
+        <unit bldFile="mpxmusicplayer/commonui/group"/>
+      </component>
+      <component id="activeidle" filter="s60" name="MPX Active Idle">
+        <unit bldFile="mpxmusicplayer/activeidle/group"/>
+      </component>
+      <component id="metadatahandler" filter="s60" name="MPX Metadata Handler">
+        <unit bldFile="mpxmusicplayer/metadatahandler/group"/>
+      </component>
+      <component id="mediakeyhandler" filter="s60" name="MPX Media Key Handler">
+        <unit bldFile="mpxmusicplayer/mediakeyhandler/group"/>
+      </component>
+      <component id="mpxmusicplayer_app" filter="s60" name="MPX Application">
+        <unit bldFile="mpxmusicplayer/app/group"/>
+      </component>
+      <component id="mpxmusicplayer_build" filter="s60" name="MPX Music Player Build">
+      	<!--  can the exports be distributed to the above components?  -->
+        <unit bldFile="mpxmusicplayer/group"/>
+      </component>
+    </collection>
+    <collection id="musichomescreen" name="Music Home Screen" level="hs">
+      <component id="mpxcollectionpublisher" filter="s60" name="MPX Collection Publisher" introduced="^2">
+        <unit bldFile="musichomescreen/mpxcollectionpublisher/group"/>
+      </component>
+      <component id="musiccontentpublisher" filter="s60" name="Music Content Publisher" introduced="^2">
+        <unit bldFile="musichomescreen/musiccontentpublisher/group"/>
+      </component>
+      <component id="mcpmusicplayer" filter="s60" name="Music Player MCP Plugin" class="plugin" introduced="^2">
+        <unit bldFile="musichomescreen/mcpmusicplayer/group"/>
+      </component>
+      <component id="musicplayeractionhandlerplugin" filter="s60" name="Music Player Action Handler Plugin" class="plugin" introduced="^2">
+        <unit bldFile="musichomescreen/musicplayeractionhandlerplugin/group"/>
+      </component>
+      <component id="data" filter="s60" name="MPX Data" introduced="^2">
+      	<!-- does this make sense to be a component? should it just be #include from musichomescreen/group? -->
+        <unit bldFile="musichomescreen/data/themes/default/group"/>
+      </component>
+      <component id="musichomescreen_build" filter="s60" name="Music Homescreen Build" introduced="^2">
+        <unit bldFile="musichomescreen/group"/>
+      </component>
+    </collection>
+    <collection id="mpxplugins" name="MPX Plugins" level="plugins">
+      <component id="serviceplugins" filter="s60" name="MPX Service Plugins" class="plugin">
+        <unit bldFile="mpxplugins/serviceplugins/group"/>
+      </component>
+      <component id="viewplugins" filter="s60" name="MPX View Plugins" class="plugin">
+        <unit bldFile="mpxplugins/viewplugins/group"/>
+      </component>
+      <component id="mpxplugins_build" filter="s60" name="MPX Plugins Build">
+      	<!--  can the exports be distributed to the above components?  -->
+        <unit bldFile="mpxplugins/group"/>
+      </component>
+    </collection>
+    <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
+      <component id="musicplayer_plat" filter="s60" name="Music Player Apps Platform Interfaces" class="api">
+        <unit bldFile="musicplayer_plat/group"/>
+        	<!-- can only have one unit. Need to #include the rest from the above -->
+        <unit bldFile="musicplayer_plat/mpx_music_player_app_api/tsrc/group"/>
+        <unit bldFile="musicplayer_plat/mpx_music_player_commonui_api/tsrc/group"/>
+        <unit bldFile="musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group"/>
+        <unit bldFile="musicplayer_plat/mpx_music_store_api/tsrc/group"/>
+        <unit bldFile="musicplayer_plat/music_visualization_plugin_api/tsrc/group"/>
+      </component>
+      <component id="musicplayer_test" filter="s60" purpose="development" name="Music Player Apps Test">
+      	<!-- should this be uncommented? -->
+        <!-- <unit bldFile="tsrc/group"/> -->
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/organizer/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="organizer" name="Organizer Application Suite" levels="support services engine ui app">
+    <collection id="alarmui" name="Alarm UI" level="app">
+      <component id="alarmui_build" filter="s60" name="Alarm UI Build">
+        <unit bldFile="alarmui/group"/>
+      </component>
+    </collection>
+    <collection id="calendarui" name="Calendar UI" level="ui">
+      <component id="calendarui_help" filter="s60" name="Calendar UI Help">
+        <unit bldFile="calendarui/help/group"/>
+      </component>
+      <component id="commonutils" filter="s60" name="Calendar Common Utils">
+        <unit bldFile="calendarui/commonutils/group"/>
+      </component>
+      <component id="globaldata" filter="s60" name="Calendar Global Data">
+        <unit bldFile="calendarui/globaldata/group"/>
+      </component>
+      <component id="settings" filter="s60" name="Calendar Settings">
+		<!-- these should be merged into a single bld.inf or split into two components -->
+        <unit bldFile="calendarui/settings/gsplugin/group"/>
+        <unit bldFile="calendarui/settings/settingsui/group"/>
+      </component>
+      <component id="customisation" filter="s60" name="Calendar Customisation">
+        <unit bldFile="calendarui/customisation/group"/>
+      </component>
+      <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
+        <unit bldFile="calendarui/customisationmanager/group"/>
+      </component>
+      <component id="views" filter="s60" name="Calendar Views">
+        <unit bldFile="calendarui/views/group"/>
+      </component>
+      <component id="calendarui_controller" filter="s60" name="Calendar Controller">
+        <unit bldFile="calendarui/controller/group"/>
+      </component>
+      <component id="editors" filter="s60" name="Calendar Editors">
+        <unit bldFile="calendarui/editors/group"/>
+      </component>
+      <component id="application" filter="s60" name="Calendar Application">
+        <unit bldFile="calendarui/application/group"/>
+      </component>
+      <component id="missedalarmindicatorplugin" filter="s60" name="Missed Alarm Indicator Plugin" class="plugin">
+        <unit bldFile="calendarui/missedalarmindicatorplugin/group"/>
+      </component>
+      <component id="calendarui_server" filter="s60" name="Calendar Server">
+	    <!-- these should be merged into a single bld.inf or split into two components -->
+        <unit bldFile="calendarui/server/calensvr/group"/>
+        <unit bldFile="calendarui/server/calensvrclient/group"/>
+      </component>
+      <component id="regionalplugins" filter="s60" name="Calendar Regional Plugins" class="plugin">
+	    <!-- these should be merged into a single bld.inf or split into four components -->
+        <unit bldFile="calendarui/regionalplugins/calenregionalutil/group"/>
+        <unit bldFile="calendarui/regionalplugins/lunarchinese/group"/>
+        <unit bldFile="calendarui/regionalplugins/lunarvietnamese/group"/>
+        <unit bldFile="calendarui/regionalplugins/thai/group"/>
+      </component>
+      <component id="calendarui_build" filter="s60" name="Calendar UI Build">
+        <unit bldFile="calendarui/group"/>
+      </component>
+    </collection>
+    <collection id="clock2" name="Clock" level="app">
+      <component id="clockengines" filter="s60" name="Clock Engines">
+        <unit bldFile="clock2/clockengines/group"/>
+      </component>
+      <component id="clockui" filter="s60" name="Clock UI">
+        <unit bldFile="clock2/clockui/group"/>
+        <!-- <unit bldFile="clock2/clockui/plugins/datetimeviewplugin/group"/> -->
+      </component>
+      <component id="clock2_help" filter="s60" name="Clock Help">
+        <unit bldFile="clock2/help/group"/>
+      </component>
+      <component id="clock2_build" filter="s60" name="Clock Build">
+        <unit bldFile="clock2/group"/>
+      </component>
+    </collection>
+    <collection id="meetingui" name="Meeting UI" level="ui">
+      <component id="attendeeview" filter="s60" name="Attendee View">
+        <unit bldFile="meetingui/attendeeview/group"/>
+      </component>
+      <component id="agnentryui" filter="s60" name="Agenda Entry UI" class="plugin">
+        <unit bldFile="meetingui/agnentryui/group"/>
+      </component>
+      <component id="meetingrequestutils" filter="s60" name="Meeting Request Utils">
+        <unit bldFile="meetingui/meetingrequestutils/group"/>
+      </component>
+      <component id="meetingrequestviewers" filter="s60" name="Meeting Request Viewers" class="plugin">
+        <unit bldFile="meetingui/meetingrequestviewers/group"/>
+      </component>
+      <component id="meetingui_build" filter="s60" name="Meeting UI Build">
+        <unit bldFile="meetingui/group"/>
+      </component>
+    </collection>
+    <collection id="notepad" name="Notepad" level="ui">
+      <component id="notepad_help" filter="s60" name="Notepad Help">
+        <unit bldFile="notepad/help/group"/>
+      </component>
+      <component id="notepad1" filter="s60" name="Notepad Application 1">
+        <unit bldFile="notepad/notepad1/group"/>
+        <!-- <unit bldFile="notepad/notepad1/syncmladapter/group"/> -->
+      </component>
+      <component id="txtrecog" filter="s60" name="Text Recognizer" class="plugin">
+        <unit bldFile="notepad/txtrecog/group"/>
+      </component>
+      <component id="notepad_build" filter="s60" name="Notepad Build">
+        <unit bldFile="notepad/group"/>
+      </component>
+    </collection>
+    <collection id="searchui" name="Search UI" level="app">
+      <component id="searchui_help" filter="s60" name="Search UI Help">
+        <unit bldFile="searchui/help/group"/>
+      </component>
+      <component id="searchapp" filter="s60" name="Search Application">
+        <unit bldFile="searchui/searchapp/group"/>
+        <!-- <unit bldFile="searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
+        <!-- <unit bldFile="searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
+      </component>
+      <component id="searchui_build" filter="s60" name="Search UI Build">
+        <unit bldFile="searchui/group"/>
+      </component>
+    </collection>
+    <collection id="calendarengines" name="Calendar Engines" level="engine">
+      <component id="versit2" filter="s60" name="Versit 2 iCal Parser" introduced="9.2">
+        <unit bldFile="calendarengines/versit2/group"/>
+      </component>
+      <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+        <unit bldFile="calendarengines/agnversit2/group"/>
+      </component>
+      <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+        <unit bldFile="calendarengines/caleninterimutils/group"/>
+      </component>
+      <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+        <unit bldFile="calendarengines/calenimp/group"/>
+      </component>
+      <component id="calenlauncher" filter="s60" name="Calendar Launcher">
+        <unit bldFile="calendarengines/calenlauncher/group"/>
+      </component>
+      <component id="calendarengines_build" filter="s60" name="Calendar Engines Build">
+        <unit bldFile="calendarengines/group"/>
+      </component>
+    </collection>
+    <collection id="meetingrequestengines" name="Meeting Request Engines" level="engine">
+      <component id="mrmailbox" filter="s60" name="Meeting Request Mailbox">
+        <unit bldFile="meetingrequestengines/mrmailbox/group"/>
+      </component>
+      <component id="mrmailboxutils" filter="s60" name="Meeting Request Mailbox Utils" class="plugin">
+        <unit bldFile="meetingrequestengines/mrmailboxutils/group"/>
+      </component>
+    </collection>
+    <collection id="alarmengines" name="Alarm Engines" level="engine">
+      <component id="missedalarmstore" filter="s60" name="Missed Alarm Store">
+        <unit bldFile="alarmengines/missedalarmstore/group"/>
+      </component>
+    </collection>
+    <collection id="searchfw" name="Search Framework" level="services">
+      <component id="coresearchfw" filter="s60" name="Core Search Framework" introduced="^1">
+        <unit bldFile="searchfw/coresearchfw/group"/>
+      </component>
+      <component id="searchfw_plugins" filter="s60" name="Search Plugins" class="plugin" introduced="^1">
+        <unit bldFile="searchfw/plugins/group"/>
+      </component>
+    </collection>
+    <collection id="pimappservices" name="PIM Application Services" level="services">
+      <component id="calendar" name="Calendar" introduced="9.2" purpose="optional">
+        <unit version="2" bldFile="pimappservices/calendar/group" mrp="pimappservices/calendar/group/app-engines_calendar.mrp"/>
+      </component>
+      <component id="calendarvcalplugin" name="Calendar vCal Plugin" introduced="8.1" purpose="optional" class="plugin">
+        <unit version="2" bldFile="pimappservices/calendarvcalplugin/group" mrp="pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
+      </component>
+      <component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
+        <unit mrp="pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+      </component>
+    </collection>
+    <collection id="pimappsupport" name="PIM Application Support" level="support">
+      <component id="vcardandvcal" name="vCard and vCal" introduced="ER5" purpose="optional">
+        <unit bldFile="pimappsupport/vcardandvcal/group" mrp="pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+      </component>
+      <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+        <unit bldFile="pimappsupport/chinesecalendarconverter/group" mrp="pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+      </component>
+    </collection>
+    <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
+      <component id="organizer_pub" filter="s60" name="Organizer Application Suite Public Interfaces" class="api">
+        <unit bldFile="organizer_pub/group"/>
+        <!-- <unit bldFile="organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
+        <!-- <unit bldFile="organizer_pub/notepad_library_api/tsrc/group"/> -->
+      </component>
+      <component id="organizer_plat" filter="s60" name="Organizer Application Suite Platform Interfaces" class="api">
+        <unit bldFile="organizer_plat/group"/>
+        <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
+        <!-- <unit bldFile="organizer_plat/calendar_exporter_api/tsrc/group"/> -->
+        <!-- <unit bldFile="organizer_plat/calendar_importer_api/tsrc/group"/> -->
+        <!-- <unit bldFile="organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
+        <!-- <unit bldFile="organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
+      </component>
+      <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/phone/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="phone" name="Phone Apps" levels="engine plugin ui app">
+    <collection id="phoneapp" name="Phone Application" level="app">
+      <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
+        <unit bldFile="phoneapp/blacklist/group"/>
+      </component>
+      <component id="phoneui" filter="s60" name="Phone UI">
+        <unit bldFile="phoneapp/phoneui/group"/>
+        	<!-- should these be separate components? #included? -->
+        <!-- <unit bldFile="phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group"/> -->
+        <!-- <unit bldFile="phoneapp/phoneui/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
+        <unit bldFile="phoneapp/phoneuicontrol/group"/>
+      </component>
+      <component id="phoneuistates" filter="s60" name="Phone UI States">
+        <unit bldFile="phoneapp/phoneuistates/group"/>
+      </component>
+      <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
+        <unit bldFile="phoneapp/phoneuiutils/group"/>
+      </component>
+      <component id="phoneuiview" filter="s60" name="Phone UI View">
+        <unit bldFile="phoneapp/phoneuiview/group"/>
+      </component>
+      <component id="phoneuivoipextension" filter="s60" name="Phone UI VOIP Extension">
+        <unit bldFile="phoneapp/phoneuivoipextension/group"/>
+      </component>
+      <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
+        <unit bldFile="phoneapp/silenceactionplugin/group"/>
+      </component>
+      <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
+        <unit bldFile="phoneapp/phonemediatorcenter/group"/>
+      </component>
+    </collection>
+    <collection id="phoneengine" name="Phone Engine" level="engine">
+      <component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
+        <unit bldFile="phoneengine/phonecntfinder/group"/>
+      </component>
+      <component id="audiohandling" filter="s60" name="Phone Audio Handling">
+        <unit bldFile="phoneengine/audiohandling/group"/>
+      </component>
+      <component id="callhandling" filter="s60" name="Call Handling">
+        <unit bldFile="phoneengine/callhandling/group"/>
+      </component>
+      <component id="contacthandling" filter="s60" name="Phone Contact Handling">
+        <unit bldFile="phoneengine/contacthandling/group"/>
+      </component>
+      <component id="loghandling" filter="s60" name="Phone Log Handling">
+        <unit bldFile="phoneengine/loghandling/group"/>
+      </component>
+      <component id="engineinfo" filter="s60" name="Phone Engine Info">
+        <unit bldFile="phoneengine/engineinfo/group"/>
+      </component>
+      <component id="phonemodel" filter="s60" name="Phone Model">
+        <unit bldFile="phoneengine/phonemodel/group"/>
+      </component>
+      <component id="servicehandling" filter="s60" name="Phone Service Handling">
+        <unit bldFile="phoneengine/servicehandling/group"/>
+      </component>
+    </collection>
+    <collection id="phonesettings" name="Phone Settings" level="plugin">
+      <component id="aiwcallimageplugin" filter="s60" name="Call Image AIW Plugin" class="plugin">
+        <unit bldFile="phonesettings/aiwcallimageplugin/group"/>
+      </component>
+      <component id="pslncallimageplugin" filter="s60" name="Call Image Personalization Plugin"  class="plugin">
+        <unit bldFile="phonesettings/pslncallimageplugin/group"/>
+      </component>
+    </collection>
+    <collection id="phoneuis" name="Phone UIs" level="ui">
+      <component id="dialer" filter="s60" name="Dialer">
+        <unit bldFile="phoneuis/dialer/group"/>
+        	<!-- what to do about this test unit? -->
+        <!-- <unit bldFile="phoneuis/dialer/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="bubblemanager" filter="s60" name="Phone Bubble Manager">
+        <unit bldFile="phoneuis/bubblemanager/group"/>
+      </component>
+      <component id="connectutil" filter="s60" name="Connection Utility" class="plugin">
+        <unit bldFile="phoneuis/connectutil/group"/>
+      </component>
+      <component id="sfiutils" filter="s60" name="Send File In Call Utilities" class="plugin">
+        <unit bldFile="phoneuis/sfiutils/group"/>
+        	<!-- what to do about this test unit? -->
+        <!-- <unit bldFile="phoneuis/sfiutils/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="ussd" filter="s60" name="Unstructured Supplementary Services Data">
+        <unit bldFile="phoneuis/ussd/group"/>
+      </component>
+      <component id="vmbx" filter="s60" name="Voice Mailbox">
+        <unit bldFile="phoneuis/vmbx/group"/>
+      </component>
+      <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
+        <unit bldFile="phoneuis/telephonydevicemode/group"/>
+      </component>
+    </collection>
+    <collection id="phone_info" name="Phone Apps Info" level="app">
+      <component id="phone_plat" filter="s60" name="Phone Apps Platform Interfaces" class="api">
+        <unit bldFile="phone_plat/group"/>
+      </component>
+    </collection>
+    <collection id="phoneplugins" name="Phone Plugins" level="plugin">
+      <component id="telbranding" filter="s60" name="Tel Branding" class="plugin" introduced="^2">
+        <unit bldFile="phoneplugins/telbranding/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/photos/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="photos" name="Photos" levels="support fw ui app">
+    <collection id="photosgallery" name="Photos Gallery" level="app">
+    	<!-- consider splitting this collection into the application itself, and the frameworks behind it -->
+      <component id="photosgallery_help" filter="s60" name="Photos Help" introduced="^2">
+        <unit bldFile="photosgallery/help/group"/>
+      </component>
+      <component id="logging" filter="s60" name="Photos Logging" introduced="^2">
+        <unit bldFile="photosgallery/logging/group"/>
+      </component>
+      <component id="photosgallery_common" filter="s60" name="Photos Common" introduced="^2">
+        <unit bldFile="photosgallery/common/group"/>
+      </component>
+      <component id="photosgallery_commonui" filter="s60" name="Photos Common UI" introduced="^2">
+        <unit bldFile="photosgallery/commonui/group"/>
+      </component>
+      <component id="photosgalleryollectionfw" filter="s60" name="Photos Collection Framework" introduced="^2">
+        <unit bldFile="photosgallery/collectionframework/group"/>
+      </component>
+      <component id="galleryicons" filter="s60" name="Photos Icons" class="config" introduced="^2">
+        <unit bldFile="photosgallery/icons"/>
+      </component>      
+      <component id="imageviewer" filter="s60" name="Image Viewer" introduced="^3">
+      	<!-- this is really a part of controllers component, #include from there instead -->
+        <unit bldFile="photosgallery/controllers/imageviewer/group"/>        
+      </component>
+      <component id="photosgalleryviewfw" filter="s60" name="View Framework" introduced="^2">
+        <unit bldFile="photosgallery/viewframework/group"/>
+      </component>
+      <component id="controllers" filter="s60" name="Photos Controllers" introduced="^2">
+        <unit bldFile="photosgallery/controllers/group"/>
+      </component>
+      <component id="photogallery" filter="s60" name="Media Gallery" introduced="^2">
+        <unit bldFile="photosgallery/gallery/group"/>
+      </component>
+      <component id="slideshow" filter="s60" name="Slideshow" introduced="^2">
+        <unit bldFile="photosgallery/slideshow/group"/>
+      </component>
+      <component id="contentharvesterplugin" filter="s60" name="Gallery Content Harvester Plugin" class="plugin" introduced="^2">
+        <unit bldFile="photosgallery/contentharvesterplugin/group"/>
+      </component>
+      <component id="photossuite" filter="s60" name="Photos Suite" class="config" introduced="^2">
+        <unit bldFile="photosgallery/photossuite/group"/>
+      </component>
+      <component id="memoryplugin" name="Memory Plugin" class="plugin" filter="s60" introduced="^2">
+       <unit bldFile="photosgallery/memoryplugin/group"/>
+     </component> 
+      <component id="imgvwr" filter="s60" name="Photos Image Viewer" introduced="^3">
+        <unit bldFile="photosgallery/imgvwr/group"/>
+      </component>
+      <component id="photosgallery_build" filter="s60" name="Photos Gallery Build" introduced="^2">
+      	<!--  need to remove the #included above bld.infs from this  -->
+        <unit bldFile="photosgallery/group"/>
+      </component>
+    </collection>
+    <collection id="photos_info" name="Photos Info" level="app">
+      <component id="photos_plat" filter="s60" name="Photos Platform Interfaces" class="api" introduced="^2">
+        <unit bldFile="photos_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/poc/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="poc" name="Push to Talk" levels="engine ui">
+  	<!-- should this be PoC, Push to Talk, or Push to Talk over Cellular? -->
+    <collection id="pocengine" name="PoC Engine" level="engine">
+      <component id="sipclientresolver" filter="s60" name="SIP Client Resolver">
+        	<!-- this should be #included from the above if it should be built -->
+        <!-- <unit bldFile="pocengine/sipclientresolver/group"/> -->
+      </component>
+      <component id="pocengine_build" filter="s60" name="PoC Engine Build">
+        <unit bldFile="pocengine/group"/>
+      </component>
+      <component id="pocengine_test" filter="s60" purpose="development" name="PoC Engine Test">
+      	<!-- can the test unit be safely removed, or should it be #included? --> 
+        <!-- <unit bldFile="pocengine/tsrc/public/basic/group"/> -->
+      </component>
+    </collection>
+    <collection id="pocui" name="PoC UI" level="ui">
+      <component id="pocuiintgr" filter="s60" name="PoC UI Integration">
+        <unit bldFile="pocui/pocuiintgr/group"/>
+        	<!-- the following should be #included from the above if they should be built -->
+        <!-- <unit bldFile="pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
+        <!-- <unit bldFile="pocui/pocuiintgr/pocuiecomplugin/group"/> -->
+        <!-- <unit bldFile="pocui/pocuiintgr/pocuiintegrationservices/group"/> -->
+      </component>
+      <component id="pocui_app" filter="s60" name="PoC Application">
+        <unit bldFile="pocui/app/group"/>
+      </component>
+      <component id="pocui_build" filter="s60" name="PoC UI Build">
+        <unit bldFile="pocui/group"/>
+      </component>
+    </collection>
+    <collection id="poc_info" name="PoC Info" level="ui">
+      <component id="poc_build" filter="s60" name="PoC Build">
+      	<!-- can this be distributed into the other components? -->
+        <unit bldFile="group"/>
+      </component>
+      <component id="poc_plat" filter="s60" name="PoC Platform Interfaces" class="api">
+        <unit bldFile="poc_plat/group"/>
+      </component>
+      <component id="poc_help" filter="s60" name="PoC Help" class="doc">
+        <unit bldFile="help/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/printing/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="printing" name="Printing" levels="app">
+    <collection id="imageprint" name="ImagePrint" level="app">
+      <component id="clog" filter="s60" name="ImagePrint Logging" introduced="^2">
+        <unit bldFile="imageprint/clog/group"/>
+      </component>
+      <component id="imageprintengine" filter="s60" name="ImagePrint Engine" introduced="^2">
+        <unit bldFile="imageprint/imageprintengine/group"/>
+       		<!--  do these other bld.infs need to be #included? -->
+        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
+        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
+        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
+        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/upnpprotocolfw2/group"/> -->
+        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/xhtmlfilecomposer/group"/> -->
+        <!-- <unit bldFile="imageprint/imageprintengine/imageprintserver/group"/> -->
+      </component>
+      <component id="imageprintui" filter="s60" name="ImagePrint UI" introduced="^2">
+        <unit bldFile="imageprint/imageprintui/group"/>
+      </component>
+      <component id="imageprint_build" filter="s60" name="ImagePrint Build" introduced="^2">	
+      	<!--  Need to break the IBY includes into the other components -->
+        <unit bldFile="imageprint/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/profile/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="profile" name="Profiles" levels="app">
+    <collection id="profilesapplication" name="Profiles Application" level="app">
+      <component id="profiles" filter="s60" name="Profiles">
+        <unit bldFile="profilesapplication/profiles/group"/>
+        	<!-- this can only have one unit. can the test be #included? -->
+        <unit bldFile="profilesapplication/profiles/profileapp/tsrc/public/basic/group"/>
+        	<!-- should these be #included? -->
+        <!-- <unit bldFile="profilesapplication/profiles/gsprofilesplugin/group"/> -->
+        <!-- <unit bldFile="profilesapplication/profiles/profileaiwprovider/group"/> -->
+        <!-- <unit bldFile="profilesapplication/profiles/profileapp/group"/> -->
+        <!-- <unit bldFile="profilesapplication/profiles/profilesgstonesplugin/group"/> -->
+      </component>
+      <component id="profilesapplication_test" filter="s60" purpose="development" name="Profiles Application Test">
+      <!-- does this need to be built? -->
+        <!-- <unit bldFile="profilesapplication/tsrc/public/basic/group"/> -->
+      </component>
+      <component id="profile_help" filter="s60" name="Profiles Help">
+        <unit bldFile="help/group"/>
+      </component>
+    </collection>
+    <collection id="profile_info" name="Profiles Info" level="app">
+      <component id="profile_plat" filter="s60" name="Profiles Platform Interfaces" class="api">
+        <unit bldFile="profile_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/radio/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="radio" name="Radio Apps" levels="engine ui">
+    <collection id="fmradio" name="FM Radio" level="ui">
+      <component id="activeidleengine" filter="s60" name="FM Radio Active Idle Engine">
+        <unit bldFile="fmradio/activeidleengine/group"/>
+      </component>
+      <component id="fmradioengine" filter="s60" name="FM Radio Engine">
+        <unit bldFile="fmradio/fmradioengine/group"/>
+      </component>
+      <component id="fmradioactionhandler" filter="s60" name="FM Radio Action Handler" class="plugin">
+        <unit bldFile="fmradio/fmradioactionhandler/group"/>
+      </component>
+      <component id="fmradiomcpplugin" filter="s60" name="FM Radio Content Publisher Plugin" class="plugin">
+        <unit bldFile="fmradio/fmradiomcpplugin/group"/>
+      </component>
+      <component id="fmradio_help" filter="s60" name="FM Radio Help">
+        <unit bldFile="fmradio/help/group"/>
+      </component>
+      <component id="fmradio_build" filter="s60" name="FM Radio Build">
+      	<!--  remove above #included bld.infs -->
+        <unit bldFile="fmradio/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/rndtools/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="rndtools" name="R&amp;D tools" levels="support generic test util">
+    <collection id="creator" name="Creator" level="support">
+      <component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
+        <unit bldFile="creator/group"/>
+      </component>
+    </collection>
+    <collection id="filebrowser" name="File Browser" level="util">
+		<!-- consider collapsing into a single component -->
+      <component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
+        <unit bldFile="filebrowser/fileopserver/group"/>
+      </component>
+      <component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
+        <unit bldFile="filebrowser/fileopclient/group"/>
+      </component>
+      <component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
+        <unit bldFile="filebrowser/group"/>
+      </component>
+    </collection>
+    <collection id="launcher" name="Launcher" level="util">
+      <component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
+        <unit bldFile="launcher/group"/>
+      </component>
+    </collection>
+    <collection id="screengrabber" name="Screen Grabber" level="util">
+      <component id="screengrabber_build" filter="s60"  name="ScreenGrabber" purpose="development" target="device" class="tool">
+        <unit bldFile="screengrabber/group"/>
+      </component>
+    </collection>
+    <collection id="stifui" name="STIF UI" level="generic">
+      <component id="stifui_stifui" filter="s60" name="STIF UI" purpose="development" target="device">
+        <unit bldFile="stifui/stifui/group"/>
+      </component>
+      <component id="uitestserverstarter" filter="s60" name="UI Test Server Starter" purpose="development" target="device">
+        <unit bldFile="stifui/uitestserverstarter/group"/>
+      </component>
+      <component id="stifui_build" filter="s60" name="STIF UI Build" purpose="development">
+		<!-- can this be split up into the other components? -->
+        <unit bldFile="stifui/group"/>
+      </component>
+    </collection>
+    <collection id="loadgen" name="Load Generator" level="test">
+      <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
+        <unit bldFile="loadgen/group"/>
+      </component>
+    </collection>
+    <collection id="perfmon" name="Performance Monitor" level="test">
+      <component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
+        <unit bldFile="perfmon/group"/>
+      </component>
+    </collection>
+    <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
+      <component id="HtiCommPlugins" filter="s60" name="HTI Comm Plugins" purpose="development" target="device" class="plugin">
+        <unit bldFile="htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
+      </component>
+      <component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
+		<!-- can only have a single unit. Should #include from a common bld.inf file -->
+        <unit bldFile="htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+        <unit bldFile="htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+      </component>
+      <component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
+        <unit bldFile="htiui/htidevicereboot/group"/>
+      </component>
+      <component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
+        <unit bldFile="htiui/htistartupwait/group"/>
+      </component>
+      <component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
+        <unit bldFile="htiui/htiadmin/group"/>
+      </component>
+      <component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development">
+		<!-- can this be split up into the other components? -->
+        <unit bldFile="htiui/group"/>
+      </component>
+    </collection>
+    <collection id="memspyui" name="Memspy UI" level="generic">
+      <component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
+        <unit bldFile="memspyui/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/screensaver/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="screensaver" name="Screen Saver Apps" levels="plugin ui">
+  	<!-- is this a user-facing application or a daemon? -->
+    <collection id="scrsaver" name="Screen Saver" level="plugin">
+      <meta rel="config">
+      	<not-defined condition="TOOLS"/>
+      </meta>    
+      <component id="scrsaverplugins" filter="s60" name="Screen Saver Plugins" class="plugin">
+      	<meta rel="config">
+      		<not-defined condition="__SERIES60_30__"/>
+      		<defined condition="__SERIES60_NATIVE_BROWSER"/>
+      	</meta>
+      		<!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
+        <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+        <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>
+      </component>
+      <component id="scrsaver_slideshowplugin" filter="s60" name="Screen Saver Slideshow Plugin" class="plugin">
+      	<meta rel="config">
+      		<defined condition="__SLIDESHOW_SCREENSAVER "/>
+      	</meta>
+        <unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/>        
+      </component>
+      <component id="screensaveraiwplugin" filter="s60" name="Screen Saver AIW Plugin" class="plugin">
+      	<meta rel="config">
+      		<defined condition="RD_SCREENSAVERAIWPLUGIN  "/>
+      	</meta>
+        <unit bldFile="scrsaver/screensaveraiwplugin/group"/>
+      </component>
+    </collection>
+    <collection id="screensaver_info" name="Screen Saver Apps Info" level="ui">
+      <component id="screensaver_build" filter="s60" name="Screen Saver Application">
+     		<!--the app should be a separate component --> 
+        <unit bldFile="group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/settingsuis/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="settingsuis" name="Settings UIs" levels="rsc ui">
+    <collection id="defaultapplicationsettings" name="Default Application Settings" level="rsc">
+      <component id="services_db" filter="s60" name="Services Database" introduced="^1">
+        <unit bldFile="defaultapplicationsettings/services_db/group"/>
+      </component>
+      <component id="defaultapplicationsettings_server" filter="s60" name="Default Application Server" introduced="^1">
+        <unit bldFile="defaultapplicationsettings/server/group"/>
+      </component>
+      <component id="service" filter="s60" name="Default Application Service" introduced="^1">
+        <unit bldFile="defaultapplicationsettings/service/group"/>
+      </component>
+      <component id="dasgsplugin" filter="s60" name="Default Application Settings GS Plugin" class="plugin" introduced="^1">
+        <unit bldFile="defaultapplicationsettings/gsplugin/group"/>
+      </component>
+      <component id="defaultapplicationsettings_build" filter="s60" name="Default Application Settings Build" introduced="^1">
+      	<!-- split the IBYs up into the appropriate components? Make this a ROM component? -->
+        <unit bldFile="defaultapplicationsettings/group"/>
+      </component>
+    </collection>
+    <collection id="systemswuis" name="System SW UIs" level="ui">
+      <component id="touchscreencalib" filter="s60" name="Touchscreen Calibration" introduced="^1">
+        <unit bldFile="systemswuis/touchscreencalib/group"/>
+      </component>
+    </collection>
+    <collection id="settingsuis_info" name="Settings UIs Info" level="ui">
+      <component id="devmngt_plat" filter="s60" class="api" name="Settings UIs Platform Interfaces" introduced="^1">
+        <unit bldFile="devmngt_plat/group"/>
+      </component>
+      <component id="devmngt_pub" filter="s60" class="api" name="Settings UIs Public Interfaces" introduced="^1">
+        <unit bldFile="devmngt_pub/group"/>
+      </component>
+      <component id="settingsuis_test" filter="s60,test" purpose="development" name="Settings UIs Test" introduced="^1">
+          <unit bldFile="devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group" introduced="^1"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/speechsrv/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="speechsrv" name="Speech Recognition UIs" levels="engine framework ui">
+    <collection id="voiceui" name="Voice UI" level="ui">
+      <component id="vcommand" filter="s60" name="Voice Commands UI" introduced="^1">
+        <unit bldFile="voiceui/vcommand/group"/>
+      </component>
+      <component id="voiceuivoicerecognition" filter="s60" name="Voice UI Recognition" introduced="^1">
+        <unit bldFile="voiceui/voiceuivoicerecognition/group"/>
+      </component>
+      <component id="pbkinfoviewimpl" filter="s60" name="Phonebook Info View Implementation" introduced="^1">
+        <unit bldFile="voiceui/pbkinfoviewimpl/group"/>
+      </component>
+      <component id="aiwpbkinfoviewprovider" filter="s60" name="AIW Phonebook Info View Provider" class="plugin" introduced="^1">
+        <unit bldFile="voiceui/aiwpbkinfoviewprovider/group"/>
+      </component>
+      <component id="vccontrolpanelplugin" filter="s60" name="Voice Commands Control Panel Plugin" class="plugin" introduced="^1">
+      	<meta rel="config">
+      		<defined condition="__VCOMMAND_CONTROL_PANEL"/>
+      	</meta>
+        <unit bldFile="voiceui/vccontrolpanelplugin/group"/>
+      </component>
+      <component id="voiceui_build" filter="s60" name="Voice UI Build" introduced="^1">
+      	<!--  can this be put into the other components? -->
+        <unit bldFile="voiceui/group"/>
+      </component>
+    </collection>
+    <collection id="srsf" name="Speech Recognition and Synthesis Framework" level="framework">
+      <component id="sispeechrecognitiondata" filter="s60" name="SI Speech Recognition Data">
+        <unit bldFile="srsf/sispeechrecognitiondata/group"/>
+      </component>
+      <component id="ttscommon" filter="s60" name="TTS Common">
+        <unit bldFile="srsf/ttscommon/group"/>
+      </component>
+      <component id="devtts" filter="s60" name="Text to Speech">
+        <unit bldFile="srsf/devtts/group"/>
+      </component>
+      <component id="ttscustomcommands" filter="s60" name="TTS Custom Commands">
+        <unit bldFile="srsf/ttscustomcommands/group"/>
+      </component>
+      <component id="ttscontrollerplugin" filter="s60" name="TTS Controller Plugin" class="plugin">
+        <unit bldFile="srsf/ttscontrollerplugin/group"/>
+      </component>
+      <component id="ttsutility" filter="s60" name="TTS Utility">
+        <unit bldFile="srsf/ttsutility/group"/>
+      </component>
+      <component id="speechsynthesis" filter="s60" name="Speech Synthesis">
+     	<!-- can only have one unit. #include these from a common bld.inf -->
+        <unit bldFile="srsf/speechsynthesis/client/group"/>
+        <unit bldFile="srsf/speechsynthesis/server/group"/>
+      </component>
+      <component id="devasr" filter="s60" name="Audio Recording and Speech Recognition">
+        <unit bldFile="srsf/devasr/group"/>
+      </component>
+      <component id="sicc" filter="s60" name="Speaker Independent Custom Commands">
+        <unit bldFile="srsf/sicc/group"/>
+      </component>
+      <component id="sisrscontrollerplugin" filter="s60" name="SI SRS Controller Plugin" class="plugin">
+        <unit bldFile="srsf/sisrscontrollerplugin/group"/>
+      </component>
+      <component id="siutility" filter="s60" name="Speaker Independent Utility">
+        <unit bldFile="srsf/siutility/group"/>
+      </component>
+      <component id="nssvasapi" filter="s60" name="NSS VAS API">
+        <unit bldFile="srsf/nssvasapi/group"/>
+      </component>
+      <component id="nssvascontacthdlr" filter="s60" name="NSS VAS Contact Handler">
+        <unit bldFile="srsf/nssvascontacthdlr/group"/>
+      </component>
+      <component id="vcommandhandler" filter="s60" name="Voice Command Handler">
+        <unit bldFile="srsf/vcommandhandler/group"/>
+      </component>
+      <component id="vuiphandler" filter="s60" name="Voice UI Plugin Handler">
+        <unit bldFile="srsf/vuiphandler/group"/>
+      </component>
+      <component id="vcommandexecutor" filter="s60" name="Voice Command Executor">
+        <unit bldFile="srsf/vcommandexecutor/group"/>
+      </component>
+      <component id="vcommandexecutorbearer" filter="s60" name="Voice Command Executor Bearer">
+        <unit bldFile="srsf/vcommandexecutorbearer/group"/>
+      </component>
+      <component id="vcommandmanager" filter="s60" name="Voice Command Manager">
+        <unit bldFile="srsf/vcommandmanager/group"/>
+      </component>
+      <component id="vcexecutorapp" filter="s60" name="Voice Command Executor Application">
+        <unit bldFile="srsf/vcexecutorapp/group"/>
+      </component>
+      <component id="profileobserverplugin" filter="s60" name="Profile Observer Plugin" class="plugin">
+        <unit bldFile="srsf/profileobserverplugin/group"/>
+      </component>
+      <component id="srsf_build" filter="s60" name="Speech Recognition and Synthesis Framework Build">
+      	<!-- should distribute this into the above components -->
+        <unit bldFile="srsf/group"/>
+      </component>
+    </collection>
+    <collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
+      <component id="speechsrv_test" filter="s60,test" purpose="development" name="Speech Recognition UIs Test">
+        <unit bldFile="tsrc/group"/>
+      </component>
+      <component id="speechsrv_plat" filter="s60" name="Speech Recognition UIs Platform Interfaces" class="api">
+        <unit bldFile="speechsrv_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/techview/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="techview" name="Techview" levels="services ui utils apps1 apps2 apps3">
+    <collection id="buildverification" name="Build Verification" level="services">
+     <component id="autosmoketest" name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
+        <unit bldFile="buildverification/autosmoketest/Group" mrp="buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+      </component>
+      <component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
+        <unit bldFile="buildverification/smoketest/Group" mrp="buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+      </component>
+    </collection>
+    <collection id="techviewplat" name="Techview Platform" level="services">
+      <component id="techviewuiklaf" name="UIKLAF" filter="techview" purpose="development">
+        <unit bldFile="techviewplat/techviewuiklaf/GROUP" mrp="techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
+      </component>
+      <component id="eikstdtv" name="EIKSTD" filter="techview" purpose="development">
+        <unit bldFile="techviewplat/eikstd/group" mrp="techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
+      </component>
+      <component id="feps" name="FEPS" filter="techview" purpose="development">
+        <unit bldFile="techviewplat/feps/group" mrp="techviewplat/feps/group/techview_feps.mrp"/>
+      </component>
+    </collection>
+    <collection id="techviewui" name="Techview UI" level="ui">
+      <component id="techviewextras" name="Extras" filter="techview" purpose="development">
+        <unit bldFile="techviewui/techviewextras/group" mrp="techviewui/techviewextras/group/techview_extras.mrp"/>
+      </component>
+      <component id="statuspane" name="Status Pane" filter="techview" purpose="development">
+        <unit bldFile="techviewui/statuspane/group" mrp="techviewui/statuspane/group/techview_statuspane.mrp"/>
+      </component>
+      <component id="shell" name="Shell" filter="techview" purpose="development">
+        <unit bldFile="techviewui/shell/group" mrp="techviewui/shell/group/techview_shell.mrp"/>
+      </component>
+      <component id="startuptv" name="Techview Startup" filter="techview" purpose="development">
+        <unit bldFile="techviewui/startup/group" mrp="techviewui/startup/group/techview_startup.mrp"/>
+      </component>
+    </collection>
+    <collection id="controlpanel" name="Control Panel" level="ui">
+      <component id="fepsetup" name="FEP Setup" filter="techview" purpose="development">
+        <unit bldFile="controlpanel/fepsetup/group" mrp="controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
+      </component>
+      <component id="cctlcolscheme" name="Colour Scheme Control" filter="techview" purpose="development">
+        <unit bldFile="controlpanel/cctlcolscheme/group" mrp="controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
+      </component>
+      <component id="soundsetup" name="Sound Setup" filter="techview" purpose="development">
+        <unit bldFile="controlpanel/soundsetup/group" mrp="controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
+      </component>
+      <component id="keyclickref" name="Key Click Ref" filter="techview" purpose="development" class="plugin">
+        <unit bldFile="controlpanel/keyclickref/Group" mrp="controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
+      </component>
+    </collection>
+    <collection id="pimapps" name="PIM Apps" level="apps3">
+      <component id="contacui" name="Contacts UI" filter="techview" purpose="development">
+        <unit bldFile="pimapps/contacui/group" mrp="pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
+      </component>
+      <component id="agenda" name="Agenda UI" filter="techview" purpose="development">
+        <unit bldFile="pimapps/agenda/group" mrp="pimapps/agenda/group/techview_agenda.mrp"/>
+      </component>
+      <component id="contactstechview" name="Contacts" filter="techview" purpose="development">
+        <unit bldFile="pimapps/contactstechview/group" mrp="pimapps/contactstechview/group/techview_contacts.mrp"/>
+      </component>
+    </collection>
+    <collection id="securityapps" name="Security Apps" level="apps3">
+      <component id="secuitv" name="Techview Security UI" filter="techview" purpose="development">
+        <unit bldFile="securityapps/secui/group" mrp="securityapps/secui/group/techview_secui.mrp"/>
+      </component>
+      <component id="securityupstechview" name="Security UPS Techview" filter="techview" purpose="development" introduced="^3">
+        <unit bldFile="securityapps/securityupstechview/group" mrp="securityapps/securityupstechview/group/security_ups_techview.mrp"/>
+      </component>
+    </collection>
+    <collection id="utilityapps" name="Utility Apps" level="apps2">
+      <component id="helptechview" name="Help" filter="techview" purpose="development">
+        <unit bldFile="utilityapps/helptechview/group" mrp="utilityapps/helptechview/group/techview_help.mrp"/>
+      </component>
+      <component id="timew" name="World Time" filter="techview" purpose="development">
+        <unit bldFile="utilityapps/timew/group" mrp="utilityapps/timew/group/techview_timew.mrp"/>
+      </component>
+      <component id="cpumonitor" name="CPU Monitor" filter="techview" purpose="development" introduced="^3">
+        <unit bldFile="utilityapps/cpumonitor/group" mrp="utilityapps/cpumonitor/group/techview_cpumonitor.mrp"/>
+      </component>
+    </collection>
+    <collection id="installationapps" name="Installation Apps" level="apps2">
+      <component id="installapp" name="Install App" filter="techview" purpose="development">
+        <unit bldFile="installationapps/installapp/group" mrp="installationapps/installapp/group/techview_installapp.mrp"/>
+      </component>
+    </collection>
+    <collection id="messagingapps" name="Messaging Apps" level="apps2">
+      <component id="messagingui" name="Messaging UI" filter="techview" purpose="development">
+        <unit bldFile="messagingapps/messagingui/Group" mrp="messagingapps/messagingui/Group/techview_messagingui.mrp"/>
+      </component>
+    </collection>
+    <collection id="telephonyapps" name="Telephony Apps" level="apps1">
+      <component id="techviewphoneui" name="Phone UI" filter="techview" purpose="development">
+        <unit bldFile="telephonyapps/techviewphoneui/group" mrp="telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkingapps" name="Networking Apps" level="apps1">
+      <component id="iapstatusapp" name="IAP Status App" filter="techview" purpose="development">
+        <unit bldFile="networkingapps/iapstatusapp/group" mrp="networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
+      </component>
+      <component id="networkingagentnotifier" name="Networking Agent Notifier" filter="techview" introduced="7.0s" purpose="development" class="plugin">
+        <unit bldFile="networkingapps/networkingagentnotifier/group" mrp="networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
+      </component>
+      <component id="techviewvpnui" name="VPN UI" filter="techview" introduced="7.0" purpose="development">
+        <unit bldFile="networkingapps/techviewvpnui/group" mrp="networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
+      </component>
+    </collection>
+    <collection id="networkingutils" name="Networking Utils" level="utils">
+      <component id="ipadministrationtool" name="IP Administration Tool" introduced="7.0" purpose="development" filter="test">
+        <unit mrp="networkingutils/ipadministrationtool/group/networking_ipadm.mrp" bldFile="networkingutils/ipadministrationtool/group"/>
+      </component>
+      <component id="nameresolverutility" name="Name Resolver Utility" introduced="7.0s" purpose="development" filter="test">
+        <unit mrp="networkingutils/nameresolverutility/group/networking_nslookup.mrp" bldFile="networkingutils/nameresolverutility/group"/>
+      </component>
+    </collection>
+    <collection id="shortlinkapps" name="Shortlink Apps" level="apps1">
+      <component id="techviewusbui" name="USB UI" filter="techview" purpose="development">
+        <unit bldFile="shortlinkapps/techviewusbui/group" mrp="shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
+      </component>
+      <component id="bluetoothui" name="Bluetooth UI" filter="techview" purpose="development">
+        <unit bldFile="shortlinkapps/bluetoothui/group" mrp="shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
+      </component>
+      <component id="reftsp" name="Remote Control Reference TSP" filter="techview" introduced="9.1" purpose="development" class="plugin">
+		<unit bldFile="shortlinkapps/reftsp/group" mrp="shortlinkapps/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
+      </component>
+    </collection>
+    <collection id="testapps" name="Test Apps" level="utils">
+      <component id="simpleapp" name="Simple App" filter="techview" purpose="development">
+        <unit bldFile="testapps/simpleapp/group" mrp="testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
+      </component>
+      <component id="statdevice" name="STAT Device" filter="techview" purpose="development">
+        <unit bldFile="../../os/buildtools/toolsandutils/statapi/source/statapi/Techview" mrp="../../os/buildtools/toolsandutils/statapi/group/testtools_stat_device_techview.mrp"/>
+      </component>
+      <component id="rschandlerui" name="Resource Handler UI" filter="techview" purpose="development">
+        <unit bldFile="testapps/rschandler/TVResourceHandler/group" mrp="testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_techview.mrp"/>
+      </component>
+      <component id="graphicstestutils" name="Graphics Test Utils" filter="techview" introduced="9.2" purpose="development">
+        <unit bldFile="testapps/graphicstestutils/group" mrp="testapps/graphicstestutils/group/graphics_testutils.mrp"/>
+      </component>
+      <component id="rschandler" name="Resource Handler" deprecated="^3" purpose="development" filter="test">
+        <unit mrp="testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp" bldFile="testapps/rschandler/TVResourceHandler/group"/>
+      </component>
+    </collection>
+    <collection id="avapps" name="A/V Apps" level="apps3">
+      <component id="techviewaudio" name="Audio" filter="techview" purpose="development">
+        <unit bldFile="avapps/techviewaudio/Group" mrp="avapps/techviewaudio/Group/techview_audio.mrp"/>
+      </component>
+    </collection>
+    <collection id="toolkit" name="Toolkit" level="utils">
+      <component id="romkit" name="ROM Kit" filter="techview" purpose="development">
+        <unit bldFile="toolkit/romkit/group" mrp="toolkit/romkit/group/techview_romkit.mrp"/>
+      </component>
+      <component id="romimages" name="ROM Images" filter="techview" purpose="development">
+        <unit version="tb92" bldFile="../../os/deviceplatformrelease/symbianosbld/cedarutils/tb92sfrom_obys" mrp="../../os/deviceplatformrelease/symbianosbld/cedarutils/tb92sfrom_obys/reference_roms_tb92.mrp"/>
+      </component>
+      <component id="configfiles" name="Configuration Files" filter="techview" purpose="development">
+        <unit mrp="toolkit/configfiles/techview_epoc_ini.mrp"/>
+      </component>
+      <component id="cdborphans" name="CDB Orphan File Handler" filter="techview" purpose="development">
+        <unit bldFile="toolkit/cdborphans/group" mrp="toolkit/cdborphans/group/techview_cdb_dummy_orphanheader_checker.mrp"/>
+      </component>
+    </collection>
+    <collection id="techview_info" name="Techview Info" level="apps3">
+      <component id="techview_metadata" name="Techview Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+        <unit mrp="techview_info/techview_metadata/techview_metadata.mrp"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/utils/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="utils" name="Utility Apps" levels="app">
+    <collection id="extras" name="Extras" level="app">
+      <component id="about" filter="s60" name="About Application">
+        <unit bldFile="extras/about/group"/>
+      </component>
+      <component id="calcsoft" filter="s60" name="Calculator Application">
+        <unit bldFile="extras/calcsoft/group"/>
+      </component>
+      <component id="converter" filter="s60" name="Unit Converter">
+        <unit bldFile="extras/converter/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/videoplayer/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="videoplayer" name="Video Player Apps" levels="support apps">
+    <collection id="videofeeds" name="Video Feeds" level="apps">
+      <component id="iptv_utils" filter="s60" name="Iptv Util" introduced="^3">
+        <unit bldFile="videofeeds/utils/group"/>
+      </component>
+      <component id="viewmessageutility" filter="s60" name="View Message Utility" introduced="^3">
+        <unit bldFile="videofeeds/viewmessageutility/group"/>
+      </component>
+      <component id="vcxnotifier" filter="s60" name="Video Connection Notifier" introduced="^3" class="plugin">
+        <unit bldFile="videofeeds/vcxnotifier/group"/>
+      </component>
+      <component id="vccommon" filter="s60" name="Video Connection Common" introduced="^3">
+        <unit bldFile="videofeeds/vccommon/group"/>
+      </component>
+		<component id="clientapi" name="Server Client" filter="s60" introduced="^3">
+			<unit bldFile="videofeeds/clientapi/group"/>
+		</component>
+		<component id="provisioningprocessor" name="Provisioning Processor" filter="s60" introduced="^3">
+			<unit bldFile="videofeeds/provisioningprocessor/group"/>
+		</component>
+		<component id="mrssplugin" name="RSS plugin" filter="s60" introduced="^3" class="plugin">
+			<unit bldFile="videofeeds/mrssplugin/group"/>
+		</component>
+		<component id="videofeeds_server" name="Server" filter="s60" introduced="^3">
+			<unit bldFile="videofeeds/server/group"/>
+		</component>
+		<component id="livetvutils" name="LiveTV Utils" filter="s60" introduced="^3">
+			<unit bldFile="videofeeds/livetvutils/group"/>
+		</component>
+		<component id="iptvprovisioningrecognizer" name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" class="plugin">
+			<unit bldFile="videofeeds/provisioningrecognizer/group"/>
+		</component>
+		<component id="iptvprovisioningappui" name="IP TV Provisioning App UI" filter="s60" introduced="^3">
+			<unit bldFile="videofeeds/provisioningappui/group"/>
+		</component>
+		<component id="iptvomaprovisioning" name="IP TV OMA Provisioning" filter="s60" introduced="^3">
+			<unit bldFile="videofeeds/omaprovisioning/group"/>
+		</component>
+	<component id="vcnsuiengine" name="VoD UI Engine" filter="s60" introduced="^3">
+		<unit bldFile="videofeeds/vcnsuiengine/group"/>
+	</component>
+	<component id="hgvodui" name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
+		<unit bldFile="videofeeds/hgvodui/group"/>
+	</component>
+	<component id="hgvodplugin" name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" class="plugin">
+		<unit bldFile="videofeeds/hgvodplugin/group"/>
+	</component>
+	<component id="vcnsscheduleview" name="Scheduled Download Settings View" filter="s60" introduced="^3">
+		<unit bldFile="videofeeds/vcnsscheduleview/group"/>
+	</component>
+	<component id="vcnsscheduleplugin" name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" class="plugin">
+		<unit bldFile="videofeeds/vcnsscheduleplugin/group"/>
+	</component>
+	<component id="scheduleddlplugin" name="Scheduled download plugin" filter="s60" introduced="^3">
+		<unit bldFile="videofeeds/scheduleddlplugin/group"/>
+	</component>
+    <component id="videofeeds_tsrc" name="Video Feeds Tests" introduced="^3" filter="test">
+      	<!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
+         <unit bldFile="tsrc/VCXTestCommon/group"/>
+         <unit bldFile="tsrc/VCXTestUtilModule/group"/>
+         <unit bldFile="videofeeds/server/tsrc/IptvTestUtility/group"/>
+         <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
+         <unit bldFile="videofeeds/server/tsrc/VCXProvisioningTest/group"/>
+         <unit bldFile="videofeeds/server/tsrc/VCXServiceManagementApiTest/group"/>
+         <unit bldFile="videofeeds/server/tsrc/VCXVodContentApiTest/group"/>
+       </component>
+    </collection>
+    <collection id="videocollection" name="Video Collection" level="apps">
+      <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
+        <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
+      </component>
+      <component id="myvideosindicatorplugin" filter="s60" name="My Videos Indicator Plugin" introduced="^3" class="plugin">
+        <unit bldFile="videocollection/myvideosindicatorplugin/group"/>
+      </component>
+      <component id="hgmyvideos" filter="s60" name="Huriganes My Videos" introduced="^3">
+        <unit bldFile="videocollection/hgmyvideos/group"/>
+      </component>
+      <component id="hgmyvideosplugin" filter="s60" name="Huriganes My VideosPlugin" introduced="^3" class="plugin">
+        <unit bldFile="videocollection/hgmyvideosplugin/group"/>
+      </component>
+      <component id="mpxmyvideoscollection_tsrc" name="MPX My Videos Collection Tests" filter="s60,test" introduced="^3">
+      	<!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
+            <unit bldFile="tsrc/VCXTestCommon/group"/>
+            <unit bldFile="tsrc/VCXTestUtilModule/group"/>
+            <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
+            <unit bldFile="videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group"/>
+    </component>
+    </collection>
+    <collection id="videoplayer_homescreenplugins" name="Videoplayer Homescreen Plugins" level="support">
+      <component id="videosuiteconf" filter="s60" name="Video Suite Configuration" class="plugin" introduced="^3" >
+        <unit bldFile="homescreenplugins/videosuiteconf/group"/>
+      </component>
+      <component id="videoahlplugin" filter="s60" name="Video Player Action Handler" class="plugin" introduced="^3">
+        <unit bldFile="homescreenplugins/videoahlplugin/group"/>
+      </component>
+      <component id="videochplugin" filter="s60" name="Video Player Content Harvester " class="plugin" introduced="^3">
+        <unit bldFile="homescreenplugins/videochplugin/group"/>
+      </component>
+    </collection>
+    <collection id="mediasettings" name="Media Settings" level="support">
+    	<!--  this is really a component. Should be moved down a directory -->
+      <component id="mediasettings_build" filter="s60" name="Media Settings Build">
+        <unit bldFile="mediasettings/group"/>
+      </component>
+      <component id="videoplayer_test" filter="s60" purpose="development" name="Video Player Apps Test">  
+      	<!--  can only have one unit. Can thes be #included from the above or another  bld.inf?-->
+     	  <unit bldFile="tsrc/VCXTestCommon/group"/>
+		  <unit bldFile="tsrc/VCXTestUtilModule/group"/>
+		  <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
+		  <unit bldFile="mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
+		  <unit bldFile="mediasettings/videoplayersettingsengine/tsrc/vpsettingsenginetest/group"/>
+      </component>      
+    </collection>
+    <collection id="filedetails" name="File Details" level="support">
+      <component id="filedetailsplugin" filter="s60" name="File Details Plugin" class="plugin" introduced="^3">
+        <unit bldFile="filedetails/filedetailsplugin/group"/>
+      </component>
+      <component id="filedetailsdialog" filter="s60" name="File Details Dialog" introduced="^3">
+        <unit bldFile="filedetails/filedetailsdialog/group"/>
+      </component>
+    </collection>
+    <collection id="videoplayerapp" name="Video Player App" level="apps">
+      <component id="lwplayer" name="Lightweight Player"  filter="s60">
+        <unit bldFile="videoplayerapp/lwplayer/group"/>
+      </component>
+      <component id="mpxvideoplayer" filter="s60" name="MPX Video Player" class="plugin">
+        <unit bldFile="videoplayerapp/lmpxvideoplayer/group"/>
+      </component>
+      <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
+        <unit bldFile="videoplayerapp/videoplayerlauncher/group"/>
+      </component>
+    </collection>
+    <collection id="videoplayback" name="Video Playback Plugins" level="support">    
+      <component id="videohelix" name="Video Helix"  filter="s60" introduced="^3" class="plugin">
+        <unit bldFile="videoplayback/videohelix/group"/>
+      </component>
+      <component id="videopdlplaybackviewplugin" filter="s60" name="Video PDL Playback View Plugin" class="plugin" introduced="^3">
+        <unit bldFile="videoplayback/videopdlplaybackviewplugin/group"/>
+      </component>
+      <component id="videoplaybackcontrols" filter="s60" name="Video Playback Controls" introduced="^3" class="plugin">
+        <unit bldFile="videoplayback/videoplaybackcontrols/group"/>
+      </component>
+      <component id="videoplaybackviewplugin" filter="s60" name="Video Playback View Plugin" class="plugin" introduced="^3">
+        <unit bldFile="videoplayback/videoplaybackviewplugin/group"/>
+      </component>
+      <component id="videoplaybackviews" filter="s60" name="Video Playback Views" class="plugin" introduced="^3">
+        <unit bldFile="videoplayback/videoplaybackviews/group"/>
+      </component>
+      <component id="videoplayer_tsrc" name="Video Player Tests" filter="s60,test" introduced="^3">
+      	<!--  can only have one unit. Can thes be #included from any of the above. Why is a videoplayerapp test in here?-->
+          <unit bldFile="videoplayback/videohelix/tsrc/ut_videohelixtest/group"/>
+          <unit bldFile="videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group"/>
+          <unit bldFile="videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group"/>
+          <unit bldFile="videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group"/>
+      </component>      
+    </collection>
+    <collection id="videoplayer_info" name="Video Player Apps Info" level="apps">
+      <component id="videoplayer_plat" filter="s60" name="Video Player Apps Platform Interfaces" class="api">
+        <unit bldFile="videoplayer_plat/group"/>
+      </component>
+      <component id="videoplayer_api_test" filter="s60,test" purpose="development" name="Video Player API Test">
+     		<!--  can only have one unit, #include from a common bld.inf? -->
+	      <unit bldFile="videoplayer_plat/video_player_file_details_dialog_api/tsrc/group"/>
+	      <unit bldFile="videoplayer_plat/videoplayer_startup_api/tsrc/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/videotelephony/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
+    <collection id="vtengines" name="Video Telephony Engines" level="engine">
+      <component id="videoteleng" filter="s60" name="Video Telephony Engine">
+        <unit bldFile="vtengines/videoteleng/group"/>
+      </component>
+      <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
+        <unit bldFile="vtengines/vtmediatorplugin/group"/>
+      </component>
+    </collection>
+    <collection id="vtuis" name="Video Telephony UIs" level="ui">
+      <component id="videotelui" filter="s60" name="Video Telephony UI">
+        <unit bldFile="vtuis/videotelui/group"/>
+      </component>
+    </collection>
+    <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
+      <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
+        <unit bldFile="vtprotocolplugins/displaysink/group"/>
+      </component>
+      <component id="videosource" filter="s60" name="Video Source" introduced="^2">
+        <unit bldFile="vtprotocolplugins/videosource/group"/>
+      </component>
+    </collection>
+    <collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
+    	<!--  this collection is really a component, move down a directory -->
+      <component id="videotelproto" filter="s60" name="Video Telephony Protocol">
+        <unit bldFile="vtprotocolsstub/group" filter="sf"/>
+      </component>
+    </collection>
+    <collection id="videotelephony_info" name="VT Apps Info" level="ui">
+      <component id="videotelephony_plat" filter="s60" name="VT Apps Platform Interfaces" class="api">
+        <unit bldFile="videotelephony_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/voicerec/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="voicerec" name="Voice Recorder Apps">
+    <collection id="voicerecorder" name="Voice Recorder">
+    	<!--this is really a component, move down a directory -->
+      <component id="voicerecorder_build" filter="s60" name="Voice Recorder Build">
+        <unit bldFile="voicerecorder/group"/>
+      </component>
+    </collection>
+    <collection id="voicerec_info" name="Voice Recorder Apps Info">
+      <component id="voicerec_api_test" filter="s60,test" purpose="development" name="Voice Recorder Apps Test">
+      	<!-- can this just be #included in voicerec_plat?-->
+        <unit bldFile="tsrc/group"/>
+      </component>
+      <component id="voicerec_plat" filter="s60" name="Voice Recorder Apps Platform Interfaces" class="api">
+        <unit bldFile="voicerec_plat/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/app/webuis/package_definition_3.0.xml	Wed Jan 27 15:59:56 2010 +0000
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="webuis" name="Web UIs" levels="plugin app">
+    <collection id="browserui" name="Browser UI" level="app">
+      <component id="browser" filter="s60" name="Browser">
+        <unit bldFile="browserui/browser/group"/>
+      </component>
+      <component id="operatormenu" filter="s60" name="Browser Operator Menu">
+        <unit bldFile="browserui/operatormenu/group"/>
+      </component>
+      <component id="videoservices" filter="s60" name="Browser Video Services">
+        <unit bldFile="browserui/videoservices/group"/>
+      </component>
+    </collection>
+    <collection id="browserplugins" name="Browser Plugins" level="plugin">
+      <component id="browsersysteminfoplugin" filter="s60" name="Browser System Info Plugin" class="plugin">
+      	<meta rel="config">
+      		<defined condition="__WEB_WIDGETS"/>
+      	</meta>
+        <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>
+      </component>
+      <component id="browsergpsplugin" filter="s60" name="Browser GPS Plugin" class="plugin">
+      	<meta rel="config">
+      		<defined condition="__WEB_WIDGETS"/>
+      		<not-defined condition="__WEB_WIDGETS"/>
+      	</meta>
+        <unit bldFile="browserplugins/browsergpsplugin/group"/>
+      </component>
+      <component id="browseraudiovideoplugin" filter="s60" name="Browser Audio Video Plugin" class="plugin">
+        <unit bldFile="browserplugins/browseraudiovideoplugin/group"/>
+      </component>
+    <!--   <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">-->
+		<!-- can the #ifdef in this be handled elsewhere? -->
+        <!-- <unit bldFile="browserplugins/group"/>
+      </component>-->
+    </collection>
+    <collection id="pushmtm" name="Push MTM" level="plugin">
+      <component id="pushmtm_help" filter="s60" name="Push MTM Help">
+        <unit bldFile="pushmtm/help/group"/>
+      </component>
+      <component id="plugins" filter="s60" name="Push MTM Plugins" class="plugin">
+        <unit bldFile="pushmtm/plugins/group"/>
+      </component>
+      <component id="pushmtm_build" filter="s60" name="Push MTM Build">
+		<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+			component and move it down a diretcory, or make separate independent components in this collection -->
+        <unit bldFile="pushmtm/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>