--- a/symbian2/micro/sources.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian2/micro/sources.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_1,layers.sysdef.xml

--- a/symbian2/single/sources.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian2/single/sources.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,

--- a/symbian2/single/sources_fcl.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian2/single/sources_fcl.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,

--- a/symbian2/split/sources.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian2/split/sources.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,

--- a/symbian2/split/sources_fcl.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian2/split/sources_fcl.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,

--- a/symbian3/micro/job_props.ant.xml	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian3/micro/job_props.ant.xml	Wed Mar 24 15:26:03 2010 +0000
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
 
-    <property name="sf.previous.pdk.tag" value="PDK_3.0.f" />
+    <property name="sf.previous.pdk.tag" value="PDK_3.0.g" />
 
     <property name="sf.spec.corebuildversion" value="week37"/>
     
@@ -31,7 +31,7 @@
     <!-- get full source env and binaries from pdk -->
     <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
     
-    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.2" /> <!-- for TEF etc -->
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.6" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />

--- a/symbian3/micro/sources.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian3/micro/sources.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,11 +1,11 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/utilities/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/utilities/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/utilities/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml

--- a/symbian3/sdkFiles.txt	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian3/sdkFiles.txt	Wed Mar 24 15:26:03 2010 +0000
@@ -1,10 +1,4 @@
-epoc32/include/_sdpdefs.h
-epoc32/include/_sipcodecdefs.h
 epoc32/include/a3f/a3f_trace_ctxt.h
-epoc32/include/absolutevolumeapicontroller.h
-epoc32/include/absolutevolumeapicontrollerobserver.h
-epoc32/include/absolutevolumeapitarget.h
-epoc32/include/absolutevolumeapitargetobserver.h
 epoc32/include/accmonitor.h
 epoc32/include/accmonitorcapabilities.h
 epoc32/include/accmonitorinfo.h
@@ -12,48 +6,60 @@
 epoc32/include/advancedpointerevent.h
 epoc32/include/agentdialog.h
 epoc32/include/aiftool.rh
-epoc32/include/animation.h
 epoc32/include/animationcmd.h
-epoc32/include/animationconfig.h
-epoc32/include/animationdataloaderobserver.h
-epoc32/include/animationdataprovider.h
-epoc32/include/animationevents.h
-epoc32/include/animationframe.h
-epoc32/include/animationgroup.h
-epoc32/include/animationmixins.h
-epoc32/include/animationticker.h
-epoc32/include/animationtls.h
-epoc32/include/animator.h
-epoc32/include/ansicomp.h
-epoc32/include/apaapp.h
-epoc32/include/apacln.h
-epoc32/include/apacmdln.h
-epoc32/include/apadbase.h
-epoc32/include/apadef.h
-epoc32/include/apadoc.h
-epoc32/include/apaid.h
-epoc32/include/apamdr.h
-epoc32/include/apaproc.h
-epoc32/include/apaserverapp.h
-epoc32/include/apcaptionfile.rh
 epoc32/include/apfdef.h
-epoc32/include/apfrec.h
-epoc32/include/apgcli.h
-epoc32/include/apgctl.h
-epoc32/include/apgdoor.h
-epoc32/include/apgicnfl.h
-epoc32/include/apgnotif.h
-epoc32/include/apgtask.h
-epoc32/include/apgwgnam.h
-epoc32/include/apmfndr.h
 epoc32/include/apmrec.h
 epoc32/include/apmrec.inl
 epoc32/include/apmstd.h
 epoc32/include/app/bcardeng.h
+epoc32/include/app/btmsgtypeuid.h
+epoc32/include/app/cacheman.h
+epoc32/include/app/calalarm.h
+epoc32/include/app/calcalendarinfo.h
+epoc32/include/app/calcalendariterator.h
+epoc32/include/app/calcategory.h
+epoc32/include/app/calcategorymanager.h
+epoc32/include/app/calchangecallback.h
+epoc32/include/app/calcommon.h
+epoc32/include/app/calcontent.h
+epoc32/include/app/caldataexchange.h
+epoc32/include/app/caldataformat.h
+epoc32/include/app/calendarconverter.h
 epoc32/include/app/caleninterimutils2.h
+epoc32/include/app/calentry.h
+epoc32/include/app/calentryview.h
+epoc32/include/app/calfilechangenotification.h
+epoc32/include/app/calinstance.h
+epoc32/include/app/calinstanceview.h
+epoc32/include/app/calinterimapipanic.h
+epoc32/include/app/caliterator.h
+epoc32/include/app/calnotification.h
+epoc32/include/app/calprogresscallback.h
+epoc32/include/app/calrrule.h
+epoc32/include/app/calsession.h
+epoc32/include/app/caltime.h
+epoc32/include/app/caluser.h
+epoc32/include/app/cemailaccounts.h
+epoc32/include/app/cimattachmentwaiter.h
+epoc32/include/app/cimplainbodytext.h
 epoc32/include/app/clmkcategoryselectordlg.h
 epoc32/include/app/clmkeditordlg.h
 epoc32/include/app/clmklandmarkselectordlg.h
+epoc32/include/app/cmmsaccounts.h
+epoc32/include/app/cmmssettings.h
+epoc32/include/app/cntdb.h
+epoc32/include/app/cntdbobs.h
+epoc32/include/app/cntdef.h
+epoc32/include/app/cntfield.h
+epoc32/include/app/cntfilt.h
+epoc32/include/app/cntfldst.h
+epoc32/include/app/cntitem.h
+epoc32/include/app/cntsync.h
+epoc32/include/app/cntvcard.h
+epoc32/include/app/cntview.h
+epoc32/include/app/cntviewbase.h
+epoc32/include/app/cntviewsortplugin.h
+epoc32/include/app/cobexsendoperation.h
 epoc32/include/app/cpbk2sortordermanager.h
 epoc32/include/app/cpbk2viewstate.h
 epoc32/include/app/cpbkaddressselect.h
@@ -82,6 +88,8 @@
 epoc32/include/app/cpbkviewstate.h
 epoc32/include/app/cpbkvoipaddressselect.h
 epoc32/include/app/crichbio.h
+epoc32/include/app/csmsaccount.h
+epoc32/include/app/csmsemailfields.h
 epoc32/include/app/cvpbkcontactcopier.h
 epoc32/include/app/cvpbkcontactfielditerator.h
 epoc32/include/app/cvpbkcontactidconverter.h
@@ -103,8 +111,30 @@
 epoc32/include/app/cvpbkvoicetagattribute.h
 epoc32/include/app/cvpbkxspcontacts.h
 epoc32/include/app/extendedmtmids.hrh
+epoc32/include/app/hlplch.h
+epoc32/include/app/hlpmodel.h
+epoc32/include/app/hlpzoom.h
+epoc32/include/app/iapprefs.h
+epoc32/include/app/imapcmds.h
+epoc32/include/app/imapconnectionobserver.h
+epoc32/include/app/imapset.h
+epoc32/include/app/imcmmain.h
+epoc32/include/app/imcvcodc.h
+epoc32/include/app/impcmtm.h
+epoc32/include/app/imsk.h
+epoc32/include/app/irmsgtypeuid.h
+epoc32/include/app/irmtmcmds.h
 epoc32/include/app/lmkerrors.h
 epoc32/include/app/messagingsdkcrkeys.h
+epoc32/include/app/miut_err.h
+epoc32/include/app/miutatch.h
+epoc32/include/app/miutconv.h
+epoc32/include/app/miutdef.h
+epoc32/include/app/miuthdr.h
+epoc32/include/app/miutmsg.h
+epoc32/include/app/miutpars.h
+epoc32/include/app/miutset.h
+epoc32/include/app/mmmssettingsobserver.h
 epoc32/include/app/mmsclient.h
 epoc32/include/app/mmsclient.inl
 epoc32/include/app/mmsconst.h
@@ -186,6 +216,7 @@
 epoc32/include/app/mvpbkviewcontactfield.h
 epoc32/include/app/mvpbkviewcontactfieldcollection.h
 epoc32/include/app/npdapi.h
+epoc32/include/app/obexheaderlist.h
 epoc32/include/app/pbk2contactnameformatterfactory.h
 epoc32/include/app/pbk2fieldpropertiesfactory.h
 epoc32/include/app/pbk2fieldproperty.hrh
@@ -196,8 +227,22 @@
 epoc32/include/app/pbkfields.hrh
 epoc32/include/app/pbkiconid.hrh
 epoc32/include/app/pbkiconinfo.h
+epoc32/include/app/phbksync.h
+epoc32/include/app/pop3cmds.h
+epoc32/include/app/pop3set.h
+epoc32/include/app/popcmtm.h
 epoc32/include/app/rpbkviewresourcefile.h
 epoc32/include/app/rvpbkcontactfielddefaultpriorities.h
+epoc32/include/app/smcmmain.h
+epoc32/include/app/smsclnt.h
+epoc32/include/app/smscmds.h
+epoc32/include/app/smtcmtm.h
+epoc32/include/app/smtpcmds.h
+epoc32/include/app/smtpset.h
+epoc32/include/app/smut.h
+epoc32/include/app/smuthdr.h
+epoc32/include/app/smutset.h
+epoc32/include/app/smutsimparam.h
 epoc32/include/app/spdiacontrol.h
 epoc32/include/app/tlmkitemiddbcombiinfo.h
 epoc32/include/app/tpbk2iconid.h
@@ -208,6 +253,14 @@
 epoc32/include/app/tvpbkfieldversitproperty.h
 epoc32/include/app/tvpbkstorecontactanalyzer.h
 epoc32/include/app/tvpbkwordparsercallbackparam.h
+epoc32/include/app/vcal.h
+epoc32/include/app/vcal.inl
+epoc32/include/app/vcard.h
+epoc32/include/app/vcard.inl
+epoc32/include/app/versit.h
+epoc32/include/app/versit.inl
+epoc32/include/app/versittls.h
+epoc32/include/app/vobserv.h
 epoc32/include/app/vpbkcontactstoreuris.h
 epoc32/include/app/vpbkcontactview.hrh
 epoc32/include/app/vpbkcontactview.rh
@@ -219,21 +272,19 @@
 epoc32/include/app/vpbkpublicuid.h
 epoc32/include/app/vpbksyncconstants.h
 epoc32/include/app/vpbkutils.h
-epoc32/include/apparc.h
+epoc32/include/app/vprop.h
+epoc32/include/app/vprop.inl
+epoc32/include/app/vrecur.h
+epoc32/include/app/vrecur.inl
+epoc32/include/app/vstaticutils.h
+epoc32/include/app/vtoken.h
+epoc32/include/app/vuid.h
+epoc32/include/app/vutil.h
 epoc32/include/appinfo.rh
-epoc32/include/arm_vfp.h
 epoc32/include/arp_hdr.h
-epoc32/include/asaltdefs.h
-epoc32/include/ascliclientutils.h
-epoc32/include/asclidefinitions.h
-epoc32/include/asclisession.h
-epoc32/include/asclisoundplay.h
 epoc32/include/asn1cons.h
 epoc32/include/asn1dec.h
 epoc32/include/asn1enc.h
-epoc32/include/asshdalarm.h
-epoc32/include/asshdbitflags.h
-epoc32/include/asshddefs.h
 epoc32/include/assp/omap3530_assp/gpio.h
 epoc32/include/assp/omap3530_assp/omap3530_assp_priv.h
 epoc32/include/assp/omap3530_assp/omap3530_gpio.h
@@ -249,13 +300,10 @@
 epoc32/include/assp/omap3530_shared/omap3_mstick.h
 epoc32/include/assp/omap3530_shared/tps65950.h
 epoc32/include/assp/omap3530_shared/tps65950_registers.h
-epoc32/include/assp/template_assp/template_assp.h
-epoc32/include/assp/template_assp/template_assp_priv.h
 epoc32/include/asymmetric.h
 epoc32/include/asymmetric.inl
 epoc32/include/asymmetrickeys.h
 epoc32/include/ataudioeventapi.h
-epoc32/include/attrlut.h
 epoc32/include/audioeffectbase.h
 epoc32/include/audioeffectdata.h
 epoc32/include/audioequalizerbase.h
@@ -276,7 +324,6 @@
 epoc32/include/badef.rh
 epoc32/include/badesca.h
 epoc32/include/baerrhan.h
-epoc32/include/baerror.h
 epoc32/include/baerrrsvr.rh
 epoc32/include/bafindf.h
 epoc32/include/bafl/sysutil.h
@@ -290,7 +337,6 @@
 epoc32/include/barsread.h
 epoc32/include/barsread2.h
 epoc32/include/basched.h
-epoc32/include/basicanimation.h
 epoc32/include/bassboostbase.h
 epoc32/include/bassboostdata.h
 epoc32/include/bassnd.h
@@ -303,13 +349,8 @@
 epoc32/include/bidi.h
 epoc32/include/biditext.h
 epoc32/include/bidivisual.h
-epoc32/include/bif.h
-epoc32/include/bifbase.h
-epoc32/include/biftool2.rh
 epoc32/include/big5.h
 epoc32/include/bigint.h
-epoc32/include/biodb.h
-epoc32/include/biouids.h
 epoc32/include/bitbase.h
 epoc32/include/bitdev.h
 epoc32/include/bitdev.inl
@@ -324,34 +365,18 @@
 epoc32/include/bldregional.hrh
 epoc32/include/bldvariant.hrh
 epoc32/include/bluetooth/eirdatacodec.h
-epoc32/include/bluetooth/hci/aclpacketconsts.h
-epoc32/include/bluetooth/hci/basebandpacketconsts.h
-epoc32/include/bluetooth/hci/hciconsts.h
 epoc32/include/bluetooth/hci/hcierrors.h
-epoc32/include/bluetooth/hci/hciframe.h
-epoc32/include/bluetooth/hci/hciopcodes.h
-epoc32/include/bluetooth/hci/hcitypes.h
-epoc32/include/bluetooth/hci/hctlchannelobserver.h
-epoc32/include/bluetooth/logger.h
-epoc32/include/bmpancli.h
-epoc32/include/bmpanconsts.h
-epoc32/include/bmpansrv.h
-epoc32/include/bsp.h
-epoc32/include/bsp.inl
 epoc32/include/bsul/bsul.h
 epoc32/include/bsul/ccacheddriveinfo.h
 epoc32/include/bt_sock.h
 epoc32/include/bt_subscribe.h
 epoc32/include/bt_subscribe_keybase.h
 epoc32/include/btbasebandpolicy.h
-epoc32/include/btcmtm.h
 epoc32/include/btdefcommport.h
 epoc32/include/btdevice.h
 epoc32/include/btextnotifiers.h
 epoc32/include/btextnotifiersconsts.h
-epoc32/include/btheader.h
 epoc32/include/btmanclient.h
-epoc32/include/btmsgtypeuid.h
 epoc32/include/btsdp.h
 epoc32/include/btsecurity.h
 epoc32/include/btsockaddr.h
@@ -360,203 +385,56 @@
 epoc32/include/bttypes.h
 epoc32/include/c32comm.h
 epoc32/include/c32comm.inl
-epoc32/include/cacheman.h
 epoc32/include/caf/agent.h
-epoc32/include/caf/agentfactory.h
-epoc32/include/caf/agentinterface.h
-epoc32/include/caf/attribute.h
 epoc32/include/caf/attributeset.h
-epoc32/include/caf/bitset.h
 epoc32/include/caf/caf.h
 epoc32/include/caf/caferr.h
-epoc32/include/caf/cafmimeheader.h
 epoc32/include/caf/cafpanic.h
 epoc32/include/caf/caftypes.h
 epoc32/include/caf/content.h
 epoc32/include/caf/data.h
 epoc32/include/caf/dirstreamable.h
 epoc32/include/caf/embeddedobject.h
-epoc32/include/caf/f32agentui.h
-epoc32/include/caf/importfile.h
-epoc32/include/caf/manager.h
 epoc32/include/caf/metadata.h
 epoc32/include/caf/metadataarray.h
-epoc32/include/caf/rightsinfo.h
-epoc32/include/caf/rightsmanager.h
 epoc32/include/caf/streamableptrarray.h
 epoc32/include/caf/streamableptrarray.inl
 epoc32/include/caf/stringattributeset.h
-epoc32/include/caf/supplier.h
-epoc32/include/caf/supplieroutputfile.h
 epoc32/include/caf/virtualpath.h
 epoc32/include/caf/virtualpathptr.h
-epoc32/include/calalarm.h
-epoc32/include/calcalendarinfo.h
-epoc32/include/calcalendariterator.h
-epoc32/include/calcategory.h
-epoc32/include/calcategorymanager.h
-epoc32/include/calchangecallback.h
-epoc32/include/calcommon.h
-epoc32/include/calcontent.h
-epoc32/include/caldataexchange.h
-epoc32/include/caldataformat.h
-epoc32/include/calendarconverter.h
-epoc32/include/calentry.h
-epoc32/include/calentryview.h
-epoc32/include/calfilechangenotification.h
-epoc32/include/calinstance.h
-epoc32/include/calinstanceview.h
-epoc32/include/calinterimapipanic.h
-epoc32/include/caliterator.h
-epoc32/include/calnotification.h
-epoc32/include/calprogresscallback.h
-epoc32/include/calrrule.h
-epoc32/include/calsession.h
-epoc32/include/caltime.h
-epoc32/include/caluser.h
-epoc32/include/cauthentication.h
-epoc32/include/cbioasyncwaiter.h
-epoc32/include/cbnfnode.h
-epoc32/include/cbnfparser.h
 epoc32/include/ccertattributefilter.h
 epoc32/include/cctcertinfo.h
 epoc32/include/cdbcols.h
 epoc32/include/cdblen.h
-epoc32/include/cdbover.h
-epoc32/include/cdbover.inl
 epoc32/include/cdbpreftable.h
-epoc32/include/cdbstore.h
-epoc32/include/cdbstore.inl
 epoc32/include/cdbtemp.h
 epoc32/include/cdmasmsaddr.h
-epoc32/include/cdsb.h
-epoc32/include/cdtdmodel.h
-epoc32/include/cemailaccounts.h
 epoc32/include/centralrepository.h
 epoc32/include/certificateapps.h
-epoc32/include/cfragmentedstring.h
 epoc32/include/charactersetconverter.h
 epoc32/include/charactersetconverter.inl
 epoc32/include/charconv.h
-epoc32/include/chttpformencoder.h
-epoc32/include/chttpresponse.h
-epoc32/include/cimattachmentwaiter.h
-epoc32/include/cimmobilitypolicyplugin.inl
-epoc32/include/cimplainbodytext.h
 epoc32/include/cinidata.h
-epoc32/include/clock.h
-epoc32/include/cmarkedstack.h
-epoc32/include/cmarkedstack.inl
-epoc32/include/cmmsaccounts.h
-epoc32/include/cmmssettings.h
-epoc32/include/cmsvattachment.h
-epoc32/include/cmsvmimeheaders.h
-epoc32/include/cmsvplainbodytext.h
-epoc32/include/cmsvrecipientlist.h
-epoc32/include/cmsvtechnologytypedefaultmtmsettings.h
-epoc32/include/cnftool.rh
-epoc32/include/cnode.h
-epoc32/include/cnode.inl
-epoc32/include/cnodeleteattribute.h
-epoc32/include/cntdb.h
-epoc32/include/cntdbobs.h
-epoc32/include/cntdef.h
 epoc32/include/cntdef.hrh
-epoc32/include/cntfield.h
-epoc32/include/cntfilt.h
-epoc32/include/cntfldst.h
-epoc32/include/cntitem.h
-epoc32/include/cntmodel.rh
-epoc32/include/cntsync.h
-epoc32/include/cntvcard.h
-epoc32/include/cntview.h
-epoc32/include/cntviewbase.h
-epoc32/include/cntviewfindconfig.h
-epoc32/include/cntviewfindconfig.inl
-epoc32/include/cntviewsortplugin.h
-epoc32/include/cobexsendoperation.h
-epoc32/include/coeaui.h
-epoc32/include/coeccntx.h
-epoc32/include/coecntrl.h
-epoc32/include/coecntss.h
-epoc32/include/coecobs.h
-epoc32/include/coecoloruse.h
-epoc32/include/coecontrolarray.h
-epoc32/include/coedef.h
-epoc32/include/coeerror.h
-epoc32/include/coefepff.h
-epoc32/include/coefont.h
-epoc32/include/coefontprovider.h
-epoc32/include/coehelp.h
-epoc32/include/coeinput.h
-epoc32/include/coelayoutman.h
-epoc32/include/coemain.h
-epoc32/include/coemain.inl
-epoc32/include/coemop.h
-epoc32/include/coesndpy.h
-epoc32/include/coetextdrawer.h
-epoc32/include/coeutils.h
 epoc32/include/coever.h
-epoc32/include/coeview.h
-epoc32/include/collate.h
 epoc32/include/commdb.h
-epoc32/include/commdb.inl
 epoc32/include/commdbconnpref.h
-epoc32/include/commdbconnpref.inl
 epoc32/include/commonphoneparser.h
-epoc32/include/comms-infras/api_ext_list.h
-epoc32/include/comms-infras/api_ext_msg.h
-epoc32/include/comms-infras/commsbuf.inl
-epoc32/include/comms-infras/commsbufchain.inl
-epoc32/include/comms-infras/commsbufiter.inl
-epoc32/include/comms-infras/commsbufpanic.h
-epoc32/include/comms-infras/commsbufpond.inl
-epoc32/include/comms-infras/commsbufpondop.inl
-epoc32/include/comms-infras/commsbufq.inl
-epoc32/include/comms-infras/commsbufskern.inl
+epoc32/include/commsdat.h
+epoc32/include/commsdattypesv1_1.h
 epoc32/include/comms-infras/cs_mobility_apiext.h
 epoc32/include/comms-infras/datamonitormessages.inl
 epoc32/include/comms-infras/es_mobility_apiext.h
 epoc32/include/comms-infras/esock_params.h
-epoc32/include/comms-infras/esock_params.inl
-epoc32/include/comms-infras/esock_params_internal.inl
-epoc32/include/comms-infras/esockdebugmessages.h
-epoc32/include/comms-infras/mbuf.inl
-epoc32/include/comms-infras/mbufchain.inl
-epoc32/include/comms-infras/mbufpktq.inl
-epoc32/include/comms-infras/mbufq.inl
-epoc32/include/comms-infras/metabuffer.h
-epoc32/include/comms-infras/metacontainer.h
-epoc32/include/comms-infras/metacontainer.inl
-epoc32/include/comms-infras/metadata.inl
-epoc32/include/comms-infras/metatype.h
-epoc32/include/comms-infras/metatypevariablelen.h
-epoc32/include/comms-infras/mobilitymessagesecom.inl
-epoc32/include/comms-infras/netmessages.h
-epoc32/include/comms-infras/netupsproperties.h
-epoc32/include/comms-infras/ss_refcountowner.h
-epoc32/include/comms-infras/ss_roles.inl
-epoc32/include/comms-infras/trbuf.h
-epoc32/include/commsdat.h
-epoc32/include/commsdattypesv1_1.h
-epoc32/include/commsdatutils.h
-epoc32/include/conarc.h
-epoc32/include/concnf.h
 epoc32/include/coneresloader.h
-epoc32/include/conlist.h
 epoc32/include/connect/abclient.h
 epoc32/include/connect/sbdefs.h
 epoc32/include/connectprog.h
 epoc32/include/connpref.h
-epoc32/include/conplugin.rh
-epoc32/include/consolealarmalertservermain.h
 epoc32/include/convdata.h
 epoc32/include/convgeneratedcpp.h
 epoc32/include/convnames.h
 epoc32/include/convutils.h
-epoc32/include/copydatafile.h
-epoc32/include/crulemarkedstack.h
-epoc32/include/crulemarkedstack.inl
 epoc32/include/cryptopanic.h
 epoc32/include/cryptospi/cryptobaseapi.h
 epoc32/include/cryptospi/cryptocharacteristics.h
@@ -575,19 +453,10 @@
 epoc32/include/cs_subconparams.h
 epoc32/include/cs_subconparams.inl
 epoc32/include/csch_cli.h
-epoc32/include/csendasaccounts.h
-epoc32/include/csendaseditutils.inl
-epoc32/include/csendasmessagetypes.h
 epoc32/include/cshelp/conset.hlp.hrh
 epoc32/include/cshelp/div.hlp.hrh
 epoc32/include/cshelp/find.hlp.hrh
 epoc32/include/cshelp/phob.hlp.hrh
-epoc32/include/csmsaccount.h
-epoc32/include/csmsclass0base.h
-epoc32/include/csmsemailfields.h
-epoc32/include/csmsgetdetdescinterface.inl
-epoc32/include/cstack.h
-epoc32/include/cstack.inl
 epoc32/include/csy.rh
 epoc32/include/ct.h
 epoc32/include/ct/ccttokentype.h
@@ -607,19 +476,12 @@
 epoc32/include/ct/tcttokentypeattribute.h
 epoc32/include/ctsy/tflogger.h
 epoc32/include/customcommandtypes.h
-epoc32/include/d32camerasc.inl
-epoc32/include/d32comm.h
-epoc32/include/d32comm.inl
 epoc32/include/d32dbms.h
 epoc32/include/d32dbms.inl
-epoc32/include/d32locd.h
-epoc32/include/d32locd.inl
-epoc32/include/d32resmanus.inl
 epoc32/include/data_caging_path_literals.hrh
 epoc32/include/data_caging_paths.hrh
 epoc32/include/data_caging_paths_for_iby.hrh
 epoc32/include/data_caging_paths_strings.hrh
-epoc32/include/datastor.h
 epoc32/include/defaultcaps.hrh
 epoc32/include/delimitedparser16.h
 epoc32/include/delimitedparser8.h
@@ -636,27 +498,15 @@
 epoc32/include/displaymode.h
 epoc32/include/distanceattenuationbase.h
 epoc32/include/distanceattenuationdata.h
-epoc32/include/dns_qry.h
-epoc32/include/dns_qry.inl
 epoc32/include/dopplerbase.h
 epoc32/include/dopplerdata.h
 epoc32/include/driveinfo.h
 epoc32/include/driveinfo.inl
 epoc32/include/drivers/camerasc.inl
 epoc32/include/drivers/dma.inl
-epoc32/include/drivers/iic.inl
-epoc32/include/drivers/iic_channel.inl
 epoc32/include/drivers/iic_transaction.inl
-epoc32/include/drivers/pbus.inl
-epoc32/include/drivers/pccard.inl
-epoc32/include/drivers/resourcecontrol.inl
-epoc32/include/drivers/sdio/sdiopsu.inl
 epoc32/include/drmaudiosampleplayer.h
-epoc32/include/dscitem.h
 epoc32/include/dscstorecommondefs.hrh
-epoc32/include/dscstoredefs.h
-epoc32/include/dtdnode.h
-epoc32/include/dtdnode.inl
 epoc32/include/e32atomics.h
 epoc32/include/e32base.h
 epoc32/include/e32base.inl
@@ -671,32 +521,22 @@
 epoc32/include/e32des8.h
 epoc32/include/e32err.h
 epoc32/include/e32event.h
-epoc32/include/e32hal.h
 epoc32/include/e32hashtab.h
 epoc32/include/e32keys.h
 epoc32/include/e32kpan.h
-epoc32/include/e32ktran.h
 epoc32/include/e32lang.h
 epoc32/include/e32ldr.h
-epoc32/include/e32lmsg.h
 epoc32/include/e32math.h
 epoc32/include/e32math.inl
 epoc32/include/e32modes.h
 epoc32/include/e32msgqueue.h
 epoc32/include/e32msgqueue.inl
-epoc32/include/e32notif.h
 epoc32/include/e32panic.h
-epoc32/include/e32power.h
 epoc32/include/e32property.h
 epoc32/include/e32reg.h
-epoc32/include/e32rom.h
 epoc32/include/e32std.h
 epoc32/include/e32std.inl
-epoc32/include/e32svr.h
 epoc32/include/e32test.h
-epoc32/include/e32twin.h
-epoc32/include/e32uid.h
-epoc32/include/e32ver.h
 epoc32/include/ecam.h
 epoc32/include/ecam/cameraoverlay.h
 epoc32/include/ecam/ecamcommonuids.hrh
@@ -723,63 +563,17 @@
 epoc32/include/ecom/registryinfoconst.hrh
 epoc32/include/ecom/registryinfov2.rh
 epoc32/include/ecom/resolver.h
-epoc32/include/ecom/test_bed/componentinfo.inl
-epoc32/include/ecom/test_bed/transition.inl
-epoc32/include/ecom/test_bed/unittest.inl
-epoc32/include/ecom/test_bed/unittestinfo.inl
 epoc32/include/editorundo.h
 epoc32/include/egl/egl.h
 epoc32/include/egl/eglext.h
 epoc32/include/egl/egltypes.h
 epoc32/include/eglosnativewindowtype.h
-epoc32/include/eikamnt.h
-epoc32/include/eikapp.h
-epoc32/include/eikappui.h
-epoc32/include/eikaufty.h
-epoc32/include/eikbhelp.h
-epoc32/include/eikbusymsgwin.h
 epoc32/include/eikcdlg.rsg
-epoc32/include/eikcmobs.h
 epoc32/include/eikcoctl.rsg
 epoc32/include/eikcolor.hrh
 epoc32/include/eikcore.rsg
 epoc32/include/eikctl.rsg
-epoc32/include/eikcycledef.h
-epoc32/include/eikdebug.h
-epoc32/include/eikdef.h
-epoc32/include/eikdgfty.h
-epoc32/include/eikdll.h
-epoc32/include/eikdoc.h
-epoc32/include/eikembal.h
-epoc32/include/eikenv.h
-epoc32/include/eikenv.inl
-epoc32/include/eikfctry.h
-epoc32/include/eikfutil.h
-epoc32/include/eikinfomsgwin.h
-epoc32/include/eikirfty.h
-epoc32/include/eiklibry.h
-epoc32/include/eikmobs.h
-epoc32/include/eikmsg.h
-epoc32/include/eiknotapi.h
-epoc32/include/eikpanic.h
-epoc32/include/eikpicturefactory.h
-epoc32/include/eikproc.h
-epoc32/include/eikrutil.h
-epoc32/include/eikserverapp.h
-epoc32/include/eiksfont.h
-epoc32/include/eiksrv.h
-epoc32/include/eiksrv.pan
-epoc32/include/eiksrvc.h
-epoc32/include/eiksrvs.h
-epoc32/include/eikstart.h
-epoc32/include/eiksvdef.h
-epoc32/include/eikunder.h
-epoc32/include/eikvcurs.h
-epoc32/include/elements/cftransport.inl
 epoc32/include/elements/cftransportmacro.h
-epoc32/include/elements/cftransportmsg.inl
-epoc32/include/elements/sd_roles.inl
-epoc32/include/elements/sd_std.inl
 epoc32/include/emanaged.h
 epoc32/include/emisc.h
 epoc32/include/emsinformationelement.h
@@ -789,40 +583,23 @@
 epoc32/include/environmentalreverbutilitydata.h
 epoc32/include/epos_privacynotifier.hrh
 epoc32/include/errorres.rsg
-epoc32/include/es_commsbuf.h
 epoc32/include/es_enum.h
-epoc32/include/es_enum.inl
-epoc32/include/es_enum_internal.inl
-epoc32/include/es_enum_partner.inl
-epoc32/include/es_mbuf.h
 epoc32/include/es_panic.h
-epoc32/include/es_prot.h
-epoc32/include/es_prot.inl
 epoc32/include/es_sock.h
-epoc32/include/es_sock.inl
-epoc32/include/es_sock_internal.inl
 epoc32/include/es_ver.h
 epoc32/include/es_wsms.h
 epoc32/include/es_wsms.inl
 epoc32/include/escapeutils.h
-epoc32/include/estatus.h
 epoc32/include/estlib.h
 epoc32/include/estring.h
-epoc32/include/estw32.h
 epoc32/include/et_clsvr.h
-epoc32/include/etbuffer.h
 epoc32/include/etel.inl
 epoc32/include/etel3rdparty.h
-epoc32/include/etelext.h
-epoc32/include/etelpckt.h
 epoc32/include/etelpckt.inl
-epoc32/include/etelqos.h
-epoc32/include/etelutils.h
 epoc32/include/etslotnum.h
 epoc32/include/eui_addr.h
 epoc32/include/euserhl.h
 epoc32/include/ewsd.h
-epoc32/include/exbuf.h
 epoc32/include/exifmodify.h
 epoc32/include/exifread.h
 epoc32/include/exiftag.h
@@ -838,52 +615,30 @@
 epoc32/include/ezlib.h
 epoc32/include/ezliberrorcodes.h
 epoc32/include/ezstream.h
-epoc32/include/f32dbg.h
 epoc32/include/f32file.h
 epoc32/include/f32file.inl
 epoc32/include/f32file64.h
 epoc32/include/f32file64.inl
-epoc32/include/f32fsys.h
-epoc32/include/f32fsys.inl
-epoc32/include/f32image.h
-epoc32/include/f32plugin.inl
-epoc32/include/f32tracedef.h
-epoc32/include/f32ver.h
 epoc32/include/faxdefn.h
 epoc32/include/fbs.h
-epoc32/include/fbsmessage.h
 epoc32/include/featdiscovery.h
 epoc32/include/featureinfo.h
 epoc32/include/features.hrh
 epoc32/include/featureuids.h
-epoc32/include/fepbase.h
-epoc32/include/fepbconfig.h
-epoc32/include/fepbutils.h
-epoc32/include/fepitfr.h
-epoc32/include/fepplugin.h
-epoc32/include/fepplugin.inl
 epoc32/include/filesystem_fat.h
 epoc32/include/finditemengine.h
 epoc32/include/fldbase.h
 epoc32/include/fldbltin.h
-epoc32/include/flddef.h
 epoc32/include/fldinfo.h
-epoc32/include/fldset.h
-epoc32/include/flogger.h
-epoc32/include/flogger.inl
 epoc32/include/fntstore.h
 epoc32/include/frmconst.h
-epoc32/include/frmcurs.h
 epoc32/include/frmframe.h
 epoc32/include/frmlaydt.h
-epoc32/include/frmpage.h
 epoc32/include/frmparam.h
 epoc32/include/frmprint.h
 epoc32/include/frmtlay.h
 epoc32/include/frmtview.h
 epoc32/include/frmvis.h
-epoc32/include/ftpprot.h
-epoc32/include/ftpsess.h
 epoc32/include/gb2312.h
 epoc32/include/gbk.h
 epoc32/include/gcc_mingw/gcc_mingw_3_4_2.h
@@ -891,10 +646,6 @@
 epoc32/include/gdi.h
 epoc32/include/gdi.inl
 epoc32/include/gdr.h
-epoc32/include/gfp.h
-epoc32/include/gfxtranseffect/gfxtransclient.h
-epoc32/include/gfxtranseffect/gfxtransdatatype.h
-epoc32/include/gfxtranseffect/gfxtranseffect.h
 epoc32/include/gifscaler.h
 epoc32/include/gles/gl.h
 epoc32/include/gles/glext.h
@@ -906,27 +657,9 @@
 epoc32/include/gles2/gl2platform.h
 epoc32/include/gmxmlparser.h
 epoc32/include/gprsprog.h
-epoc32/include/graphics/blendingalgorithms.h
-epoc32/include/graphics/blendingalgorithms.inl
-epoc32/include/graphics/compositionsurfaceupdate.h
 epoc32/include/graphics/eglsynchelper.h
-epoc32/include/graphics/extensioncontainer.h
-epoc32/include/graphics/lookuptable.h
 epoc32/include/graphics/streammap.h
-epoc32/include/graphics/surfaceconfiguration.inl
-epoc32/include/graphics/surfaceupdateclient.h
-epoc32/include/graphics/wsdisplaycontrol.h
-epoc32/include/graphics/wsdisplaymapping.h
-epoc32/include/graphics/wsdisplaypolicy.h
-epoc32/include/graphics/wsscreendeviceutils.h
-epoc32/include/graphics/wstestscreencapture.h
 epoc32/include/graphicsaccelerator.h
-epoc32/include/grdcells.h
-epoc32/include/grddef.h
-epoc32/include/grdprint.h
-epoc32/include/grdprint.inl
-epoc32/include/grdstd.h
-epoc32/include/grdstd.inl
 epoc32/include/gsmubuf.h
 epoc32/include/gsmuelem.h
 epoc32/include/gsmuelem.inl
@@ -945,75 +678,12 @@
 epoc32/include/gsmuset.inl
 epoc32/include/gsmustor.h
 epoc32/include/gsmustor.inl
-epoc32/include/gulalign.h
-epoc32/include/gulbordr.h
-epoc32/include/gulcolor.h
-epoc32/include/guldef.h
-epoc32/include/gulfont.h
 epoc32/include/gulfont.hrh
 epoc32/include/gulftflg.hrh
-epoc32/include/gulgcmap.h
-epoc32/include/gulicon.h
-epoc32/include/gulpanic.h
-epoc32/include/gulsprite.h
-epoc32/include/gulutil.h
 epoc32/include/hal.h
 epoc32/include/hal_data.h
 epoc32/include/hash.h
-epoc32/include/hlpconstants.h
-epoc32/include/hlplch.h
-epoc32/include/hlpmodel.h
-epoc32/include/hlpzoom.h
-epoc32/include/hsdataobserver.h
-epoc32/include/hsexception.h
-epoc32/include/hswidget.h
-epoc32/include/hswidgetpublisher.h
-epoc32/include/http.h
-epoc32/include/http/cauthenticationfilterinterface.h
-epoc32/include/http/cecomfilter.h
-epoc32/include/http/framework/cheadercodec.h
-epoc32/include/http/framework/cprotocolhandler.h
-epoc32/include/http/framework/cprottransaction.h
-epoc32/include/http/framework/crxdata.h
-epoc32/include/http/framework/csecuritypolicy.h
-epoc32/include/http/framework/csecuritypolicy.inl
-epoc32/include/http/framework/ctxdata.h
-epoc32/include/http/framework/mrxdataobserver.h
-epoc32/include/http/framework/rheaderfield.h
-epoc32/include/http/mhttpauthenticationcallback.h
-epoc32/include/http/mhttpdataoptimiser.h
-epoc32/include/http/mhttpdatasupplier.h
-epoc32/include/http/mhttpfilter.h
-epoc32/include/http/mhttpfilterbase.h
-epoc32/include/http/mhttpfiltercreationcallback.h
-epoc32/include/http/mhttpsessioneventcallback.h
-epoc32/include/http/mhttptransactioncallback.h
-epoc32/include/http/rhttpconnectioninfo.h
-epoc32/include/http/rhttpfiltercollection.h
-epoc32/include/http/rhttpheaders.h
-epoc32/include/http/rhttpmessage.h
-epoc32/include/http/rhttppropertyset.h
-epoc32/include/http/rhttprequest.h
-epoc32/include/http/rhttpresponse.h
-epoc32/include/http/rhttpsession.h
-epoc32/include/http/rhttptransaction.h
-epoc32/include/http/rhttptransactionpropertyset.h
-epoc32/include/http/tfilterconfigurationiter.h
-epoc32/include/http/tfilterinformation.h
-epoc32/include/http/thttpevent.h
-epoc32/include/http/thttpevent.inl
-epoc32/include/http/thttpfilterhandle.h
-epoc32/include/http/thttpfilteriterator.h
-epoc32/include/http/thttpfilterregistration.h
-epoc32/include/http/thttphdrfielditer.h
-epoc32/include/http/thttphdrval.h
-epoc32/include/httperr.h
-epoc32/include/httpstd.h
 epoc32/include/httpstringconstants.h
-epoc32/include/hwrm/hwrmpluginservice.inl
-epoc32/include/hwrm/hwrmpowerstateplugin.inl
-epoc32/include/hwrm/hwrmtargetmodifierplugin.inl
-epoc32/include/hwrm/hwrmuipluginservice.inl
 epoc32/include/hwrmhaptics.h
 epoc32/include/hwrmhapticsactuatorobserver.h
 epoc32/include/hwrmhapticsobserver.h
@@ -1023,7 +693,6 @@
 epoc32/include/hwrmpowerstatesdkpskeys.h
 epoc32/include/hwrmvibra.h
 epoc32/include/hwrmvibrasdkcrkeys.h
-epoc32/include/iapprefs.h
 epoc32/include/icl/exifimagedisplayext.h
 epoc32/include/icl/icl_propertyuids.h
 epoc32/include/icl/icl_propertyuids.hrh
@@ -1044,11 +713,9 @@
 epoc32/include/icl/imagetransformpaniccodes.h
 epoc32/include/icl/imagetransformplugin.h
 epoc32/include/icl/imagetransformpluginext.h
-epoc32/include/icl/jpegyuvdecoder.h
 epoc32/include/icl/orientationtransformextension.h
 epoc32/include/icl/overlaytransformextension.h
 epoc32/include/icl/squeezetransformextension.h
-epoc32/include/iclanimationdataprovider.h
 epoc32/include/iclexif.h
 epoc32/include/iclexifimageframe.h
 epoc32/include/icmp6_hdr.h
@@ -1068,59 +735,29 @@
 epoc32/include/imageprocessor/imageprocessorpreview.h
 epoc32/include/imageprocessor/imageprocessorprogressinfo.h
 epoc32/include/imagetransform.h
-epoc32/include/imapcmds.h
-epoc32/include/imapconnectionobserver.h
-epoc32/include/imapset.h
-epoc32/include/imcmmain.h
-epoc32/include/imcmutil.h
-epoc32/include/imcvcodc.h
-epoc32/include/imcvcodc.inl
-epoc32/include/imcvdata.h
-epoc32/include/imcvrecv.inl
-epoc32/include/imcvsend.inl
-epoc32/include/imcvtext.h
-epoc32/include/impcmtm.h
-epoc32/include/imsk.h
-epoc32/include/imutdll.h
-epoc32/include/in6_if.h
-epoc32/include/in6_opt.h
 epoc32/include/in_chk.h
 epoc32/include/in_hdr.h
-epoc32/include/in_iface.h
 epoc32/include/in_pkt.h
 epoc32/include/in_sock.h
-epoc32/include/inbuf.h
+epoc32/include/in6_if.h
+epoc32/include/in6_opt.h
 epoc32/include/inet6err.h
 epoc32/include/inetprottextutils.h
-epoc32/include/ineturi.h
-epoc32/include/ineturilist.h
-epoc32/include/ineturilistdef.h
-epoc32/include/ip4_hdr.h
-epoc32/include/ip6_hdr.h
 epoc32/include/ip_subconparams.h
 epoc32/include/ip_subconparams.inl
-epoc32/include/ipaddr.h
+epoc32/include/ip4_hdr.h
+epoc32/include/ip6_hdr.h
 epoc32/include/ir_sock.h
-epoc32/include/ircmtm.h
-epoc32/include/irheader.h
-epoc32/include/irmsgtypeuid.h
-epoc32/include/irmtmcmds.h
-epoc32/include/irs.h
 epoc32/include/isbaseof.h
 epoc32/include/issame.h
 epoc32/include/jisx0201.h
 epoc32/include/jisx0208.h
 epoc32/include/jisx0212.h
-epoc32/include/kernel/arm/vfpsupport.h
 epoc32/include/kernel/hal_int.h
 epoc32/include/khr/khrplatform.h
 epoc32/include/khronos_types.h
 epoc32/include/lbs.h
 epoc32/include/lbs.inl
-epoc32/include/lbs/lbsadmin.inl
-epoc32/include/lbs/lbsassistancedatabase.inl
-epoc32/include/lbs/lbsassistancedatabuilderset.inl
-epoc32/include/lbs/lbsassistancedatasourcemodule.inl
 epoc32/include/lbs/lbsipc.hrh
 epoc32/include/lbsareainfo.h
 epoc32/include/lbsclasstypes.h
@@ -1189,7 +826,6 @@
 epoc32/include/libc/sys/times.h
 epoc32/include/libc/sys/unistd.h
 epoc32/include/libc/sys/wait.h
-epoc32/include/liblogger.h
 epoc32/include/linebreak.h
 epoc32/include/linkedfonts.h
 epoc32/include/listenerdopplerbase.h
@@ -1201,8 +837,6 @@
 epoc32/include/logcli.h
 epoc32/include/logcli.inl
 epoc32/include/logclientchangeobserver.h
-epoc32/include/logcntdef.h
-epoc32/include/logdef.h
 epoc32/include/logeng.h
 epoc32/include/logview.h
 epoc32/include/logview.inl
@@ -1214,26 +848,16 @@
 epoc32/include/logwrapconst.h
 epoc32/include/loudnessbase.h
 epoc32/include/loudnessdata.h
-epoc32/include/lst.h
 epoc32/include/mateventcompleteobserver.h
 epoc32/include/maudioeffectobserver.h
 epoc32/include/maudioequalizerobserver.h
 epoc32/include/mbassboostobserver.h
 epoc32/include/mbmstypes.h
 epoc32/include/mcertstore.h
-epoc32/include/mclient.h
 epoc32/include/mctcertapps.h
-epoc32/include/mctcertstore.h
-epoc32/include/mctkeystore.inl
-epoc32/include/mctwritablecertstore.h
-epoc32/include/mctwritablecertstore.inl
 epoc32/include/mcustomcommand.h
 epoc32/include/mcustominterface.h
-epoc32/include/mda/client/base.h
-epoc32/include/mda/client/controller.h
-epoc32/include/mda/client/port.h
 epoc32/include/mda/client/utility.h
-epoc32/include/mda/client/video.inl
 epoc32/include/mda/common/audio.h
 epoc32/include/mda/common/audio.hrh
 epoc32/include/mda/common/audiostream.hrh
@@ -1251,31 +875,12 @@
 epoc32/include/mdaaudiotoneplayer.h
 epoc32/include/mdaframeinfo.h
 epoc32/include/mdaimageconverter.h
-epoc32/include/mdataproviderobserver.h
-epoc32/include/mdf/mdfprocessingunit.inl
-epoc32/include/mdf/mdfpuloader.inl
 epoc32/include/mdistanceattenuationobserver.h
 epoc32/include/mdopplerobserver.h
-epoc32/include/mdptx.h
 epoc32/include/medobsrv.h
-epoc32/include/memmodel/emul/platform.h
-epoc32/include/memmodel/epoc/mmubase/kblockmap.h
-epoc32/include/mentact.h
 epoc32/include/menvironmentalreverbobserver.h
 epoc32/include/metadatabase.h
-epoc32/include/metafile.h
-epoc32/include/mframeworksp.h
 epoc32/include/midiclientutility.h
-epoc32/include/miut_err.h
-epoc32/include/miutatch.h
-epoc32/include/miutconv.h
-epoc32/include/miutdef.h
-epoc32/include/miuthdr.h
-epoc32/include/miuthdr.inl
-epoc32/include/miutlog.h
-epoc32/include/miutmsg.h
-epoc32/include/miutpars.h
-epoc32/include/miutset.h
 epoc32/include/miutstd.hrh
 epoc32/include/mlistenerdopplerobserver.h
 epoc32/include/mlistenerlocationobserver.h
@@ -1291,7 +896,6 @@
 epoc32/include/mmf/common/mmfcontrollerframework.h
 epoc32/include/mmf/common/mmfcontrollerframeworkbase.h
 epoc32/include/mmf/common/mmfcontrollerpluginresolver.h
-epoc32/include/mmf/common/mmfdrmcustomcommands.h
 epoc32/include/mmf/common/mmfdurationinfocustomcommands.h
 epoc32/include/mmf/common/mmffourcc.h
 epoc32/include/mmf/common/mmfipc.h
@@ -1353,18 +957,11 @@
 epoc32/include/mmf/server/mmfformat.inl
 epoc32/include/mmf/server/mmfhwdevice.inl
 epoc32/include/mmf/server/mmfsubthreadbase.h
-epoc32/include/mmf/server/mmfswcodecwrapper.h
 epoc32/include/mmf/server/mmfurl.h
 epoc32/include/mmf/server/mmfvideoframebuffer.h
 epoc32/include/mmf/server/sounddevice.h
 epoc32/include/mmf/server/sounddevice.inl
 epoc32/include/mmfclntutility.h
-epoc32/include/mmmssettingsobserver.h
-epoc32/include/mmssettingsproxybase.inl
-epoc32/include/mmsvattachmentmanager.h
-epoc32/include/mmsvattachmentmanagersync.h
-epoc32/include/mmsvstoremanager.h
-epoc32/include/mobexnotify.h
 epoc32/include/morientationobserver.h
 epoc32/include/mparser.h
 epoc32/include/mroomlevelobserver.h
@@ -1372,53 +969,13 @@
 epoc32/include/msourcelocationobserver.h
 epoc32/include/msourceorientationobserver.h
 epoc32/include/mstereowideningobserver.h
-epoc32/include/msvapi.h
-epoc32/include/msvapi.inl
-epoc32/include/msvarray.h
-epoc32/include/msventry.h
-epoc32/include/msventry.inl
-epoc32/include/msventryscheduledata.h
-epoc32/include/msvfind.h
-epoc32/include/msvfind.inl
-epoc32/include/msvftext.h
-epoc32/include/msvftext.inl
-epoc32/include/msvids.h
-epoc32/include/msvipc.h
-epoc32/include/msvipc.inl
-epoc32/include/msvoffpeaktime.h
-epoc32/include/msvrcpt.h
-epoc32/include/msvrcpt.inl
-epoc32/include/msvreg.h
-epoc32/include/msvreg.inl
-epoc32/include/msvruids.h
-epoc32/include/msvscheduledentry.h
-epoc32/include/msvscheduledentry.inl
-epoc32/include/msvschedulepackage.h
-epoc32/include/msvschedulesend.h
-epoc32/include/msvschedulesend.inl
-epoc32/include/msvschedulesettings.h
-epoc32/include/msvsenderroraction.h
-epoc32/include/msvstd.h
 epoc32/include/msvstd.hrh
-epoc32/include/msvstd.inl
-epoc32/include/msvstore.h
-epoc32/include/msvsysagentaction.h
-epoc32/include/msvuids.h
-epoc32/include/msvutils.h
-epoc32/include/mtclbase.h
-epoc32/include/mtclreg.h
-epoc32/include/mtmdef.h
 epoc32/include/mtmdef.hrh
-epoc32/include/mtmuibas.h
-epoc32/include/mtmuids.h
-epoc32/include/mtp/rptpipframework.h
-epoc32/include/mtsr.h
 epoc32/include/mtud.hrh
-epoc32/include/mtud.rh
-epoc32/include/mtudcbas.h
-epoc32/include/mtudreg.h
-epoc32/include/mtuireg.h
-epoc32/include/mturutils.h
+epoc32/include/mw/absolutevolumeapicontroller.h
+epoc32/include/mw/absolutevolumeapicontrollerobserver.h
+epoc32/include/mw/absolutevolumeapitarget.h
+epoc32/include/mw/absolutevolumeapitargetobserver.h
 epoc32/include/mw/activeapdb.h
 epoc32/include/mw/activefavouritesdbnotifier.h
 epoc32/include/mw/aiwcommon.h
@@ -1604,22 +1161,66 @@
 epoc32/include/mw/aknwaitdialog.h
 epoc32/include/mw/aknwaitnotewrapper.h
 epoc32/include/mw/aknwseventobserver.h
+epoc32/include/mw/animation.h
+epoc32/include/mw/animationconfig.h
+epoc32/include/mw/animationdataloaderobserver.h
+epoc32/include/mw/animationdataprovider.h
+epoc32/include/mw/animationevents.h
+epoc32/include/mw/animationframe.h
+epoc32/include/mw/animationgroup.h
+epoc32/include/mw/animationmixins.h
+epoc32/include/mw/animationticker.h
+epoc32/include/mw/animationtls.h
+epoc32/include/mw/animator.h
+epoc32/include/mw/ansicomp.h
+epoc32/include/mw/apaapp.h
 epoc32/include/mw/apaccesspointitem.h
+epoc32/include/mw/apacmdln.h
+epoc32/include/mw/apadbase.h
+epoc32/include/mw/apadef.h
+epoc32/include/mw/apadoc.h
+epoc32/include/mw/apaid.h
+epoc32/include/mw/apamdr.h
+epoc32/include/mw/apaproc.h
+epoc32/include/mw/apcaptionfile.rh
 epoc32/include/mw/apdatahandler.h
 epoc32/include/mw/apengineconsts.h
 epoc32/include/mw/apenginever.h
+epoc32/include/mw/apgcli.h
+epoc32/include/mw/apgctl.h
+epoc32/include/mw/apgdoor.h
+epoc32/include/mw/apgicnfl.h
+epoc32/include/mw/apgtask.h
+epoc32/include/mw/apgwgnam.h
 epoc32/include/mw/aplistitem.h
 epoc32/include/mw/aplistitemlist.h
 epoc32/include/mw/apnetworkitem.h
 epoc32/include/mw/apnetworkitemlist.h
 epoc32/include/mw/apnetworks.h
+epoc32/include/mw/apparc.h
 epoc32/include/mw/apselect.h
 epoc32/include/mw/apsettingshandlercommons.h
 epoc32/include/mw/apsettingshandlerui.h
 epoc32/include/mw/aputils.h
+epoc32/include/mw/asaltdefs.h
+epoc32/include/mw/ascliclientutils.h
+epoc32/include/mw/asclidefinitions.h
+epoc32/include/mw/asclisession.h
+epoc32/include/mw/asclisoundplay.h
+epoc32/include/mw/asshdalarm.h
+epoc32/include/mw/asshdbitflags.h
+epoc32/include/mw/asshddefs.h
+epoc32/include/mw/attrlut.h
 epoc32/include/mw/avkon.hrh
 epoc32/include/mw/avkon.rh
 epoc32/include/mw/avkonicons.hrh
+epoc32/include/mw/basicanimation.h
+epoc32/include/mw/bif.h
+epoc32/include/mw/biodb.h
+epoc32/include/mw/biouids.h
+epoc32/include/mw/bmpancli.h
+epoc32/include/mw/bmpanconsts.h
+epoc32/include/mw/bmpansrv.h
 epoc32/include/mw/brctldefs.h
 epoc32/include/mw/brctldialogsprovider.h
 epoc32/include/mw/brctldownloadobserver.h
@@ -1632,6 +1233,7 @@
 epoc32/include/mw/browserplugininterface.h
 epoc32/include/mw/browseruiinternalcrkeys.h
 epoc32/include/mw/browseruisdkcrkeys.h
+epoc32/include/mw/bsp.h
 epoc32/include/mw/btnotifierapi.h
 epoc32/include/mw/btserversdkcrkeys.h
 epoc32/include/mw/cakncommondialogsbase.h
@@ -1642,17 +1244,26 @@
 epoc32/include/mw/caknmemoryselectionsettingitem.h
 epoc32/include/mw/caknmemoryselectionsettingitemmultidrive.h
 epoc32/include/mw/caknmemoryselectionsettingpage.h
+epoc32/include/mw/cbioasyncwaiter.h
+epoc32/include/mw/cbnfnode.h
+epoc32/include/mw/cbnfparser.h
 epoc32/include/mw/cdirectorylocalizer.h
 epoc32/include/mw/cdownloadmgruibase.h
 epoc32/include/mw/cdownloadmgruidownloadmenu.h
 epoc32/include/mw/cdownloadmgruidownloadslist.h
 epoc32/include/mw/cdownloadmgruilibregistry.h
 epoc32/include/mw/cdownloadmgruiuserinteractions.h
+epoc32/include/mw/cdtdmodel.h
 epoc32/include/mw/cecombrowserplugininterface.h
+epoc32/include/mw/cfragmentedstring.h
+epoc32/include/mw/chttpformencoder.h
+epoc32/include/mw/chttpresponse.h
 epoc32/include/mw/clfcontentlisting.h
 epoc32/include/mw/clfcontentlisting.hrh
 epoc32/include/mw/clfcontentlisting.rh
+epoc32/include/mw/clock.h
 epoc32/include/mw/cmapplicationsettingsui.h
+epoc32/include/mw/cmarkedstack.h
 epoc32/include/mw/cmconnectionmethod.h
 epoc32/include/mw/cmconnectionmethod.inl
 epoc32/include/mw/cmconnectionmethoddef.h
@@ -1672,12 +1283,51 @@
 epoc32/include/mw/cmpluginvpndef.h
 epoc32/include/mw/cmpluginwlandef.h
 epoc32/include/mw/cmsettingsui.h
+epoc32/include/mw/cmsvattachment.h
+epoc32/include/mw/cmsvmimeheaders.h
+epoc32/include/mw/cmsvplainbodytext.h
+epoc32/include/mw/cmsvrecipientlist.h
+epoc32/include/mw/cmsvtechnologytypedefaultmtmsettings.h
+epoc32/include/mw/cnftool.rh
+epoc32/include/mw/cnode.h
+epoc32/include/mw/cnodeleteattribute.h
+epoc32/include/mw/coeaui.h
+epoc32/include/mw/coeccntx.h
+epoc32/include/mw/coecntrl.h
+epoc32/include/mw/coecobs.h
+epoc32/include/mw/coecoloruse.h
+epoc32/include/mw/coecontrolarray.h
+epoc32/include/mw/coedef.h
+epoc32/include/mw/coeerror.h
+epoc32/include/mw/coefepff.h
+epoc32/include/mw/coefont.h
+epoc32/include/mw/coefontprovider.h
+epoc32/include/mw/coehelp.h
+epoc32/include/mw/coeinput.h
+epoc32/include/mw/coelayoutman.h
+epoc32/include/mw/coemain.h
+epoc32/include/mw/coemain.inl
+epoc32/include/mw/coemop.h
+epoc32/include/mw/coesndpy.h
+epoc32/include/mw/coetextdrawer.h
+epoc32/include/mw/coeutils.h
+epoc32/include/mw/coeview.h
 epoc32/include/mw/commondialogs.hrh
 epoc32/include/mw/commondialogs.rh
+epoc32/include/mw/conarc.h
+epoc32/include/mw/concnf.h
+epoc32/include/mw/conlist.h
+epoc32/include/mw/conplugin.rh
 epoc32/include/mw/contentlistingfactory.h
+epoc32/include/mw/copydatafile.h
 epoc32/include/mw/coreapplicationuissdkcrkeys.h
+epoc32/include/mw/crulemarkedstack.h
 epoc32/include/mw/csatelliteinfoui.h
+epoc32/include/mw/csendasaccounts.h
+epoc32/include/mw/csendasmessagetypes.h
 epoc32/include/mw/csendingserviceinfo.h
+epoc32/include/mw/csmsclass0base.h
+epoc32/include/mw/cstack.h
 epoc32/include/mw/dclcrkeys.h
 epoc32/include/mw/directorylocalizer.rh
 epoc32/include/mw/documenthandler.h
@@ -1686,10 +1336,16 @@
 epoc32/include/mw/drmhelper.h
 epoc32/include/mw/drmhelperserverinternalcrkeys.h
 epoc32/include/mw/drmlicensechecker.h
+epoc32/include/mw/dtdnode.h
 epoc32/include/mw/eikalert.h
 epoc32/include/mw/eikalign.h
+epoc32/include/mw/eikamnt.h
+epoc32/include/mw/eikapp.h
+epoc32/include/mw/eikappui.h
+epoc32/include/mw/eikaufty.h
 epoc32/include/mw/eikbctrl.h
 epoc32/include/mw/eikbgfty.h
+epoc32/include/mw/eikbhelp.h
 epoc32/include/mw/eikbtgpc.h
 epoc32/include/mw/eikbtgps.h
 epoc32/include/mw/eikbtgrp.h
@@ -1703,22 +1359,31 @@
 epoc32/include/mw/eikclb.h
 epoc32/include/mw/eikclbd.h
 epoc32/include/mw/eikcmbut.h
+epoc32/include/mw/eikcmobs.h
 epoc32/include/mw/eikcoctlpanic.h
 epoc32/include/mw/eikcolib.h
 epoc32/include/mw/eikconso.h
 epoc32/include/mw/eikctgrp.h
 epoc32/include/mw/eikctlib.h
+epoc32/include/mw/eikdef.h
 epoc32/include/mw/eikdialg.pan
+epoc32/include/mw/eikdll.h
+epoc32/include/mw/eikdoc.h
 epoc32/include/mw/eikdpage.h
 epoc32/include/mw/eikdpobs.h
 epoc32/include/mw/eikedwin.h
 epoc32/include/mw/eikedwin.pan
 epoc32/include/mw/eikedwob.h
+epoc32/include/mw/eikembal.h
+epoc32/include/mw/eikenv.h
+epoc32/include/mw/eikenv.inl
+epoc32/include/mw/eikfctry.h
 epoc32/include/mw/eikfnlab.h
 epoc32/include/mw/eikform.pan
 epoc32/include/mw/eikfpne.h
 epoc32/include/mw/eikfrlb.h
 epoc32/include/mw/eikfrlbd.h
+epoc32/include/mw/eikfutil.h
 epoc32/include/mw/eikgted.h
 epoc32/include/mw/eikhfdlg.h
 epoc32/include/mw/eikhkeyc.h
@@ -1738,12 +1403,17 @@
 epoc32/include/mw/eikmfne.h
 epoc32/include/mw/eikmfne.pan
 epoc32/include/mw/eikmnbut.h
+epoc32/include/mw/eikmobs.h
 epoc32/include/mw/eikmover.h
+epoc32/include/mw/eikmsg.h
+epoc32/include/mw/eiknotapi.h
 epoc32/include/mw/eikon.hrh
 epoc32/include/mw/eikon.rh
 epoc32/include/mw/eikon.rsg
+epoc32/include/mw/eikproc.h
 epoc32/include/mw/eikprogi.h
 epoc32/include/mw/eikrted.h
+epoc32/include/mw/eikrutil.h
 epoc32/include/mw/eiksbfrm.h
 epoc32/include/mw/eiksbobs.h
 epoc32/include/mw/eikscbut.h
@@ -1753,10 +1423,13 @@
 epoc32/include/mw/eikspace.h
 epoc32/include/mw/eikspane.h
 epoc32/include/mw/eikspmod.h
+epoc32/include/mw/eikstart.h
 epoc32/include/mw/eiktbar.h
 epoc32/include/mw/eikthumb.h
 epoc32/include/mw/eiktxlbm.h
 epoc32/include/mw/eiktxlbx.h
+epoc32/include/mw/eikunder.h
+epoc32/include/mw/eikvcurs.h
 epoc32/include/mw/epos_cposlandmark.h
 epoc32/include/mw/epos_cposlandmarkcategory.h
 epoc32/include/mw/epos_cposlandmarkdatabase.h
@@ -1790,6 +1463,7 @@
 epoc32/include/mw/epos_tposlmdatabasesettings.h
 epoc32/include/mw/epos_tposlmsortpref.h
 epoc32/include/mw/errorui.h
+epoc32/include/mw/estatus.h
 epoc32/include/mw/extendedconnpref.h
 epoc32/include/mw/favouritesdb.h
 epoc32/include/mw/favouritesdbincremental.h
@@ -1806,9 +1480,72 @@
 epoc32/include/mw/favouritessession.h
 epoc32/include/mw/favouritessession.inl
 epoc32/include/mw/favouriteswapap.h
+epoc32/include/mw/fepbase.h
+epoc32/include/mw/fepbconfig.h
+epoc32/include/mw/fepbutils.h
+epoc32/include/mw/fepplugin.h
+epoc32/include/mw/fepplugin.inl
 epoc32/include/mw/flash_ui.h
 epoc32/include/mw/fontids.hrh
+epoc32/include/mw/grdcells.h
+epoc32/include/mw/grddef.h
+epoc32/include/mw/grdprint.h
+epoc32/include/mw/grdprint.inl
+epoc32/include/mw/grdstd.h
+epoc32/include/mw/grdstd.inl
+epoc32/include/mw/gulalign.h
+epoc32/include/mw/gulbordr.h
+epoc32/include/mw/gulcolor.h
+epoc32/include/mw/guldef.h
+epoc32/include/mw/gulfont.h
+epoc32/include/mw/gulicon.h
+epoc32/include/mw/gulutil.h
+epoc32/include/mw/http.h
+epoc32/include/mw/http/cauthenticationfilterinterface.h
+epoc32/include/mw/http/cecomfilter.h
+epoc32/include/mw/http/framework/cheadercodec.h
+epoc32/include/mw/http/framework/cprotocolhandler.h
+epoc32/include/mw/http/framework/cprottransaction.h
+epoc32/include/mw/http/framework/crxdata.h
+epoc32/include/mw/http/framework/csecuritypolicy.h
+epoc32/include/mw/http/framework/csecuritypolicy.inl
+epoc32/include/mw/http/framework/ctxdata.h
+epoc32/include/mw/http/framework/mrxdataobserver.h
+epoc32/include/mw/http/framework/rheaderfield.h
+epoc32/include/mw/http/mhttpauthenticationcallback.h
+epoc32/include/mw/http/mhttpdatasupplier.h
+epoc32/include/mw/http/mhttpfilter.h
+epoc32/include/mw/http/mhttpfilterbase.h
+epoc32/include/mw/http/mhttpfiltercreationcallback.h
+epoc32/include/mw/http/mhttpsessioneventcallback.h
+epoc32/include/mw/http/mhttptransactioncallback.h
+epoc32/include/mw/http/rhttpconnectioninfo.h
+epoc32/include/mw/http/rhttpfiltercollection.h
+epoc32/include/mw/http/rhttpheaders.h
+epoc32/include/mw/http/rhttpmessage.h
+epoc32/include/mw/http/rhttppropertyset.h
+epoc32/include/mw/http/rhttprequest.h
+epoc32/include/mw/http/rhttpresponse.h
+epoc32/include/mw/http/rhttpsession.h
+epoc32/include/mw/http/rhttptransaction.h
+epoc32/include/mw/http/rhttptransactionpropertyset.h
+epoc32/include/mw/http/tfilterconfigurationiter.h
+epoc32/include/mw/http/tfilterinformation.h
+epoc32/include/mw/http/thttpevent.h
+epoc32/include/mw/http/thttpevent.inl
+epoc32/include/mw/http/thttpfilterhandle.h
+epoc32/include/mw/http/thttpfilteriterator.h
+epoc32/include/mw/http/thttpfilterregistration.h
+epoc32/include/mw/http/thttphdrfielditer.h
+epoc32/include/mw/http/thttphdrval.h
 epoc32/include/mw/httpdownloadmgrcommon.h
+epoc32/include/mw/httperr.h
+epoc32/include/mw/httpstd.h
+epoc32/include/mw/iclanimationdataprovider.h
+epoc32/include/mw/ineturi.h
+epoc32/include/mw/ineturilist.h
+epoc32/include/mw/ineturilistdef.h
+epoc32/include/mw/ipaddr.h
 epoc32/include/mw/jri.h
 epoc32/include/mw/lafpanic.h
 epoc32/include/mw/lafpublc.h
@@ -1842,6 +1579,7 @@
 epoc32/include/mw/lbttriggeringsystemsettings.h
 epoc32/include/mw/lbttriggeringsystemsettingschangeeventnotifier.h
 epoc32/include/mw/lbttriggeringsystemsettingschangeeventobserver.h
+epoc32/include/mw/logdef.h
 epoc32/include/mw/maknfilefilter.h
 epoc32/include/mw/maknfileselectionobserver.h
 epoc32/include/mw/maknmemoryselectionobserver.h
@@ -1856,12 +1594,18 @@
 epoc32/include/mw/mclfpostfilter.h
 epoc32/include/mw/mclfprocessobserver.h
 epoc32/include/mw/mclfsortingstyle.h
+epoc32/include/mw/mdataproviderobserver.h
+epoc32/include/mw/mdptx.h
 epoc32/include/mw/mediafiletypes.hrh
 epoc32/include/mw/memorymanager.h
+epoc32/include/mw/mframeworksp.h
 epoc32/include/mw/mgfetch.h
 epoc32/include/mw/mmfropcustomcommandconstants.h
 epoc32/include/mw/mmgfetchcanceler.h
 epoc32/include/mw/mmgfetchverifier.h
+epoc32/include/mw/mmsvattachmentmanager.h
+epoc32/include/mw/mmsvattachmentmanagersync.h
+epoc32/include/mw/mobexnotify.h
 epoc32/include/mw/mproengactiveprofileobserver.h
 epoc32/include/mw/mproengalerttoneseeker.h
 epoc32/include/mw/mproengalerttoneseekerobserver.h
@@ -1892,15 +1636,69 @@
 epoc32/include/mw/msenserviceconsumer.h
 epoc32/include/mw/msenservicedescription.h
 epoc32/include/mw/msenservicepolicy.h
+epoc32/include/mw/msvapi.h
+epoc32/include/mw/msventry.h
+epoc32/include/mw/msventryscheduledata.h
+epoc32/include/mw/msvfind.h
+epoc32/include/mw/msvftext.h
+epoc32/include/mw/msvids.h
+epoc32/include/mw/msvoffpeaktime.h
+epoc32/include/mw/msvrcpt.h
+epoc32/include/mw/msvreg.h
+epoc32/include/mw/msvruids.h
+epoc32/include/mw/msvscheduledentry.h
+epoc32/include/mw/msvschedulepackage.h
+epoc32/include/mw/msvschedulesend.h
+epoc32/include/mw/msvschedulesettings.h
+epoc32/include/mw/msvsenderroraction.h
+epoc32/include/mw/msvstd.h
+epoc32/include/mw/msvstore.h
+epoc32/include/mw/msvsysagentaction.h
+epoc32/include/mw/msvuids.h
+epoc32/include/mw/mtclbase.h
+epoc32/include/mw/mtclreg.h
+epoc32/include/mw/mtmdef.h
+epoc32/include/mw/mtmuibas.h
+epoc32/include/mw/mtmuids.h
+epoc32/include/mw/mtsr.h
+epoc32/include/mw/mtud.rh
+epoc32/include/mw/mtudcbas.h
+epoc32/include/mw/mtudreg.h
+epoc32/include/mw/mtuireg.h
+epoc32/include/mw/mturutils.h
+epoc32/include/mw/mwappluginsp.h
+epoc32/include/mw/mwbxmlconverterobserver.h
 epoc32/include/mw/np_defines.h
 epoc32/include/mw/npapi.h
 epoc32/include/mw/npupp.h
+epoc32/include/mw/obex.h
+epoc32/include/mw/obexbase.h
+epoc32/include/mw/obexbaseobject.h
+epoc32/include/mw/obexbttransportinfo.h
+epoc32/include/mw/obexclient.h
+epoc32/include/mw/obexconstants.h
+epoc32/include/mw/obexfinalpacketobserver.h
+epoc32/include/mw/obexheaders.h
+epoc32/include/mw/obexirtransportinfo.h
+epoc32/include/mw/obexobjects.h
+epoc32/include/mw/obexpanics.h
+epoc32/include/mw/obexserver.h
+epoc32/include/mw/obextransportinfo.h
+epoc32/include/mw/obextypes.h
+epoc32/include/mw/obexusbtransportinfo.h
 epoc32/include/mw/obsolete/protypes.h
 epoc32/include/mw/ocrcommon.h
 epoc32/include/mw/ocrsrv.h
 epoc32/include/mw/oma2agent.h
+epoc32/include/mw/playerinformationtarget.h
+epoc32/include/mw/playerinformationtargetobserver.h
 epoc32/include/mw/pluginadapterinterface.h
+epoc32/include/mw/pragmamessage.h
 epoc32/include/mw/prcpucfg.h
+epoc32/include/mw/prninf.h
+epoc32/include/mw/prnprev.h
+epoc32/include/mw/prnsetup.h
+epoc32/include/mw/prnuids.h
 epoc32/include/mw/proengfactory.h
 epoc32/include/mw/profile.hrh
 epoc32/include/mw/profileenginesdkcrkeys.h
@@ -1922,14 +1720,62 @@
 epoc32/include/mw/ptiuserdictionary.inl
 epoc32/include/mw/rconnmon.h
 epoc32/include/mw/rdrmhelper.h
+epoc32/include/mw/regpsdll.h
+epoc32/include/mw/remconbatterytarget.h
+epoc32/include/mw/remconbatterytargetobserver.h
+epoc32/include/mw/remcondatabaseawaremediabrowsetarget.h
+epoc32/include/mw/remcondatabaseawaremedialibrarybrowse.h
+epoc32/include/mw/remcondatabaseawaremedialibrarybrowseobserver.h
+epoc32/include/mw/remcondatabaseawarenowplayingbrowse.h
+epoc32/include/mw/remcondatabaseawarenowplayingbrowseobserver.h
+epoc32/include/mw/remcondatabaseawarenowplayingtarget.h
+epoc32/include/mw/remcondatabaseawarenowplayingtargetobserver.h
+epoc32/include/mw/remcondatabaseunawaremediabrowsetarget.h
+epoc32/include/mw/remcondatabaseunawaremedialibrarybrowse.h
+epoc32/include/mw/remcondatabaseunawaremedialibrarybrowseobserver.h
+epoc32/include/mw/remcondatabaseunawarenowplayingbrowse.h
+epoc32/include/mw/remcondatabaseunawarenowplayingbrowseobserver.h
+epoc32/include/mw/remcondatabaseunawarenowplayingtarget.h
+epoc32/include/mw/remcondatabaseunawarenowplayingtargetobserver.h
+epoc32/include/mw/remcongroupnavigationtarget.h
+epoc32/include/mw/remcongroupnavigationtargetobserver.h
+epoc32/include/mw/remconmediaattributeid.h
+epoc32/include/mw/remconmediabrowsepanic.h
+epoc32/include/mw/remconmediabrowsetypes.h
+epoc32/include/mw/remconmediaerror.h
+epoc32/include/mw/remconmediainformationtarget.h
+epoc32/include/mw/remconmediainformationtargetobserver.h
+epoc32/include/mw/remconstatusapicontroller.h
+epoc32/include/mw/remconstatusapicontrollerobserver.h
+epoc32/include/mw/rsendas.h
+epoc32/include/mw/rsendasmessage.h
 epoc32/include/mw/rsendocument.h
 epoc32/include/mw/rsfwmountentry.h
 epoc32/include/mw/rsfwmountentryitem.h
 epoc32/include/mw/rsfwmountman.h
+epoc32/include/mw/rtcp.h
+epoc32/include/mw/rtp.h
+epoc32/include/mw/schedulebaseservermtm.h
+epoc32/include/mw/schsend.rh
 epoc32/include/mw/screensaverplugin.h
 epoc32/include/mw/screensaverpluginintdef.h
 epoc32/include/mw/screensaverpluginintdef.hrh
 epoc32/include/mw/screensaverpluginintdef.inl
+epoc32/include/mw/sdpattributefield.h
+epoc32/include/mw/sdpbandwidthfield.h
+epoc32/include/mw/sdpcodecconstants.h
+epoc32/include/mw/sdpcodecerr.h
+epoc32/include/mw/sdpcodecstringpool.h
+epoc32/include/mw/sdpconnectionfield.h
+epoc32/include/mw/sdpdocument.h
+epoc32/include/mw/sdpfmtattributefield.h
+epoc32/include/mw/sdpkeyfield.h
+epoc32/include/mw/sdpmediafield.h
+epoc32/include/mw/sdporiginfield.h
+epoc32/include/mw/sdprepeatfield.h
+epoc32/include/mw/sdprtpmapvalue.h
+epoc32/include/mw/sdptimefield.h
+epoc32/include/mw/sdptypedtime.h
 epoc32/include/mw/seconsdkcrkeys.h
 epoc32/include/mw/senbaseattribute.h
 epoc32/include/mw/senbaseelement.h
@@ -1937,6 +1783,8 @@
 epoc32/include/mw/sencredential.h
 epoc32/include/mw/sencredential2.h
 epoc32/include/mw/sencryptoutils.h
+epoc32/include/mw/sendas2.h
+epoc32/include/mw/sendasserver.rh
 epoc32/include/mw/sendateutils.h
 epoc32/include/mw/sendomfragment.h
 epoc32/include/mw/sendomfragmentbase.h
@@ -1974,18 +1822,146 @@
 epoc32/include/mw/senxmlreader.h
 epoc32/include/mw/senxmlservicedescription.h
 epoc32/include/mw/senxmlutils.h
+epoc32/include/mw/sip.h
+epoc32/include/mw/sip_subconevents.h
+epoc32/include/mw/sip_subconevents.inl
+epoc32/include/mw/sip_subconparams.h
+epoc32/include/mw/sip_subconparams.inl
+epoc32/include/mw/sipacceptcontactheader.h
+epoc32/include/mw/sipacceptencodingheader.h
+epoc32/include/mw/sipacceptheader.h
+epoc32/include/mw/sipacceptlanguageheader.h
+epoc32/include/mw/sipaddress.h
+epoc32/include/mw/sipaddressheaderbase.h
+epoc32/include/mw/sipalloweventsheader.h
+epoc32/include/mw/sipallowheader.h
+epoc32/include/mw/sipauthenticateheaderbase.h
+epoc32/include/mw/sipauthheaderbase.h
+epoc32/include/mw/sipauthorizationheader.h
+epoc32/include/mw/sipauthorizationheaderbase.h
+epoc32/include/mw/sipcallidheader.h
+epoc32/include/mw/sipclientresolverconfigcrkeys.h
+epoc32/include/mw/sipclienttransaction.h
+epoc32/include/mw/sipcodecerr.h
+epoc32/include/mw/sipconcreteprofileobserver.h
+epoc32/include/mw/sipconnection.h
+epoc32/include/mw/sipconnectionobserver.h
+epoc32/include/mw/sipconnpref.h
+epoc32/include/mw/sipconnpref.inl
+epoc32/include/mw/sipcontactheader.h
+epoc32/include/mw/sipcontentdispositionheader.h
+epoc32/include/mw/sipcontentencodingheader.h
+epoc32/include/mw/sipcontenttypeheader.h
+epoc32/include/mw/sipcseqheader.h
+epoc32/include/mw/sipdefs.h
+epoc32/include/mw/sipdialog.h
+epoc32/include/mw/sipdialogassocbase.h
+epoc32/include/mw/siperr.h
+epoc32/include/mw/sipeventheader.h
+epoc32/include/mw/sipexpiresheader.h
+epoc32/include/mw/sipextensionheader.h
+epoc32/include/mw/sipfromheader.h
+epoc32/include/mw/sipfromtoheaderbase.h
+epoc32/include/mw/sipheaderbase.h
+epoc32/include/mw/siphlerr.h
+epoc32/include/mw/siphttpdigest.h
+epoc32/include/mw/siphttpdigestchallengeobserver.h
+epoc32/include/mw/siphttpdigestchallengeobserver2.h
+epoc32/include/mw/sipinvitedialogassoc.h
+epoc32/include/mw/sipmanagedprofile.h
+epoc32/include/mw/sipmanagedprofileregistry.h
+epoc32/include/mw/sipmessageelements.h
+epoc32/include/mw/sipnotifydialogassoc.h
+epoc32/include/mw/sipobserver.h
+epoc32/include/mw/sipparameterheaderbase.h
+epoc32/include/mw/sippassociateduriheader.h
+epoc32/include/mw/sipprofile.h
+epoc32/include/mw/sipprofilealrcontroller.h
+epoc32/include/mw/sipprofilealrobserver.h
+epoc32/include/mw/sipprofileregistry.h
+epoc32/include/mw/sipprofileregistrybase.h
+epoc32/include/mw/sipprofileregistryobserver.h
+epoc32/include/mw/sipprofileservercrkeys.h
+epoc32/include/mw/sipprofiletypeinfo.h
+epoc32/include/mw/sipproxyauthenticateheader.h
+epoc32/include/mw/sipproxyauthorizationheader.h
+epoc32/include/mw/sipproxyrequireheader.h
+epoc32/include/mw/siprackheader.h
+epoc32/include/mw/sipreferdialogassoc.h
+epoc32/include/mw/siprefertoheader.h
+epoc32/include/mw/siprefresh.h
+epoc32/include/mw/sipregistrationbinding.h
+epoc32/include/mw/sipregistrationcontext.h
+epoc32/include/mw/sipreplytoheader.h
+epoc32/include/mw/siprequestelements.h
+epoc32/include/mw/siprequireheader.h
+epoc32/include/mw/sipresolvedclient.h
+epoc32/include/mw/sipresolvedclient2.h
+epoc32/include/mw/sipresponseelements.h
+epoc32/include/mw/sipretryafterheader.h
+epoc32/include/mw/siprouteheader.h
+epoc32/include/mw/siprouteheaderbase.h
+epoc32/include/mw/siprseqheader.h
+epoc32/include/mw/sipsdkcrkeys.h
+epoc32/include/mw/sipsecurityclientheader.h
+epoc32/include/mw/sipsecurityheaderbase.h
+epoc32/include/mw/sipservertransaction.h
+epoc32/include/mw/sipstrings.h
+epoc32/include/mw/sipsubscribedialogassoc.h
+epoc32/include/mw/sipsubscriptionstateheader.h
+epoc32/include/mw/sipsupportedheader.h
+epoc32/include/mw/siptimestampheader.h
+epoc32/include/mw/siptoheader.h
+epoc32/include/mw/siptokenheaderbase.h
+epoc32/include/mw/siptransactionbase.h
+epoc32/include/mw/sipunsignedintheaderbase.h
+epoc32/include/mw/sipunsupportedheader.h
+epoc32/include/mw/sipwwwauthenticateheader.h
+epoc32/include/mw/spriteanimation.h
 epoc32/include/mw/startupitem.hrh
 epoc32/include/mw/startupitem.rh
+epoc32/include/mw/swi/pkgremover.h
+epoc32/include/mw/swi/pkgremovererrors.h
+epoc32/include/mw/telsess.h
 epoc32/include/mw/thirdpartybitmap.pal
+epoc32/include/mw/thttpfields.h
+epoc32/include/mw/tldlistdef.h
+epoc32/include/mw/tmsvsystemprogress.h
 epoc32/include/mw/touchfeedback.h
 epoc32/include/mw/touchfeedbackspec.h
 epoc32/include/mw/touchlogicalfeedback.h
+epoc32/include/mw/tsendasclientpanic.h
+epoc32/include/mw/tsendasmessagetypefilter.h
 epoc32/include/mw/tsendingcapabilities.h
 epoc32/include/mw/tsendingcapabilities.inl
-epoc32/include/mwappluginsp.h
-epoc32/include/mwbxmlconverterobserver.h
-epoc32/include/nd_err.h
-epoc32/include/netconerror.h
+epoc32/include/mw/tuladdressstringtokenizer.h
+epoc32/include/mw/tulpanics.h
+epoc32/include/mw/tulphonenumberutils.h
+epoc32/include/mw/tulstringresourcereader.h
+epoc32/include/mw/tultextresourceutils.h
+epoc32/include/mw/tz.h
+epoc32/include/mw/tzconverter.h
+epoc32/include/mw/tzdefines.h
+epoc32/include/mw/tzid.h
+epoc32/include/mw/tzid.inl
+epoc32/include/mw/tzlocalizationdatatypes.h
+epoc32/include/mw/tzlocalizationdatatypes.inl
+epoc32/include/mw/tzlocalizedcityrecord.inl
+epoc32/include/mw/tzlocalizer.h
+epoc32/include/mw/tzupdate.h
+epoc32/include/mw/uikon/eikalsrv.h
+epoc32/include/mw/viewcli.h
+epoc32/include/mw/vtzrules.h
+epoc32/include/mw/vwsdef.h
+epoc32/include/mw/wapattrdf.h
+epoc32/include/mw/wapengstd.h
+epoc32/include/mw/waplog.h
+epoc32/include/mw/wappdef.h
+epoc32/include/mw/waptestutils.h
+epoc32/include/mw/wbconverter.h
+epoc32/include/mw/wsp/wsptypes.h
+epoc32/include/mw/xmlelemt.h
+epoc32/include/mw/xmllib.h
 epoc32/include/networkemulator/cnetworkemulatorsetupcommdb.h
 epoc32/include/networkemulator/cprotocoltypes.h
 epoc32/include/networkemulator/cuccsdevicecontrol.h
@@ -1994,164 +1970,61 @@
 epoc32/include/networkemulator/networkemulatorcontrol.h
 epoc32/include/networkemulator/uccs_errorcodes.h
 epoc32/include/networking/dnd_err.h
-epoc32/include/networking/packetlogger.h
 epoc32/include/networking/qos3gpp_subconparams.h
 epoc32/include/networking/qos3gpp_subconparams.inl
-epoc32/include/networking/vj.inl
-epoc32/include/networking/vjcomp.inl
 epoc32/include/nifman.h
 epoc32/include/nifvar.h
-epoc32/include/nkernsmp/arm/arm_gic.h
-epoc32/include/nkernsmp/arm/arm_scu.h
-epoc32/include/nkernsmp/arm/arm_tmr.h
-epoc32/include/nkernsmp/x86/apic.h
 epoc32/include/non_foundation_paths.hrh
 epoc32/include/numberconversion.h
-epoc32/include/obex.h
-epoc32/include/obex/internal/obextransportconstants.h
-epoc32/include/obexbase.h
-epoc32/include/obexbaseobject.h
-epoc32/include/obexbttransportinfo.h
-epoc32/include/obexclient.h
-epoc32/include/obexclientmtm.h
-epoc32/include/obexconstants.h
-epoc32/include/obexfinalpacketobserver.h
-epoc32/include/obexheader.h
-epoc32/include/obexheaderlist.h
-epoc32/include/obexheaders.h
-epoc32/include/obexinternalutils.h
-epoc32/include/obexirtransportinfo.h
-epoc32/include/obexobjects.h
-epoc32/include/obexpanics.h
-epoc32/include/obexsendop.h
-epoc32/include/obexserver.h
-epoc32/include/obexservermtm.h
-epoc32/include/obextransportinfo.h
-epoc32/include/obextypes.h
-epoc32/include/obexusbtransportinfo.h
-epoc32/include/offop.h
-epoc32/include/offop.inl
 epoc32/include/openfont.h
 epoc32/include/openfontlinkedtypefaceelementspec.h
-epoc32/include/openmax/il/core/omxilloaderif.inl
 epoc32/include/orientationbase.h
 epoc32/include/orientationdata.h
 epoc32/include/padding.h
 epoc32/include/palette.h
 epoc32/include/panerr.h
 epoc32/include/panorama/panorama.h
-epoc32/include/panprog.h
-epoc32/include/partitions.h
 epoc32/include/pathconfiguration.hrh
 epoc32/include/pathinfo.h
+epoc32/include/pcstore/uid.h
 epoc32/include/pdrport.h
 epoc32/include/pdrrecrd.h
 epoc32/include/pdrstore.h
-epoc32/include/phbksync.h
-epoc32/include/pkcs10attr.h
 epoc32/include/pkixcertchain.h
 epoc32/include/pkixvalidationresult.h
-epoc32/include/platform/mw/aknlayout.lag
-epoc32/include/platform/mw/loc/sc/drmcommon.loc
 epoc32/include/platform_paths.hrh
 epoc32/include/platformstaticfeatures.hrh
-epoc32/include/playerinformationtarget.h
-epoc32/include/playerinformationtargetobserver.h
 epoc32/include/plpsess.inl
 epoc32/include/pls.h
-epoc32/include/pnp/pnp.h
 epoc32/include/pointerevent.h
-epoc32/include/pop3cmds.h
-epoc32/include/pop3set.h
-epoc32/include/popcmtm.h
-epoc32/include/power.h
-epoc32/include/pragmamessage.h
 epoc32/include/privateruntimeids.hrh
 epoc32/include/privatestaticfeatures.hrh
-epoc32/include/prninf.h
-epoc32/include/prnprev.h
-epoc32/include/prnsetup.h
-epoc32/include/prnuids.h
 epoc32/include/productvariant.hrh
 epoc32/include/publicruntimeids.hrh
 epoc32/include/publicstaticfeatures.hrh
 epoc32/include/punycodeconverter.h
-epoc32/include/push/ccontenthandlerbase.h
-epoc32/include/push/ccontenthandlerbase.inl
-epoc32/include/push/cpushhandlerbase.h
-epoc32/include/push/cpushhandlerbase.inl
-epoc32/include/push/cwappushmsgutils.inl
-epoc32/include/push/pluginkiller.h
-epoc32/include/push/pushlog.h
-epoc32/include/push/pushmessage.h
-epoc32/include/push/unknownmimedefs.h
-epoc32/include/pushentry.h
-epoc32/include/pushentry.inl
 epoc32/include/random.h
-epoc32/include/record.h
-epoc32/include/redircli.h
-epoc32/include/redirstr.h
-epoc32/include/regpsdll.h
-epoc32/include/regpsdll.inl
-epoc32/include/remcon/clienttype.h
-epoc32/include/remcon/messagetype.h
 epoc32/include/remcon/playertype.h
-epoc32/include/remcon/remconextapi1.h
-epoc32/include/remcon/remconinterfacebase.h
 epoc32/include/remcon/remconinterfacefeatures.h
-epoc32/include/remcon/remconinterfaceif.h
 epoc32/include/remconabsvolcontroller.h
 epoc32/include/remconabsvolcontrollerobserver.h
 epoc32/include/remconabsvoltarget.h
 epoc32/include/remconabsvoltargetobserver.h
 epoc32/include/remconaddress.h
-epoc32/include/remconbatterytarget.h
-epoc32/include/remconbatterytargetobserver.h
 epoc32/include/remconcoreapi.h
 epoc32/include/remconcoreapicontroller.h
 epoc32/include/remconcoreapicontrollerobserver.h
 epoc32/include/remconcoreapitarget.h
 epoc32/include/remconcoreapitargetobserver.h
-epoc32/include/remcondatabaseawaremediabrowsetarget.h
-epoc32/include/remcondatabaseawaremedialibrarybrowse.h
-epoc32/include/remcondatabaseawaremedialibrarybrowseobserver.h
-epoc32/include/remcondatabaseawarenowplayingbrowse.h
-epoc32/include/remcondatabaseawarenowplayingbrowseobserver.h
-epoc32/include/remcondatabaseawarenowplayingtarget.h
-epoc32/include/remcondatabaseawarenowplayingtargetobserver.h
-epoc32/include/remcondatabaseunawaremediabrowsetarget.h
-epoc32/include/remcondatabaseunawaremedialibrarybrowse.h
-epoc32/include/remcondatabaseunawaremedialibrarybrowseobserver.h
-epoc32/include/remcondatabaseunawarenowplayingbrowse.h
-epoc32/include/remcondatabaseunawarenowplayingbrowseobserver.h
-epoc32/include/remcondatabaseunawarenowplayingtarget.h
-epoc32/include/remcondatabaseunawarenowplayingtargetobserver.h
 epoc32/include/remconerrorobserver.h
-epoc32/include/remcongroupnavigationtarget.h
-epoc32/include/remcongroupnavigationtargetobserver.h
 epoc32/include/remconinterfaceselector.h
-epoc32/include/remconmediaattributeid.h
-epoc32/include/remconmediabrowsepanic.h
-epoc32/include/remconmediabrowsetypes.h
-epoc32/include/remconmediaerror.h
-epoc32/include/remconmediainformationtarget.h
-epoc32/include/remconmediainformationtargetobserver.h
 epoc32/include/remconserverpanic.h
-epoc32/include/remconstatusapicontroller.h
-epoc32/include/remconstatusapicontrollerobserver.h
 epoc32/include/remcontrackinfocontroller.h
 epoc32/include/remcontrackinfocontrollerobserver.h
 epoc32/include/remcontrackinfotarget.h
 epoc32/include/remcontrackinfotargetobserver.h
 epoc32/include/roomlevelbase.h
 epoc32/include/roomleveldata.h
-epoc32/include/rscommon.inl
-epoc32/include/rsendas.h
-epoc32/include/rsendasmessage.h
-epoc32/include/rsstd.inl
-epoc32/include/rtcp.h
-epoc32/include/rtp.h
-epoc32/include/rtp.inl
 epoc32/include/rvct/rvct.h
 epoc32/include/s32btree.h
 epoc32/include/s32btree.inl
@@ -2159,7 +2032,6 @@
 epoc32/include/s32buf.inl
 epoc32/include/s32cont.h
 epoc32/include/s32cont.inl
-epoc32/include/s32crypt.inl
 epoc32/include/s32file.h
 epoc32/include/s32file.inl
 epoc32/include/s32mem.h
@@ -2176,41 +2048,17 @@
 epoc32/include/s32strm.inl
 epoc32/include/s32ucmp.h
 epoc32/include/sacls.h
-epoc32/include/savenotf.h
-epoc32/include/savepriv.h
 epoc32/include/sbque.h
-epoc32/include/schedulebaseservermtm.h
 epoc32/include/schinfo.h
 epoc32/include/schsend.hrh
-epoc32/include/schsend.rh
 epoc32/include/schtask.h
 epoc32/include/schtime.h
-epoc32/include/scmbytestreamutil.inl
-epoc32/include/scmtrace.h
-epoc32/include/scs/cleanuputils.inl
-epoc32/include/sdpattributefield.h
-epoc32/include/sdpbandwidthfield.h
-epoc32/include/sdpcodecconstants.h
-epoc32/include/sdpcodecerr.h
 epoc32/include/sdpcodecstringconstants.h
-epoc32/include/sdpcodecstringpool.h
-epoc32/include/sdpconnectionfield.h
-epoc32/include/sdpdocument.h
-epoc32/include/sdpfmtattributefield.h
-epoc32/include/sdpkeyfield.h
-epoc32/include/sdpmediafield.h
-epoc32/include/sdporiginfield.h
-epoc32/include/sdprepeatfield.h
-epoc32/include/sdprtpmapvalue.h
-epoc32/include/sdptimefield.h
-epoc32/include/sdptypedtime.h
 epoc32/include/securesocket.h
 epoc32/include/securesocketinterface.h
 epoc32/include/securitydefs.h
 epoc32/include/securitydefs.inl
 epoc32/include/securityerr.h
-epoc32/include/sendas2.h
-epoc32/include/sendasserver.rh
 epoc32/include/sensordatacompensationtypes.h
 epoc32/include/sensordatacompensator.h
 epoc32/include/sensrvaccelerometersensor.h
@@ -2235,119 +2083,11 @@
 epoc32/include/shapeinfo.h
 epoc32/include/shiftjis.h
 epoc32/include/signed.h
-epoc32/include/sip.h
-epoc32/include/sip_subconevents.h
-epoc32/include/sip_subconevents.inl
-epoc32/include/sip_subconparams.h
-epoc32/include/sip_subconparams.inl
-epoc32/include/sipacceptcontactheader.h
-epoc32/include/sipacceptencodingheader.h
-epoc32/include/sipacceptheader.h
-epoc32/include/sipacceptlanguageheader.h
-epoc32/include/sipaccessnetworkinfo.inl
-epoc32/include/sipaddress.h
-epoc32/include/sipaddressheaderbase.h
-epoc32/include/sipalloweventsheader.h
-epoc32/include/sipallowheader.h
-epoc32/include/sipauthenticateheaderbase.h
-epoc32/include/sipauthheaderbase.h
-epoc32/include/sipauthorizationheader.h
-epoc32/include/sipauthorizationheaderbase.h
-epoc32/include/sipbearermonitor.inl
-epoc32/include/sipcallidheader.h
-epoc32/include/sipclientresolverconfigcrkeys.h
-epoc32/include/sipclienttransaction.h
-epoc32/include/sipcodecerr.h
-epoc32/include/sipconcreteprofileobserver.h
-epoc32/include/sipconnection.h
-epoc32/include/sipconnectionobserver.h
-epoc32/include/sipconnpref.h
-epoc32/include/sipconnpref.inl
-epoc32/include/sipcontactheader.h
-epoc32/include/sipcontentdispositionheader.h
-epoc32/include/sipcontentencodingheader.h
-epoc32/include/sipcontenttypeheader.h
-epoc32/include/sipcseqheader.h
-epoc32/include/sipdefs.h
-epoc32/include/sipdialog.h
-epoc32/include/sipdialogassocbase.h
-epoc32/include/siperr.h
-epoc32/include/sipeventheader.h
-epoc32/include/sipexpiresheader.h
-epoc32/include/sipextensionheader.h
-epoc32/include/sipfromheader.h
-epoc32/include/sipfromtoheaderbase.h
-epoc32/include/sipheaderbase.h
-epoc32/include/siphlerr.h
-epoc32/include/siphttpdigest.h
-epoc32/include/siphttpdigestchallengeobserver.h
-epoc32/include/siphttpdigestchallengeobserver2.h
-epoc32/include/sipinvitedialogassoc.h
-epoc32/include/sipmanagedprofile.h
-epoc32/include/sipmanagedprofileregistry.h
-epoc32/include/sipmessageelements.h
-epoc32/include/sipnattraversalcontroller.inl
-epoc32/include/sipnattraversalcontrollerinitparams.inl
-epoc32/include/sipnotifydialogassoc.h
-epoc32/include/sipobserver.h
-epoc32/include/sipparameterheaderbase.h
-epoc32/include/sippassociateduriheader.h
-epoc32/include/sipprofile.h
-epoc32/include/sipprofileagent.inl
-epoc32/include/sipprofileagentinitparams.inl
-epoc32/include/sipprofilealrcontroller.h
-epoc32/include/sipprofilealrobserver.h
-epoc32/include/sipprofileregistry.h
-epoc32/include/sipprofileregistrybase.h
-epoc32/include/sipprofileregistryobserver.h
-epoc32/include/sipprofileservercrkeys.h
-epoc32/include/sipprofiletypeinfo.h
-epoc32/include/sipproxyauthenticateheader.h
-epoc32/include/sipproxyauthorizationheader.h
-epoc32/include/sipproxyrequireheader.h
-epoc32/include/siprackheader.h
-epoc32/include/sipreferdialogassoc.h
-epoc32/include/siprefertoheader.h
-epoc32/include/siprefresh.h
-epoc32/include/sipregistrationbinding.h
-epoc32/include/sipregistrationcontext.h
-epoc32/include/sipreplytoheader.h
-epoc32/include/siprequestelements.h
-epoc32/include/siprequireheader.h
-epoc32/include/sipresolvedclient.h
-epoc32/include/sipresolvedclient.inl
-epoc32/include/sipresolvedclient2.h
-epoc32/include/sipresolvedclient2.inl
-epoc32/include/sipresponseelements.h
-epoc32/include/sipretryafterheader.h
-epoc32/include/siprouteheader.h
-epoc32/include/siprouteheaderbase.h
-epoc32/include/siprseqheader.h
-epoc32/include/sipsdkcrkeys.h
-epoc32/include/sipsecurityclientheader.h
-epoc32/include/sipsecurityheaderbase.h
-epoc32/include/sipservertransaction.h
 epoc32/include/sipstrconsts.h
-epoc32/include/sipstrings.h
-epoc32/include/sipsubscribedialogassoc.h
-epoc32/include/sipsubscriptionstateheader.h
-epoc32/include/sipsupportedheader.h
-epoc32/include/sipsystemstatemonitor.inl
-epoc32/include/siptimestampheader.h
-epoc32/include/siptoheader.h
-epoc32/include/siptokenheaderbase.h
-epoc32/include/siptransactionbase.h
-epoc32/include/sipunsignedintheaderbase.h
-epoc32/include/sipunsupportedheader.h
-epoc32/include/sipwwwauthenticateheader.h
 epoc32/include/sizemode.h
-epoc32/include/smcmmain.h
 epoc32/include/smilattributes.h
 epoc32/include/smilelements.h
 epoc32/include/smilgenericelements.h
-epoc32/include/smsclnt.h
-epoc32/include/smsclnt.inl
-epoc32/include/smscmds.h
 epoc32/include/smss.hrh
 epoc32/include/smsuact.h
 epoc32/include/smsuaddr.h
@@ -2357,34 +2097,18 @@
 epoc32/include/smsuset.inl
 epoc32/include/smsustrm.h
 epoc32/include/smsustrm.inl
-epoc32/include/smtcmtm.h
-epoc32/include/smtpcmds.h
-epoc32/include/smtpset.h
-epoc32/include/smut.h
-epoc32/include/smuthdr.h
-epoc32/include/smuthdr.inl
-epoc32/include/smutset.h
-epoc32/include/smutset.inl
-epoc32/include/smutsimparam.h
 epoc32/include/sourcedopplerbase.h
 epoc32/include/sourcelocationbase.h
 epoc32/include/sourceorientationbase.h
 epoc32/include/speechrecognitionuids.hrh
 epoc32/include/speechrecognitionutility.h
 epoc32/include/speechrecognitionutilityobserver.h
-epoc32/include/spriteanimation.h
 epoc32/include/spriteanimationclient.h
 epoc32/include/sqldb.h
-epoc32/include/ss_std.inl
 epoc32/include/ssl.h
 epoc32/include/ssl_compatibility.h
 epoc32/include/sslerr.h
-epoc32/include/ssm/clayerdlldatadefs.rh
 epoc32/include/ssm/clayerswp.hrh
-epoc32/include/ssm/ssmcmdconditions.rh
-epoc32/include/ssm/ssmgracefulshutdown_patch.h
-epoc32/include/ssm/startandretrynotifications.h
-epoc32/include/startupdomaindefs.h
 epoc32/include/stdapis/_ctype.h
 epoc32/include/stdapis/arpa/nameser_compat.h
 epoc32/include/stdapis/boost/aligned_storage.hpp
@@ -2497,10 +2221,10 @@
 epoc32/include/stdapis/boost/function/detail/function_iterate.hpp
 epoc32/include/stdapis/boost/function/detail/maybe_include.hpp
 epoc32/include/stdapis/boost/function/detail/prologue.hpp
+epoc32/include/stdapis/boost/function/function_base.hpp
+epoc32/include/stdapis/boost/function/function_template.hpp
 epoc32/include/stdapis/boost/function/function2.hpp
 epoc32/include/stdapis/boost/function/function3.hpp
-epoc32/include/stdapis/boost/function/function_base.hpp
-epoc32/include/stdapis/boost/function/function_template.hpp
 epoc32/include/stdapis/boost/function_equal.hpp
 epoc32/include/stdapis/boost/functional.hpp
 epoc32/include/stdapis/boost/functional/detail/container_fwd.hpp
@@ -3311,15 +3035,16 @@
 epoc32/include/stdapis/boost/visit_each.hpp
 epoc32/include/stdapis/boost/weak_ptr.hpp
 epoc32/include/stdapis/crypt.h
+epoc32/include/stdapis/dbus-1.0/dbus/dbus.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-address.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-arch-deps.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-bus.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-connection.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-errors.h
+epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-bindings.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-error-enum.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib-lowlevel.h
-epoc32/include/stdapis/dbus-1.0/dbus/dbus-glib.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-gtype-specialized.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-macros.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-memory.h
@@ -3332,14 +3057,12 @@
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-signature.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-threads.h
 epoc32/include/stdapis/dbus-1.0/dbus/dbus-types.h
-epoc32/include/stdapis/dbus-1.0/dbus/dbus.h
 epoc32/include/stdapis/dlfcn.h
 epoc32/include/stdapis/err.h
 epoc32/include/stdapis/fenv.h
 epoc32/include/stdapis/float.h
 epoc32/include/stdapis/ftw.h
 epoc32/include/stdapis/getopt.h
-epoc32/include/stdapis/glib-2.0/glib-object.h
 epoc32/include/stdapis/glib-2.0/glib.h
 epoc32/include/stdapis/glib-2.0/glib/galloca.h
 epoc32/include/stdapis/glib-2.0/glib/garray.h
@@ -3356,8 +3079,8 @@
 epoc32/include/stdapis/glib-2.0/glib/gfileutils.h
 epoc32/include/stdapis/glib-2.0/glib/ghash.h
 epoc32/include/stdapis/glib-2.0/glib/ghook.h
+epoc32/include/stdapis/glib-2.0/glib/gi18n.h
 epoc32/include/stdapis/glib-2.0/glib/gi18n-lib.h
-epoc32/include/stdapis/glib-2.0/glib/gi18n.h
 epoc32/include/stdapis/glib-2.0/glib/giochannel.h
 epoc32/include/stdapis/glib-2.0/glib/gkeyfile.h
 epoc32/include/stdapis/glib-2.0/glib/glist.h
@@ -3395,6 +3118,7 @@
 epoc32/include/stdapis/glib-2.0/glib/gwin32.h
 epoc32/include/stdapis/glib-2.0/glib_global.h
 epoc32/include/stdapis/glib-2.0/glibconfig.h
+epoc32/include/stdapis/glib-2.0/glib-object.h
 epoc32/include/stdapis/glib-2.0/glowmem.h
 epoc32/include/stdapis/glib-2.0/gmodule.h
 epoc32/include/stdapis/glib-2.0/gobject/gboxed.h
@@ -3801,13 +3525,9 @@
 epoc32/include/stringloader.h
 epoc32/include/stringpool.h
 epoc32/include/stringpool.inl
-epoc32/include/stringpoolerr.h
-epoc32/include/stringtablesupport.h
 epoc32/include/strng.h
 epoc32/include/strng.inl
 epoc32/include/swap.h
-epoc32/include/swi/pkgremover.h
-epoc32/include/swi/pkgremovererrors.h
 epoc32/include/symcpp.h
 epoc32/include/syncmlalertinfo.h
 epoc32/include/syncmlclient.h
@@ -3826,7 +3546,6 @@
 epoc32/include/tcp_hdr.h
 epoc32/include/tcpseq.h
 epoc32/include/telephony.inl
-epoc32/include/telsess.h
 epoc32/include/test/datawrapper.inl
 epoc32/include/test/fileservplugin.h
 epoc32/include/test/rfileloggermacro.h
@@ -3839,14 +3558,9 @@
 epoc32/include/textcursor.h
 epoc32/include/textresolver.h
 epoc32/include/textresolver.hrh
-epoc32/include/thttpfields.h
 epoc32/include/tia637.h
 epoc32/include/tinternetdate.h
-epoc32/include/tldlistdef.h
-epoc32/include/tmsvsystemprogress.h
-epoc32/include/tnonoperationmtmdata.h
 epoc32/include/tools/certapp-api.h
-epoc32/include/tools/elfdefs.h
 epoc32/include/tools/stlport/rlocks.h
 epoc32/include/tools/stlport/stl/_alloc_old.h
 epoc32/include/tools/stlport/stl/_sparc_atomic.h
@@ -3895,59 +3609,26 @@
 epoc32/include/tools/stlport/stl/pointers/_tools.h
 epoc32/include/tools/stlport/using/export
 epoc32/include/tranp.h
-epoc32/include/tsendasclientpanic.h
-epoc32/include/tsendasmessagetypefilter.h
 epoc32/include/tsy.hrh
 epoc32/include/tsy.rh
-epoc32/include/tuladdressstringtokenizer.h
-epoc32/include/tulpanics.h
-epoc32/include/tulphonenumberutils.h
-epoc32/include/tulstringresourcereader.h
-epoc32/include/tultextresourceutils.h
 epoc32/include/txtetext.h
 epoc32/include/txtetext.inl
 epoc32/include/txtfmlyr.h
 epoc32/include/txtfmlyr.inl
-epoc32/include/txtfmstm.h
 epoc32/include/txtfrmat.h
 epoc32/include/txtfrmat.inl
 epoc32/include/txtglobl.h
 epoc32/include/txtglobl.inl
 epoc32/include/txtlaydc.h
 epoc32/include/txtmfmtx.h
-epoc32/include/txtmrtsr.h
 epoc32/include/txtrich.h
 epoc32/include/txtrich.inl
 epoc32/include/txtstyle.h
 epoc32/include/txtstyle.inl
-epoc32/include/txtuids.h
 epoc32/include/typerel.h
-epoc32/include/tz.h
-epoc32/include/tzconverter.h
-epoc32/include/tzdefines.h
-epoc32/include/tzid.h
-epoc32/include/tzid.inl
-epoc32/include/tzlocalizationdatatypes.h
-epoc32/include/tzlocalizationdatatypes.inl
-epoc32/include/tzlocalizedcityrecord.inl
-epoc32/include/tzlocalizedtimezonerecord.inl
-epoc32/include/tzlocalizer.h
-epoc32/include/tzupdate.h
 epoc32/include/udp_hdr.h
-epoc32/include/uid.h
-epoc32/include/uiklaf/private/lafappui.h
-epoc32/include/uiklaf/private/lafenv.h
-epoc32/include/uiklaf/private/lafmsg.h
-epoc32/include/uiklaf/private/lafnotcap.h
-epoc32/include/uiklaf/private/lafspane.h
-epoc32/include/uiklaf/private/lafsrv.h
-epoc32/include/uiklaf/private/lafvcurs.h
 epoc32/include/uikon.hrh
 epoc32/include/uikon.rh
-epoc32/include/uikon/eikalsrv.h
-epoc32/include/uikon/eikalsup.h
-epoc32/include/uikon/eiknfysv.h
-epoc32/include/uikon/eiksvfty.h
 epoc32/include/unified_editor.h
 epoc32/include/unifiedcertstore.h
 epoc32/include/ups/ups.hrh
@@ -3962,53 +3643,23 @@
 epoc32/include/uriutilscommon.h
 epoc32/include/utf.h
 epoc32/include/variant/symbian_os.hrh
-epoc32/include/vcal.h
-epoc32/include/vcal.inl
-epoc32/include/vcard.h
-epoc32/include/vcard.inl
 epoc32/include/versioninfo.h
 epoc32/include/versioninfo.inl
-epoc32/include/versit.h
-epoc32/include/versit.inl
-epoc32/include/versittls.h
 epoc32/include/vg/1.0/openvg.h
 epoc32/include/vg/1.0/vgu.h
 epoc32/include/videoplayer.h
 epoc32/include/videorecorder.h
-epoc32/include/viewcli.h
-epoc32/include/vobserv.h
-epoc32/include/vprop.h
-epoc32/include/vprop.inl
-epoc32/include/vrecur.h
-epoc32/include/vrecur.inl
-epoc32/include/vstaticutils.h
-epoc32/include/vtoken.h
-epoc32/include/vtzrules.h
-epoc32/include/vuid.h
-epoc32/include/vutil.h
-epoc32/include/vwsappst.h
-epoc32/include/vwsdef.h
 epoc32/include/w32adll.h
 epoc32/include/w32click.h
 epoc32/include/w32std.h
 epoc32/include/w32stdgraphic.h
 epoc32/include/wap_sock.h
-epoc32/include/wapattrdf.h
-epoc32/include/wapengstd.h
-epoc32/include/waplog.h
 epoc32/include/wapmessage.h
 epoc32/include/wapmsgerr.h
-epoc32/include/wappdef.h
-epoc32/include/waptestutils.h
-epoc32/include/waptestutils.inl
-epoc32/include/wbconverter.h
 epoc32/include/wf/wfc.h
 epoc32/include/wf/wfcext.h
 epoc32/include/wf/wfcplatform.h
-epoc32/include/wins/winscomm.h
-epoc32/include/wins/winscomm.inl
 epoc32/include/wlansdkpskeys.h
-epoc32/include/wsp/wsptypes.h
 epoc32/include/wspdecoder.h
 epoc32/include/wspencoder.h
 epoc32/include/wtlscert.h
@@ -4023,10 +3674,7 @@
 epoc32/include/x509keys.h
 epoc32/include/x520ava.h
 epoc32/include/xml/contenthandler.h
-epoc32/include/xml/contentprocessor.h
 epoc32/include/xml/contentprocessoruids.h
-epoc32/include/xml/contentsource.h
-epoc32/include/xml/documentparameters.h
 epoc32/include/xml/dom/xmlengattr.h
 epoc32/include/xml/dom/xmlengattr.inl
 epoc32/include/xml/dom/xmlengbinarycontainer.h
@@ -4077,30 +3725,16 @@
 epoc32/include/xml/dom/xmlengxpathexpression.inl
 epoc32/include/xml/dom/xmlengxpathresult.inl
 epoc32/include/xml/dom/xmlengxpathutils.inl
-epoc32/include/xml/extension.h
 epoc32/include/xml/matchdata.h
 epoc32/include/xml/parser.h
 epoc32/include/xml/parserfeature.h
-epoc32/include/xml/plugins/charsetconverter.h
-epoc32/include/xml/plugins/contentprocessorinitparams.h
-epoc32/include/xml/plugins/dictionarycodepage.h
-epoc32/include/xml/plugins/elementstack.h
-epoc32/include/xml/plugins/parserinitparams.h
-epoc32/include/xml/plugins/parserinterface.h
-epoc32/include/xml/plugins/stringdictionary.h
 epoc32/include/xml/stringdictionarycollection.h
 epoc32/include/xml/taginfo.h
-epoc32/include/xml/utils/xmlengxestrings.inl
 epoc32/include/xml/wbxmlextensionhandler.h
-epoc32/include/xml/wbxmlparsererrors.h
-epoc32/include/xml/xmlframeworkconstants.h
 epoc32/include/xml/xmlframeworkerrors.h
-epoc32/include/xml/xmlparsererrors.h
-epoc32/include/xmlelemt.h
 epoc32/include/xmlentityreferences.h
-epoc32/include/xmllib.h
 epoc32/include/ziparchive.h
 epoc32/include/zipfile.h
 epoc32/include/zipfilemember.h
 epoc32/include/zipfilememberinputstream.h
-epoc32/include/zipfilememberiterator.h
+epoc32/include/zipfilememberiterator.h
\ No newline at end of file

--- a/symbian3/single/job_props.ant.xml	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian3/single/job_props.ant.xml	Wed Mar 24 15:26:03 2010 +0000
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
 
-    <property name="sf.previous.pdk.tag" value="PDK_3.0.f" />
+    <property name="sf.previous.pdk.tag" value="PDK_3.0.g" />
 
     <property name="sf.spec.job.name" value="symbian3"/>
     <property name="sf.spec.corebuildversion" value="week37"/>
@@ -24,7 +24,7 @@
     <property name="sf.spec.bldmefirst.s60.variant" value="western" /> <!-- western|apac|japan but only western is used at the moment -->
     <property name="sf.spec.bldmefirst.s60.config.root" value="sf/os/deviceplatformrelease/sf_config/config" />
     <property name="sf.spec.bldmefirst.s60.sbs.variant.cfg" value="${sf.spec.bldmefirst.s60.config.root}/inc/variant.cfg" /> <!-- currently needed for touching -->
-    <property name="sf.spec.bldmefirst.s60.exports" value="${sf.spec.bldmefirst.s60.config.root}/${sf.spec.bldmefirst.s60.variant}/group,${sf.spec.bldmefirst.s60.config.root}/group,sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group,sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group,sf/os/devicesrv/commonservices/commonengine/group,sf/mw/web/web_plat/browser_platform_api/group,sf/tools/homescreentools/dtdinstaller/group"/>
+    <property name="sf.spec.bldmefirst.s60.exports" value="${sf.spec.bldmefirst.s60.config.root}/${sf.spec.bldmefirst.s60.variant}/group,${sf.spec.bldmefirst.s60.config.root}/group,sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group,sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group,sf/os/devicesrv/commonservices/commonengine/group,sf/mw/web/web_plat/browser_platform_api/group,sf/app/homescreentools/dtdinstaller/group"/>
     
     <!-- To sync the tools instead of building them, change sf.spec.sbs.tools.config to tools2_rel.whatlog  -->
     <!-- check that sf.spec.baseline.getenv_options includes 'tools'                                        -->
@@ -32,7 +32,7 @@
 
     <!-- get full source env and binaries from pdk -->
     <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
-    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.1_patched_s3_evalid" /> <!-- for TEF etc -->
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.6" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />

--- a/symbian3/single/sources.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian3/single/sources.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sources_3.0.h.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -0,0 +1,120 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,changeset,2c9e0f9990c0,
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,changeset,78fc0271e9a7,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,changeset,5c9ca1e17dbb,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,changeset,d179868647e4,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,changeset,afb66031ac23,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,changeset,bc65ca6d8d9c,
+//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,changeset,3308607f8c27,
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,08c4f946d508,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,dbec5787fa68,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,e1b6206813b4,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,cc5042a680fb,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,changeset,04ab22b956c2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,ad0f53516d84,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,changeset,f5911524345e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,db6d61d7814f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,changeset,1b41880e7c31,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,changeset,1e73d2d04cbc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,changeset,e6e7e3ee283d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,changeset,d06b1526f62c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,changeset,f966699dea19,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,changeset,d96c135bc497,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,changeset,edfc90759b9f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,changeset,fc8c25e5a2e8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,changeset,014f8c42e1d4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,changeset,3c271c9e6618,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,changeset,1d7827e39b52,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,c47a75a8cd72,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,13afc0e517bd,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/organizer/,/sf/app/organizer,changeset,273b50e1bc69,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,changeset,485080d5cb63,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,changeset,6b87b143d312,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/printing/,/sf/app/printing,changeset,86ac2e536fee,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,changeset,09aa63f9b2bc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,changeset,42dc287846be,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,changeset,04e92f1a7966,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,9f92ee11141b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,changeset,01d847e5a91b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,changeset,6beaa9cf4752,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,changeset,57ec1f1a7fd2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,changeset,951a5db380a0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,7d91903f795f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,07d1685f0cd4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,changeset,35a9006a7fc7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,changeset,d6c1cc3e4806,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,7b8801c4c2d9,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,51c0f5edf5ef,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,41c831b220fc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,changeset,6a29d5ad0713,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,bcdc0181a9f1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/classicui/,/sf/mw/classicui,changeset,8ca85d2f0db7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,62c8a2d3d275,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,changeset,77a4e6a1beb4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,f62c3a3d66b8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,0a5ec9af4050,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,changeset,bf642e5cdd8d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,5ef93ea513cb,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,82749d516180,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,071f3cdcec69,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,f5a1e66df979,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,eed911ae68f2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,513a8b745b2f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,2e6c4614c58e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,ca392eff7152,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,42de37ce7ce4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,changeset,6752808b2036,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,fe71b07a6401,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,25a73b11c967,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,835a21e50645,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,4f62049db6ac,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,changeset,c2c0f97004fc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,5ee1d9ce5878,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,changeset,726be5d7e65d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,changeset,38249ef85f99,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,a4a774cb6ea7,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,ca4caa9ba686,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,57a65a3a658c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,changeset,0b1a89531ca2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,3b17fc5c9564,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,4ac3198c2c5b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,35c6c77e36de,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,11d83199e2d9,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,changeset,2811ce8b1bfb,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,changeset,19f463b3b9b2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,d8a3531bc6b8,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,8b106fdafd3c,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,changeset,b8b9ec0d9e3f,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,changeset,1e6bfc80a381,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,e3b7e04384fe,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,032d3a818f49,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,changeset,ea4b2e4f7cac,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,changeset,7bc6ab9b5bcd,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,c2bc3f8c7777,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,d17b4c0804b9,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,changeset,2b6718f05bdb,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,abe83d2199d3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,962e6306d9d2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,77effd21b2c9,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,d9b045c41e83,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,a811597961f0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,0be82064630b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,changeset,3993b8f65362,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,2ee5df201f60,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,changeset,4e5c952777fc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,changeset,f7d9134af83e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,e7dfaa7b0b8d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,0f8d2eb4627b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,5ffdb8f2067f,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,ea00662efad9,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,030b3432fbe0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/usb/,/sf/os/usb,changeset,be39042dca40,
+http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,changeset,6524e815f76f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,e65204f75c47,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,73ff0d268e1d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,6f943d133287,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,34cd6bf038ac,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,67b05696354a,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,882d065be445,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,0f973a9226e8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,changeset,2703485a934c,layers.sysdef.xml

--- a/symbian3/single/sources_compiler_compatibility.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian3/single/sources_compiler_compatibility.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,120 +1,120 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development_new/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,CompilerCompatibility,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/usb/,/sf/os/usb,branch,default,
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,CompilerCompatibility,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/usb/,/sf/os/usb,branch,default,
+http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,CompilerCompatibility,
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml

--- a/symbian3/single/sources_fcl.csv	Sun Feb 21 20:00:57 2010 +0000
+++ b/symbian3/single/sources_fcl.csv	Wed Mar 24 15:26:03 2010 +0000
@@ -1,120 +1,120 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contacts/,/sf/app/contacts,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/jrt/,/sf/app/jrt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/organizer/,/sf/app/organizer,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/printing/,/sf/app/printing,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development_new/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/usb/,/sf/os/usb,branch,default,
-http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uitools/,/sf/mw/uitools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/usbservices/,/sf/mw/usbservices,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/usb/,/sf/os/usb,branch,RCL_3,
+http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
-http://developer.symbian.org/oss/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,RCL_3,layers.sysdef.xml

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Wed Mar 24 15:26:03 2010 +0000
@@ -0,0 +1,11579 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" id-namespace="http://www.symbian.org/system-definition">
+ <systemModel name="Symbian^3">
+  <layer id="adaptation" name="Adaptation" levels="low mw high">
+   <package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
+    <collection id="s60_stubs" level="stub">
+     <component id="audiostubs" name="Audio Stubs">
+      <unit bldFile="/adaptation/stubs/audiostubs/group"/>
+     </component>
+     <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
+      <unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+     </component>
+     <component id="drm_stubs" name="DRM Stubs">
+      <unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+     </component>
+     <component id="ocrsrv_stub" name="OCR Services Stub">
+      <unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+     </component>
+     <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
+      <unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+     </component>
+     <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
+      <unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+     </component>
+     <component id="srsfenginestub" name="SRSF Engine Stub">
+      <unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+     </component>
+     <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
+      <unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+     </component>
+     <component id="systemswstubs" name="System Software Stubs">
+      <unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+     </component>
+     <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
+      <unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+     </component>
+     <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
+      <unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="beagleboard" tech-domain="hb" level="low" name="Beagle Board" levels="hw-if">
+    <collection id="omap3530" name="OMAP 3530" level="hw-if">
+     <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
+      <unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+     </component>
+     <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
+      <unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+     </component>
+     <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
+      <unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+     </component>
+    </collection>
+   </package>
+   <package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
+    <collection id="qemu_baseport" name="Baseport" level="hw-if">
+     <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
+      <unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+     </component>
+    </collection>
+   </package>
+  </layer>
+  <layer id="os" name="OS" levels="hw services">
+   <package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+    <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
+     <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+     </component>
+    </collection>
+    <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">
+     <component id="asspandvariant" name="Template ASSP and Variant" introduced="6.0" purpose="development">
+      <unit bldFile="/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
+     </component>
+    </collection>
+    <collection id="kernel" name="Kernel Architecture" level="adaptation">
+     <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka" mrp="/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
+     </component>
+    </collection>
+    <collection id="kerneltest" name="Kernel Test" level="hw-if">
+     <component id="e32utils" name="E32 Utilities" purpose="development">
+      <unit bldFile="/os/kernelhwsrv/kerneltest/e32utils/group" mrp="/os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/>
+     </component>
+     <component id="e32test" name="E32 Tests" purpose="development">
+      <unit bldFile="/os/kernelhwsrv/kerneltest/e32test/group" mrp="/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+     </component>
+     <component id="f32test" name="File Server Tests" purpose="development">
+      <unit bldFile="/os/kernelhwsrv/kerneltest/f32test/group" mrp="/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
+     </component>
+    </collection>
+    <collection id="ldds" name="Logical Device Drivers" level="adaptation">
+     <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+     </component>
+     <component id="audioldd" name="Audio Drivers" introduced="8.1b" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/soundsc" mrp="/os/kernelhwsrv/kernel/eka/drivers/soundsc/base_e32_drivers_sound.mrp"/>
+     </component>
+     <component id="serialldd" name="Serial Port Drivers" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+     </component>
+     <component id="legacydrivers" name="Legacy Drivers" purpose="optional">
+      <unit mrp="/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+     </component>
+     <component id="locmedia" name="Local Media Subsystem" introduced="8.1b" purpose="mandatory">
+      <!-- these are LDDs for storage media-->
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+     </component>
+     <component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/debug/group" mrp="/os/kernelhwsrv/kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
+     </component>
+     <component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+     </component>
+     <component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/camerasc" mrp="/os/kernelhwsrv/kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
+     </component>
+     <component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
+      <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
+     </component>
+     <component id="usbclientdrivers" name="USB Client Drivers" introduced="8.1b" purpose="optional">
+      <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+     </component>
+    </collection>
+    <collection id="driversupport" name="Generic Driver Support" level="hw-if">
+     <component id="mediadrivers" name="Media Drivers" purpose="optional">
+      <!-- these are for storage media-->
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+     </component>
+     <component id="genericboardsupport" name="Generic Board Support" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+     </component>
+    </collection>
+    <collection id="userlibandfileserver" name="User Library and File Server" level="framework">
+     <component id="euser" name="User Library" purpose="mandatory">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/euser" mrp="/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+     </component>
+     <component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/compsupp" mrp="/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+     </component>
+     <component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+     </component>
+     <component id="estart" name="Base Starter" filter="gt" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+     </component>
+     <component id="domainmgr" name="Domain Manager" introduced="8.1b" purpose="mandatory">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+     </component>
+    </collection>
+    <collection id="filesystems" name="File Systems" level="framework">
+     <component id="romfs" name="ROM File System" filter="gt" purpose="optional" class="plugin">
+      <unit mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+     </component>
+     <component id="rofs" name="ROFS" filter="gt" purpose="optional" class="plugin">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+     </component>
+     <component id="usbmsfs" name="USB Mass Storage File System" filter="gt" purpose="optional" class="plugin">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+     </component>
+     <component id="usbhostmssrv" name="USB Host Mass Storage Server" filter="gt" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/shostmassstorage/base_f32_shostmassstorage.mrp"/>
+     </component>
+     <component id="fat32fs" name="FAT32 File System" filter="gt" purpose="optional" class="plugin">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+     </component>
+     <component id="fatfs" name="FAT File System" filter="gt" purpose="optional" class="plugin">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+     </component>
+     <component id="compfs" name="Composite File System" filter="gt" purpose="optional" class="plugin">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+     </component>
+    </collection>
+    <collection id="halservices" name="HAL Services" level="framework">
+     <component id="hal" name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/halservices/hal" mrp="/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+     </component>
+    </collection>
+    <collection id="textmodeshell" name="Text Mode Shell" level="test">
+     <component id="e32wsrv" name="Text Window Server" purpose="optional">
+      <unit bldFile="/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+     </component>
+     <component id="textshell" name="Text Shell" filter="gt" purpose="development">
+      <unit bldFile="/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+     </component>
+    </collection>
+    <collection id="baseapitest" name="Base API Tests" level="test">
+     <component id="basesvs" name="Base Verification Suite" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp" bldFile="/os/kernelhwsrv/baseapitest/basesvs/group"/>
+     </component>
+    </collection>
+    <collection id="kernelhwsrv_info" name="Kernel and Hardware Services Info" level="test">
+     <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="boardsupport" level="hw" tech-domain="hb" name="Board Support" levels="bsp test 2 3 config">
+    <collection id="emulator" name="Emulator" level="bsp">
+     <component id="emulatorbsp" name="Emulator BSP" purpose="optional">
+      <unit bldFile="/os/boardsupport/emulator/emulatorbsp" mrp="/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+     </component>
+    </collection>
+    <collection id="haitest" name="HAI Test Suites" level="test">
+     <component id="bspsvs" name="BSP Verification Suite" introduced="^2" purpose="development">
+      <unit mrp="/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
+     </component>
+    </collection>
+    <collection id="boardsupport_info" name="Board Support Info" level="config">
+     <component id="boardsupport_metadata" name="Board Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="buildtools" level="hw" tech-domain="to" name="Build Tools" levels="bld mw fw ui">
+    <collection id="bldsystemtools" name="Build System Tools" level="bld">
+     <component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
+      <unit mrp="/os/buildtools/bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
+     </component>
+     <component id="commonbldutils" name="Common Utils" purpose="development">
+      <unit mrp="/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+     </component>
+    </collection>
+    <collection id="toolsandutils" name="Tools and Utils" level="mw">
+     <component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
+      <unit mrp="/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+     </component>
+     <component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
+      <unit bldFile="/os/buildtools/toolsandutils/e32tools/group" mrp="/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+     </component>
+     <component id="wintunnel" name="Wintunnel" purpose="development" filter="test">
+      <unit mrp="/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="/os/buildtools/toolsandutils/wintunnel/group"/>
+     </component>
+     <component id="autotest" name="Autotest" purpose="development">
+      <unit bldFile="/os/buildtools/toolsandutils/autotest/group" mrp="/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+     </component>
+    </collection>
+    <collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
+     <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
+      <unit mrp="/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="/os/buildtools/sbsv1_os/e32toolp/group"/>
+     </component>
+    </collection>
+    <collection id="imgtools_os" name="Image Tools" level="fw">
+     <component id="romkiteka2" name="ROMKIT EKA2" deprecated="^2" purpose="development">
+      <unit bldFile="/os/buildtools/imgtools_os/romkiteka2/group" mrp="/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+     </component>
+    </collection>
+    <collection id="misccomponents" name="Misc Components" level="mw">
+     <component id="emulatorlauncher" name="Emulator Launcher" filter="gt" purpose="development">
+      <unit bldFile="/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+     </component>
+    </collection>
+    <collection id="buildtools_info" name="Build Tools Info" level="ui">
+     <component id="buildtools_metadata" name="Build Tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="ossrv" level="services" tech-domain="hb" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+    <collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
+     <component id="boost_apis" name="Boost APIs" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/boost_apis/group"/>
+     </component>
+     <component id="cpp_wrappers" name="Cpp wrappers" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+     </component>
+     <component id="character_type_apis" name="Character Type APIs" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/character_type_apis/group"/>
+     </component>
+     <component id="compiler_specific_runtime_support" name="Compiler Specific Runtime Support" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+     </component>
+     <component id="ossrv_configuration_api" name="Generic OS Services Configuration API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/configuration/group"/>
+     </component>
+     <component id="crypto_authentication_codes_and_hash_functions_api" name="Crypto Authentication Codes and Hash Functions API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+     </component>
+     <component id="crypto_auxillary_functions_api" name="Crypto Auxillary Functions API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+     </component>
+     <component id="crypto_certificates_api" name="Crypto Certificates API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+     </component>
+     <component id="crypto_inputoutput_and_data_encoding_api" name="Crypto Input/Output and Data Encoding API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+     </component>
+     <component id="crypto_public_key_cryptography_and_key_agreement_api" name="Crypto Public Key Cryptography and Key Agreement API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+     </component>
+     <component id="crypto_symmetric_ciphers_api" name="Crypto Symmetric Ciphers API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+     </component>
+     <component id="crypto_utility_functions_api" name="Crypto Utility Functions API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+     </component>
+     <component id="cryptogaphy_related_api" name="Cryptogaphy Related API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+     </component>
+     <component id="ossrv_debug_api" name="Generic OS Services Debug API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/debug/group"/>
+     </component>
+     <component id="ossrv_exceptions_api" name="Generic OS Services Exceptions API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/exceptions/group"/>
+     </component>
+     <component id="gboxed" name="GBoxed API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/gboxed/group"/>
+     </component>
+     <component id="glib_arrays" name="Glib Arrays API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_arrays/group"/>
+     </component>
+     <component id="glib_asynchronous_queues" name="Glib Asynchronous Queues API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
+     </component>
+     <component id="glib_atomic_operations" name="Glib Atomic Operations API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
+     </component>
+     <component id="glib_automatic_string_completion" name="Glib Automatic String Completion API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
+     </component>
+     <component id="glib_balanced_binary_trees" name="Glib Balanced Binary Trees API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
+     </component>
+     <component id="glib_basic_types" name="Glib Basic Types API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_basic_types/group"/>
+     </component>
+     <component id="glib_caches" name="Glib Caches API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_caches/group"/>
+     </component>
+     <component id="glib_character_set_conversion" name="Glib Character Set Conversion API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
+     </component>
+     <component id="glib_closures" name="Glib Closures API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_closures/group"/>
+     </component>
+     <component id="glib_commandline_option_parser" name="Glib Command Line Option Parser API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
+     </component>
+     <component id="glib_datasets" name="Glib Datasets API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_datasets/group"/>
+     </component>
+     <component id="glib_date_and_time_functions" name="Glib Date and Time Functions API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
+     </component>
+     <component id="glib_doubleended_queues" name="Glib Double-ended Queues API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
+     </component>
+     <component id="glib_doublylinked_lists" name="Glib Doubly-Linked Lists API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
+     </component>
+     <component id="glib_dynamic_loading_of_modules" name="Glib Dynamic Loading of Modules API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
+     </component>
+     <component id="glib_enums_and_flags" name="Glib Enums and Flags API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
+     </component>
+     <component id="glib_error_reporting" name="Glib Error Reporting API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_error_reporting/group"/>
+     </component>
+     <component id="glib_file_utilities" name="Glib File Utilities API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_file_utilities/group"/>
+     </component>
+     <component id="glib_generic_values" name="Glib Generic Values API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_generic_values/group"/>
+     </component>
+     <component id="glib_globstyle_pattern_matching" name="Glib Glob-Style Pattern Matching API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
+     </component>
+     <component id="glib_hash_tables" name="Glib Hash Tables API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_hash_tables/group"/>
+     </component>
+     <component id="glib_hook_functions" name="Glib Hook Functions API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_hook_functions/group"/>
+     </component>
+     <component id="glib_internationalization" name="Glib  Internationalization API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_internationalization/group"/>
+     </component>
+     <component id="glib_io_channels" name="Glib I/O Channels API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_io_channels/group"/>
+     </component>
+     <component id="glib_keyvalue_file_parser" name="Glib Key-Value File Parser API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
+     </component>
+     <component id="glib_lexical_scanner" name="Glib Lexical Scanner API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
+     </component>
+     <component id="glib_main_event_loop" name="Glib Main Event Loop API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
+     </component>
+     <component id="glib_memory_allocation" name="Glib Memory Allocation API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
+     </component>
+     <component id="glib_memory_slices" name="Glib Memory Slices API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_memory_slices/group"/>
+     </component>
+     <component id="glib_message_logging" name="Glib Message Logging API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_message_logging/group"/>
+     </component>
+     <component id="glib_miscellaneous_utility_functions" name="Glib Miscellaneous Utility Functions API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
+     </component>
+     <component id="glib_nary_trees" name="Glib N-ary Trees API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_nary_trees/group"/>
+     </component>
+     <component id="glib_parameters_and_values" name="Glib Parameters and Values API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
+     </component>
+     <component id="glib_quarks" name="Glib Quarks API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_quarks/group"/>
+     </component>
+     <component id="glib_random_numbers" name="Glib Random Numbers API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_random_numbers/group"/>
+     </component>
+     <component id="glib_relations_and_tuples" name="Glib Relations and Tuples API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
+     </component>
+     <component id="glib_shellrelated_utilities" name="Glib Shell-related Utilities API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
+     </component>
+     <component id="glib_signals" name="Glib Signals API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_signals/group"/>
+     </component>
+     <component id="glib_simple_xml_subset_parser" name="Glib Simple XML Subset Parser API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
+     </component>
+     <component id="glib_singlylinked_lists" name="Glib Singly-Linked Lists API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
+     </component>
+     <component id="glib_spawning_processes" name="Glib Spawning Processes API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
+     </component>
+     <component id="glib_standard_macros" name="Glib Standard Macros API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_standard_macros/group"/>
+     </component>
+     <component id="glib_string_utility_functions" name="Glib String Utility Functions API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
+     </component>
+     <component id="glib_strings" name="Glib Strings API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_strings/group"/>
+     </component>
+     <component id="glib_thread_pools" name="Glib Thread Pools API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_thread_pools/group"/>
+     </component>
+     <component id="glib_threads" name="Glib Threads API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_threads/group"/>
+     </component>
+     <component id="glib_timers" name="Glib Timers API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_timers/group"/>
+     </component>
+     <component id="glib_unicode_manipulation" name="Glib Unicode Manipulation API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
+     </component>
+     <component id="glib_value_arrays" name="Glib Value Arrays API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_value_arrays/group"/>
+     </component>
+     <component id="glib_varargs_value_collection" name="Glib Varargs Value Collection API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
+     </component>
+     <component id="gobject" name="GObject API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/gobject/group"/>
+     </component>
+     <component id="gparamspec" name="GParamSpec API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/gparamspec/group"/>
+     </component>
+     <component id="gtype" name="GType API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/gtype/group"/>
+     </component>
+     <component id="gtypemodule" name="GTypeModule API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/gtypemodule/group"/>
+     </component>
+     <component id="gtypeplugin" name="GTypePlugin API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/gtypeplugin/group"/>
+     </component>
+     <component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/io_stream_api/group"/>
+     </component>
+     <component id="localization_function_api" name="Localization Function API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/localization_function_api/group"/>
+     </component>
+     <component id="math_operations_api" name="Math Operations API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/math_operations_api/group"/>
+     </component>
+     <component id="ossrv_memory_api" name="Generic OS Services Memory API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/memory/group"/>
+     </component>
+     <component id="no_namespace_headers" name="No Namespace Headers" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+     </component>
+     <component id="openc_headers" name="OpenC headers" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/openc_headers/group"/>
+     </component>
+     <component id="openc_wrappers" name="OpenC wrappers" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/openc_wrappers/group"/>
+     </component>
+     <component id="ssl_general_api" name="SSL General API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/ssl_general_api/group"/>
+     </component>
+     <component id="ssl_protocol_methods_api" name="SSL Protocol Methods API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+     </component>
+     <component id="standard_compressiondecompression_api" name="Standard Compression/Decompression API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+     </component>
+     <component id="stl" name="STL API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/stl/group"/>
+     </component>
+     <component id="thread_api" name="Thread API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/thread_api/group"/>
+     </component>
+     <component id="type_attributes" name="Type Attributes API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/type_attributes/group"/>
+     </component>
+     <component id="typeinfo" name="Type Info API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/typeinfo/group"/>
+     </component>
+     <component id="utility_apis" name="Utility APIs" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/utility_apis/group"/>
+     </component>
+     <component id="wide_character_classapis" name="Wide character class/apis" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+     </component>
+     <component id="dbus_api" name="Dbus API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/dbus/group"/>
+     </component>
+     <component id="dbus-glib" name="Dbus-glib API" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_pub/dbus-glib/group"/>
+     </component>
+    </collection>
+    <collection id="ossrv_plat" name="Generic OS Services Platform Interfaces" level="utilities">
+     <component id="libutils_apis" name="Utility Library APIs" class="api" filter="s60">
+      <unit bldFile="/os/ossrv/ossrv_plat/libutils/group"/>
+     </component>
+    </collection>
+    <collection id="stdlibs" name="Standard Libraries" level="translation">
+     <component id="libz" filter="s60" name="Z Compression Library">
+      <unit bldFile="/os/ossrv/stdlibs/libz/group"/>
+     </component>
+     <component id="libcrypt" filter="s60" name="Crypt Library">
+      <unit bldFile="/os/ossrv/stdlibs/libcrypt/group"/>
+     </component>
+    </collection>
+    <collection id="ssl" name="SSL" level="data-services">
+     <component id="libcrypto" filter="s60" name="Crypto Library">
+      <unit bldFile="/os/ossrv/ssl/libcrypto/group"/>
+     </component>
+     <component id="libssl" filter="s60" purpose="development" name="SSL Library">
+      <unit bldFile="/os/ossrv/ssl/libssl/group"/>
+     </component>
+    </collection>
+    <collection id="glib" name="GLib" level="utilities">
+     <component id="glibbackend" filter="s60" name="GLib Backend">
+      <unit bldFile="/os/ossrv/glib/build/symbian/glibbackend/group"/>
+      <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+     </component>
+     <component id="libglib" filter="s60" name="GLib Library">
+      <unit bldFile="/os/ossrv/glib/build/symbian/glib/group"/>
+      <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+     </component>
+     <component id="libgthread" filter="s60" name="Libg Thread">
+      <unit bldFile="/os/ossrv/glib/build/symbian/gthread/group"/>
+      <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
+     </component>
+     <component id="libgmodule" filter="s60" name="Libg Module">
+      <unit bldFile="/os/ossrv/glib/build/symbian/gmodule/group"/>
+      <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
+     </component>
+     <component id="libgobject" filter="s60" name="Libg Object">
+      <unit bldFile="/os/ossrv/glib/build/symbian/gobject/group"/>
+      <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
+     </component>
+    </collection>
+    <collection id="stdcpp" name="C++ Standard Library" level="translation">
+     <!-- collection is really a component. Needs to be moved down a directory -->
+     <component id="stdcpp_build" filter="s60" name="Stdcpp">
+      <unit bldFile="/os/ossrv/stdcpp/group"/>
+     </component>
+    </collection>
+    <collection id="ofdbus" name="Open Foundation D-Bus" level="utilities">
+     <component id="dbus" filter="s60" name="D-Bus">
+      <unit bldFile="/os/ossrv/ofdbus/dbus/group"/>
+     </component>
+     <component id="dbus-glib" filter="s60" name="D-Bus GLib">
+      <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
+     </component>
+     <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
+      <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+            Consider moving IBY file to one of the above as well and removing this component entirely -->
+      <unit bldFile="/os/ossrv/ofdbus/group"/>
+     </component>
+    </collection>
+    <collection id="utilitylibraries" name="Utility Libraries" level="encoding">
+     <component id="libutils" filter="s60" name="Utility Library">
+      <unit bldFile="/os/ossrv/utilitylibraries/libutils/group"/>
+     </component>
+    </collection>
+    <collection id="genericservices" name="Generic Services" level="utilities">
+     <component id="s60compatibilityheaders" name="S60 Compatibility Headers" filter="gt" purpose="optional">
+      <unit version="tb101sf" bldFile="/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf" mrp="/os/ossrv/genericservices/s60compatibilityheaders/groupsymtb101sf/tools_s60_header_compatsymtb101sf.mrp"/>
+     </component>
+     <component id="mimerecognitionfw" name="MIME Recognition Framework" purpose="mandatory">
+      <unit bldFile="/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
+     </component>
+     <component id="systemagent" name="System Agent" introduced="9.0" purpose="mandatory">
+      <unit bldFile="/os/ossrv/genericservices/systemagent/group" mrp="/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
+     </component>
+     <component id="taskscheduler" name="Task Scheduler" introduced="6.0" purpose="optional">
+      <unit bldFile="/os/ossrv/genericservices/taskscheduler/group" mrp="/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
+     </component>
+     <component id="activebackupclient" name="Active Backup Client" purpose="optional">
+      <unit bldFile="/os/ossrv/genericservices/activebackupclient/group" mrp="/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
+     </component>
+     <component id="syslibsdocs" name="Syslibs Documentation" purpose="development" class="doc">
+      <unit mrp="/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+     </component>
+     <component id="httputils" name="HTTP Utilities Library" introduced="6.2" purpose="optional">
+      <unit bldFile="/os/ossrv/genericservices/httputils/group" mrp="/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
+     </component>
+    </collection>
+    <collection id="syslibsapitest" name="SysLibs API Tests" level="utilities">
+     <component id="syslibssvs" name="Syslibs Verfication Suite" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp" bldFile="/os/ossrv/syslibsapitest/syslibssvs/group"/>
+     </component>
+    </collection>
+    <collection id="compressionlibs" name="Compression Libraries" level="data-services">
+     <component id="ziplib" name="Zip Compression Library" introduced="6.0" purpose="mandatory">
+      <unit bldFile="/os/ossrv/compressionlibs/ziplib/group" mrp="/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib2.mrp"/>
+     </component>
+    </collection>
+    <collection id="genericopenlibs" name="Generic Open Libraries" level="translation">
+     <component id="cstdlib" name="C Standard Library" introduced="ER5" purpose="optional">
+      <unit bldFile="/os/ossrv/genericopenlibs/cstdlib/group" mrp="/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+     </component>
+     <component id="cppstdlib" name="C++ Standard Library" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/ossrv/genericopenlibs/cppstdlib/group" mrp="/os/ossrv/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp"/>
+     </component>
+     <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
+      <unit bldFile="/os/ossrv/genericopenlibs/openenvcore/group" mrp="/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
+     </component>
+     <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
+      <unit bldFile="/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
+     </component>
+     <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
+      <unit bldFile="/os/ossrv/genericopenlibs/liboil/group" mrp="/os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+     </component>
+    </collection>
+    <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
+     <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
+      <unit version="3" bldFile="/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
+     </component>
+     <component id="apputils" name="Application Utilities" introduced="ER5" purpose="mandatory">
+      <unit bldFile="/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
+     </component>
+     <component id="genericusabilitylib" name="Generic Usability Library" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/ossrv/lowlevellibsandfws/genericusabilitylib/group" mrp="/os/ossrv/lowlevellibsandfws/genericusabilitylib/group/syslibs_euserhl.mrp"/>
+     </component>
+    </collection>
+    <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
+     <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
+      <!-- exports should be moved to individual components -->
+      <unit bldFile="/os/ossrv/group"/>
+     </component>
+     <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="featuremgmt" name="Feature Management" level="framework">
+     <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/persistentdata/featuremgmt/featuremgr/group" mrp="/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
+     </component>
+     <component id="featureregistry" name="Feature Registry" introduced="9.2" deprecated="^3" purpose="mandatory">
+      <unit bldFile="/os/persistentdata/featuremgmt/featureregistry/group" mrp="/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+     </component>
+    </collection>
+    <collection id="loggingservices" name="Logging Services" level="server">
+     <component id="eventlogger" name="Event Logger" introduced="6.0" purpose="optional">
+      <unit bldFile="/os/persistentdata/loggingservices/eventlogger/group" mrp="/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+     </component>
+     <component id="filelogger" name="File Logger" introduced="ER5" purpose="optional">
+      <unit bldFile="/os/persistentdata/loggingservices/filelogger/group" mrp="/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+     </component>
+     <component id="rfilelogger" name="RFile Logger" deprecated="^3" introduced="9.1" purpose="development">
+      <unit bldFile="/os/persistentdata/loggingservices/rfilelogger/group" mrp="/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+     </component>
+    </collection>
+    <collection id="traceservices" name="Trace Services" level="server">
+     <component id="commsdebugutility" name="Comms Debug Utility" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/persistentdata/traceservices/commsdebugutility/group" mrp="/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+     </component>
+     <component id="tracefw" name="Trace Framework" introduced="9.2" purpose="development">
+      <unit bldFile="/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+     </component>
+    </collection>
+    <collection id="persistentstorage" name="Persistent Storage" level="framework">
+     <component id="store" name="Store" purpose="optional">
+      <unit bldFile="/os/persistentdata/persistentstorage/store/group" mrp="/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+     </component>
+     <component id="dbms" name="DBMS" purpose="optional">
+      <unit bldFile="/os/persistentdata/persistentstorage/dbms/group" mrp="/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+     </component>
+     <component id="centralrepository" name="Central Repository" introduced="7.0s" purpose="mandatory">
+      <unit bldFile="/os/persistentdata/persistentstorage/centralrepository/group" mrp="/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+     </component>
+     <component id="sql" name="SQL" introduced="9.3" purpose="optional">
+      <unit bldFile="/os/persistentdata/persistentstorage/sql/GROUP" mrp="/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+     </component>
+     <component id="sqlite3api" name="SQLite 3 API" introduced="^3" purpose="optional">
+      <unit bldFile="/os/persistentdata/persistentstorage/sqlite3api/GROUP" mrp="/os/persistentdata/persistentstorage/sqlite3api/GROUP/syslibs_sqlite3.mrp"/>
+     </component>
+    </collection>
+    <collection id="persistentdata_info" name="Persistent Data Services Info" level="app-if">
+     <component id="persistentdata_metadata" name="Persistent Data Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
+     <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
+     </component>
+     <component id="common_platform_security_definitions_api" name="Common Platform Security Definitions API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+     </component>
+     <component id="feature_discovery_api" name="Feature Discovery API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+     </component>
+     <component id="platform_environment_api" name="Platform Environment API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+     </component>
+     <component id="sensor_channel_api" name="Sensor Channel API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+     </component>
+     <component id="sensor_definitions_api" name="Sensor Definitions API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+     </component>
+     <component id="version_info_api" name="Version Info API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/version_info_api/group"/>
+     </component>
+     <component id="accessory_monitoring_api" name="Accessory Monitoring API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+     </component>
+     <component id="haptics_api" name="Haptics API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/haptics_api/group"/>
+     </component>
+     <component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+     </component>
+    </collection>
+    <collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
+     <component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+     </component>
+     <component id="dos_extension_plugin_api" name="DOS Extension Plug-In API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+     </component>
+     <component id="mediator_command_initiator_api" name="Mediator Command Initiator API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+     </component>
+     <component id="syslangutil_api" name="SysLangUtil API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+     </component>
+     <component id="wakeup_alarm_api" name="Wakeup Alarm API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+     </component>
+     <component id="disk_and_memory_level_keys_api" name="Disk and Memory Level Keys API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+     </component>
+     <component id="mediator_plugin_api" name="Mediator Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+     </component>
+     <component id="headset_status_api" name="Headset Status API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+     </component>
+     <component id="system_startup_extension_plugin_api" name="System Startup Extension Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+     </component>
+     <component id="sensor_plugin_api" name="Sensor Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+     </component>
+     <component id="accessory_api" name="Accessory API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_api/group"/>
+     </component>
+     <component id="display_language_definition_api" name="Display Language Definition API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+     </component>
+     <component id="mediator_command_responder_api" name="Mediator Command Responder API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+     </component>
+     <component id="accessory_policy_definitions_api" name="Accessory Policy Definitions API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+     </component>
+     <component id="hw_settings_api" name="Hardware Settings API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+     </component>
+     <component id="mediator_domain_definitions_api" name="Mediator Domain Definitions API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+     </component>
+     <component id="sensor_extension_api" name="Sensor Extension API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+     </component>
+     <component id="accessory_plugin_api" name="Accessory Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+     </component>
+     <component id="sae_api" name="SAE API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/sae_api/group"/>
+     </component>
+     <component id="accessory_control_api" name="Accessory Control API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+     </component>
+     <component id="mediator_static_registration_api" name="Mediator Static Registration API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+     </component>
+     <component id="accessory_key_event_handling_api" name="Accessory Key Event Handling API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+     </component>
+     <component id="mediator_notification_api" name="Mediator Notification API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+     </component>
+     <component id="accessory_policy_utility_api" name="Accessory Policy Utility API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+     </component>
+     <component id="common_dsy_plugin_api" name="Common DSY Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+     </component>
+     <component id="remote_control_extension_api" name="Remote Control Extension API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+     </component>
+     <component id="sensor_channel_filter_api" name="Sensor Channel Filter API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+     </component>
+     <component id="dos_extension_api" name="DOS Extension API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+     </component>
+     <component id="accessory_audio_control_api" name="Accessory Audio Control API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+     </component>
+     <component id="mediator_event_consumer_api" name="Mediator Event Consumer API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+     </component>
+     <component id="shared_data_api" name="Shared Data API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+     </component>
+     <component id="accessory_settings_api" name="Accessory Settings API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+     </component>
+     <component id="accessory_bluetooth_control_api" name="Accessory Bluetooth Control API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+     </component>
+     <component id="extended_version_info_api" name="Extended Version Info API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+     </component>
+     <component id="mediator_event_provider_api" name="Mediator Event Provider API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+     </component>
+     <component id="tv_out_config_api" name="TV Out Config API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+     </component>
+     <component id="tspclientmapper_api" name="TSP Client Mapper API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+     </component>
+     <component id="powersave_api" name="Power Save API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/powersave_api/group"/>
+     </component>
+     <component id="powersave_definitions_api" name="Power Save Definitions API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+     </component>
+     <component id="powersave_plugin_api" name="Power Save Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+     </component>
+     <component id="extended_version_info_plugin_api" name="Extended Version Info Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+     </component>
+     <component id="haptics_plugin_api" name="Haptics Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+     </component>
+     <component id="haptics_effect_data_getter_plugin_api" name="Haptics Effect Data Getter Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+     </component>
+     <component id="haptics_packetizer_plugin_api" name="Haptics Packetizer Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+     </component>
+     <component id="tiltcompensation_api" name="Tilt Compensation API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+     </component>
+     <component id="disk_notification_handler_api" name="Disk Notification Handler API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+     </component>
+     <component id="accessory_policy_usb_audio_api" name="Accessory Policy USB Audio API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+     </component>
+     <component id="accessory_policy_hdmi_audio_api" name="Accessory Policy HDMI Audio API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+     </component>
+     <component id="sensor_data_compensator_plugin_api" name="Sensor Data Compensator Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+     </component>
+     <component id="ddc_access_api" name="DDC Access API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+     </component>
+     <component id="tv_out_behaviour_api" name="TV Out Behaviour API" class="api" filter="s60">
+      <unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+     </component>
+    </collection>
+    <collection id="accessoryservices" name="Accessory Services" level="framework">
+     <component id="accessorymonitor" filter="s60" name="Accessory Monitor">
+      <unit bldFile="/os/devicesrv/accessoryservices/accessorymonitor/group"/>
+     </component>
+     <component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
+      <unit bldFile="/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
+     </component>
+     <component id="accessoryserver" filter="s60" name="Accessory Server">
+      <unit bldFile="/os/devicesrv/accessoryservices/accessoryserver/group"/>
+     </component>
+     <component id="pluggeddisplay" filter="s60" name="Plugged Display" introduced="^3">
+      <unit bldFile="/os/devicesrv/accessoryservices/pluggeddisplay/group"/>
+     </component>
+     <component id="headsetstatusapi" filter="s60" name="Headset Status API">
+      <unit bldFile="/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
+     </component>
+     <component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
+      <unit bldFile="/os/devicesrv/accessoryservices/tspclientmapper/group"/>
+     </component>
+     <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
+      <unit bldFile="/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
+     </component>
+     <component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
+      <unit bldFile="/os/devicesrv/accessoryservices/gid_pc_tool/group"/>
+     </component>
+    </collection>
+    <collection id="commonservices" name="Common Services" level="app-if">
+     <component id="commonengine" filter="s60" name="Common Engine">
+      <unit bldFile="/os/devicesrv/commonservices/commonengine/group"/>
+     </component>
+     <component id="commonengineresources" filter="s60" name="Common Engine Resources" class="config">
+      <unit bldFile="/os/devicesrv/commonservices/commonengineresources/group"/>
+     </component>
+     <component id="platformenv" filter="s60" name="Platform Environment">
+      <unit bldFile="/os/devicesrv/commonservices/platformenv/group"/>
+     </component>
+     <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
+      <unit bldFile="/os/devicesrv/commonservices/sysutil/group" mrp="/os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
+     </component>
+     <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
+      <unit bldFile="/os/devicesrv/commonservices/activitymanager/group" mrp="/os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
+     </component>
+    </collection>
+    <collection id="dosservices" name="Domestic Operating System Services" level="hw-if">
+     <component id="commondsy" filter="s60" name="Common DSY" class="plugin">
+      <unit bldFile="/os/devicesrv/dosservices/commondsy/group"/>
+     </component>
+     <component id="dosserver" filter="s60" name="Domestic OS Server">
+      <unit bldFile="/os/devicesrv/dosservices/dosserver/group"/>
+     </component>
+    </collection>
+    <collection id="sensorservices" name="Sensor Services" level="framework">
+     <component id="sensorserver" filter="s60" name="Sensor Server">
+      <unit bldFile="/os/devicesrv/sensorservices/sensorserver/group"/>
+     </component>
+     <component id="orientationssy" filter="s60" name="Orientation SSY" class="plugin">
+      <unit bldFile="/os/devicesrv/sensorservices/orientationssy/group"/>
+     </component>
+     <component id="tiltcompensationssy" filter="s60" name="Tilt Compensation SSY" class="plugin">
+      <unit bldFile="/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
+     </component>
+     <component id="sensordatacompensator" filter="s60" name="Sensor Data Compensator">
+      <unit bldFile="/os/devicesrv/sensorservices/sensordatacompensator/group"/>
+     </component>
+    </collection>
+    <collection id="hwrmhaptics" name="HWRM Haptics" level="plugin">
+     <component id="hapticseffectdatagetterfw" filter="s60" name="Haptics Effect Data Getter Framework">
+      <unit bldFile="/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
+     </component>
+     <component id="hapticspluginservice" filter="s60" name="Haptics Plugin Service">
+      <unit bldFile="/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
+     </component>
+     <component id="hapticspacketizer" filter="s60" name="Haptics Packetizer">
+      <unit bldFile="/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
+     </component>
+     <component id="hapticspluginmanager" filter="s60" name="Haptics Plugin Manager">
+      <unit bldFile="/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
+     </component>
+     <component id="hapticsserver" filter="s60" name="Haptics Server">
+      <unit bldFile="/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
+     </component>
+     <component id="hapticsclient" filter="s60" name="Haptics Client">
+      <unit bldFile="/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
+     </component>
+     <component id="hwrmhaptics_build" filter="s60" name="HWRM Haptics Build">
+      <!-- move these exports into the appropriate above components and delete this component-->
+      <unit bldFile="/os/devicesrv/hwrmhaptics/group"/>
+     </component>
+    </collection>
+    <collection id="mediator" name="Mediator" level="app-if">
+     <!--collection is really a component. Move it down a directory -->
+     <component id="mediator_build" filter="s60" name="Mediator Build">
+      <unit bldFile="/os/devicesrv/mediator/group"/>
+     </component>
+    </collection>
+    <collection id="psmservices" name="Power Save Mode Services" level="app-if">
+     <component id="psmserver" filter="s60" name="PSM Server">
+      <unit bldFile="/os/devicesrv/psmservices/psmserver/group"/>
+     </component>
+    </collection>
+    <collection id="resourcemgmt" name="Resource Management" level="hw-if">
+     <component id="hwrmfmtxwatcherplugin" filter="s60" name="HWRM FM Transmitter Watcher Plugin" class="plugin">
+      <unit bldFile="/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
+     </component>
+     <component id="hwrmtargetmodifierplugin" filter="s60" name="HWRM Target Modifier Plugin" class="plugin">
+      <meta rel="config">
+       <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
+      </meta>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+      		may need to  -->
+      <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+     </component>
+     <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
+      <unit bldFile="/os/devicesrv/resourcemgmt/vibractrl/group"/>
+     </component>
+     <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
+      <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
+     </component>
+     <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+      <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
+     </component>
+     <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
+      <!-- Move exports to a self-contained component.
+         	This needs to be kept around until configuration is in place -->
+      <unit bldFile="/os/devicesrv/resourcemgmt/group"/>
+     </component>
+     <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
+      <unit bldFile="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
+     </component>
+    </collection>
+    <collection id="sysstatemgmt" name="System State Management" level="server">
+     <component id="ssmmapperutility" filter="s60" name="SSM Mapper Utility" introduced="^3">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/ssmmapperutility/group"/>
+     </component>
+     <component id="ssmpolicyplugins" filter="s60" name="SSM Policy Plugins" class="plugin" introduced="^3">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/ssmpolicyplugins/group"/>
+     </component>
+     <component id="ssmutilityplugins" filter="s60" name="SSM Utility Plugins" class="plugin" introduced="^3">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/ssmutilityplugins/group"/>
+     </component>
+     <component id="ssmcmdlists" filter="s60" name="SSM Command Lists" introduced="^3">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/ssmcmdlists/group"/>
+     </component>
+     <component id="ssmcustcmds" filter="s60" name="SSM Custom Commands" introduced="^3">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/ssmcustcmds/group"/>
+     </component>
+     <component id="syslangutil" filter="s60" name="System Language Utility" introduced="^3">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/syslangutil/group"/>
+     </component>
+     <component id="sysrestart" filter="s60" name="System Restart" introduced="^3">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/sysrestart/group"/>
+     </component>
+     <component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
+     </component>
+     <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
+     </component>
+     <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="/os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
+     </component>
+     <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="/os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
+     </component>
+     <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="/os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
+     </component>
+    </collection>
+    <collection id="resourceinterfaces" name="Resource Interfaces" level="hw-if">
+     <component id="fmtransmittercontrol" name="FM Transmitter Control" introduced="^3" purpose="optional">
+      <unit bldFile="/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group" mrp="/os/devicesrv/resourceinterfaces/fmtransmittercontrol/group/telephony_hwrmfmtx.mrp"/>
+     </component>
+    </collection>
+    <collection id="systemhealthmanagement" name="System Health Management" level="server">
+     <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
+      <unit bldFile="/os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="/os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
+     </component>
+    </collection>
+    <collection id="devicesrvapitest" name="Devices Services API Tests" level="app-if">
+     <component id="accessorieshaitest" name="Accessories HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/devicesrv/devicesrvapitest/accessorieshaitest/group/accessorieshaitest.mrp" bldFile="/os/devicesrv/devicesrvapitest/accessorieshaitest/group"/>
+     </component>
+     <component id="hwrmhaitest" name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/devicesrv/devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="/os/devicesrv/devicesrvapitest/hwrmhaitest/group"/>
+     </component>
+    </collection>
+    <collection id="devicesrv_info" name="Device Services Info" level="app-if">
+     <component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="security" level="services" tech-domain="se" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+    <collection id="authenticationservices" name="Authentication Services" level="utilities">
+     <component id="authenticationserver" name="Authentication Server" introduced="^3" purpose="optional">
+      <unit bldFile="/os/security/authenticationservices/authenticationserver/group" mrp="/os/security/authenticationservices/authenticationserver/group/security_authserver.mrp"/>
+     </component>
+    </collection>
+    <collection id="authorisation" name="Authorisation" level="utilities">
+     <component id="userpromptservice" name="User Prompt Service" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/security/authorisation/userpromptservice/group" mrp="/os/security/authorisation/userpromptservice/group/security_ups.mrp"/>
+     </component>
+     <component id="userpromptutils" name="User Prompt Utils" introduced="^3" purpose="optional">
+      <unit bldFile="/os/security/authorisation/userpromptutils/group" mrp="/os/security/authorisation/userpromptutils/group/security_ups_utils.mrp"/>
+     </component>
+    </collection>
+    <collection id="contentmgmt" name="Content Management" level="utilities">
+     <component id="contentaccessfwfordrm" name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
+      <unit bldFile="/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
+     </component>
+     <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
+      <unit bldFile="/os/security/contentmgmt/cafrecogniserconfig" mrp="/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
+     </component>
+     <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">
+      <unit bldFile="/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+     </component>
+     <component id="cafstreamingsupport" name="CAF Streaming Support" introduced="^3" purpose="optional">
+      <unit bldFile="/os/security/contentmgmt/cafstreamingsupport/group" mrp="/os/security/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
+     </component>
+    </collection>
+    <collection id="crypto" name="Crypto Libraries" level="libraries">
+     <component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+      <unit bldFile="/os/security/crypto/weakcryptospi/group" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
+     </component>
+     <component id="strongcryptospi" name="Strong Crypto SPI" filter="gt" introduced="^3" purpose="optional">
+      <unit bldFile="/os/security/crypto/weakcryptospi/strong" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_strong.mrp"/>
+     </component>
+    </collection>
+    <collection id="cryptomgmtlibs" name="Crypto Management Libraries" level="management">
+     <component id="securityutils" name="Security Utils" introduced="8.0" purpose="optional">
+      <unit bldFile="/os/security/cryptomgmtlibs/securityutils/group" mrp="/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+     </component>
+     <component id="securitytestfw" name="Security Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+      <unit mrp="/os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp" bldFile="/os/security/cryptomgmtlibs/securitytestfw/group"/>
+     </component>
+     <component id="securitydocs" name="Security Documentation" purpose="development" class="doc">
+      <unit mrp="/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+     </component>
+     <component id="cryptotokenfw" name="Crypto Token Framework" introduced="7.0" purpose="optional">
+      <unit bldFile="/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
+     </component>
+     <component id="securitycommonutils" name="Security Common Utils" introduced="8.0" purpose="mandatory">
+      <unit bldFile="/os/security/cryptomgmtlibs/securitycommonutils/group" mrp="/os/security/cryptomgmtlibs/securitycommonutils/group/security_commonutils.mrp"/>
+     </component>
+    </collection>
+    <collection id="securityanddataprivacytools" name="Security and Data Privacy Tools" level="services">
+     <component id="securityconfig" name="Security Config" introduced="9.1" purpose="optional">
+      <unit bldFile="/os/security/securityanddataprivacytools/securityconfig/group" mrp="/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+     </component>
+     <component id="securitytools" name="Security Tools" introduced="^3" purpose="optional" target="desktop">
+      <unit bldFile="/os/security/securityanddataprivacytools/securitytools/group" mrp="/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
+     </component>
+    </collection>
+    <collection id="cryptoplugins" name="Crypto Plugins" level="plugins">
+     <component id="cryptospiplugins" name="Crypto SPI Plugins" filter="gt" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/security/cryptoplugins/cryptospiplugins/group" mrp="/os/security/cryptoplugins/cryptospiplugins/group/security_cryptospi_plugins.mrp"/>
+     </component>
+    </collection>
+    <collection id="cryptoservices" name="Crypto Services" level="plugins">
+     <component id="certificateandkeymgmt" name="Certificate and Key Management" introduced="6.0" purpose="optional">
+      <unit bldFile="/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
+     </component>
+     <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
+      <unit bldFile="/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
+     </component>
+     <component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+      <unit mrp="/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+     </component>
+     <component id="rootcertificates" filter="sf_build" name="Root Certificates" introduced="7.0s" purpose="optional">
+      <!-- not in S60 codebase -->
+      <unit bldFile="/os/security/cryptoservices/rootcertificates/group" mrp="/os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
+     </component>
+     <component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
+      <unit bldFile="/os/security/cryptoservices/asnpkcs/group" mrp="/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
+     </component>
+    </collection>
+    <collection id="security_info" name="OS Security Info" level="utilities">
+     <component id="security_metadata" name="OS Security Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/security/security_info/security_metadata/security_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+    <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
+     <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
+     </component>
+     <component id="bluetoothgpspositioningmodule" name="Bluetooth GPS Positioning Module" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
+     </component>
+     <component id="simulationpositioningmodule" name="Simulation Positioning Module" introduced="^2" purpose="development" class="plugin">
+      <unit bldFile="/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
+     </component>
+     <component id="gpspositioningmodule" name="GPS/A-GPS Positioning Module" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/lbs/datasourcemodules/gpspositioningmodule/group" mrp="/os/lbs/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp"/>
+     </component>
+     <component id="networkpositioningmodule" name="Network Positioning Module" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
+     </component>
+     <component id="locationapesuplpsy" name="APE SUPL PSY" introduced="^3" purpose="optional" class="plugin" filter="s60">
+      <unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
+     </component>
+    </collection>
+    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+     <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+     </component>
+    </collection>
+    <collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
+     <component id="locationserver" name="Location Server" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/lbs/locationrequestmgmt/locationserver/group" mrp="/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
+     </component>
+     <component id="networkrequesthandler" name="Network Request Handler" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
+     </component>
+    </collection>
+    <collection id="lbstest" name="Locating Services Tests" level="application-interface">
+     <component id="lbstestproduct" name="LBS Test Product" introduced="9.2" purpose="development" filter="test">
+      <unit mrp="/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp" bldFile="/os/lbs/lbstest/lbstestproduct/group"/>
+     </component>
+     <component id="locationprotocoltest" name="Location Protocol Tests" introduced="9.2" purpose="development" class="plugin">
+      <unit bldFile="/os/lbs/lbstest/locationprotocoltest/group" mrp="/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
+     </component>
+    </collection>
+    <collection id="locationmgmt" name="Location Management" level="management">
+     <component id="locmonitor" name="Location Monitor" introduced="^3" purpose="optional">
+      <unit bldFile="/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group" mrp="/os/lbs/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp"/>
+     </component>
+     <component id="agpslocationmgr" name="A-GPS Location Manager" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
+     </component>
+     <component id="networklocationmgr" name="Network Location Manager" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/lbs/locationmgmt/networklocationmgr/group" mrp="/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
+     </component>
+     <component id="locationcore" name="Location Core" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/lbs/locationmgmt/locationcore/group" mrp="/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
+     </component>
+     <component id="networkgateway" name="Network Gateway" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/lbs/locationmgmt/networkgateway/group" mrp="/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
+     </component>
+    </collection>
+    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+     <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+     </component>
+     <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+     </component>
+     <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+      <unit bldFile="/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+     </component>
+     <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
+      <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+      <unit bldFile="/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
+     </component>
+     <component id="suplrrlpprotocol" filter="sf_build" name="SUPL RRLP Protocol Module">
+      <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+      <unit bldFile="/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
+     </component>
+    </collection>
+    <collection id="lbsapitest" name="Location API Tests" level="application-interface">
+     <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/lbs/lbsapitest/lbshaitest/group/lbshaitest.mrp" bldFile="/os/lbs/lbsapitest/lbshaitest/group"/>
+     </component>
+    </collection>
+    <collection id="lbs_info" name="Locating Services Info" level="application-interface">
+     <component id="lbs_metadata" name="Locating Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="commsfw" level="services" tech-domain="dc" name="Communications Framework" levels="server support framework process app-if">
+    <collection id="commsprocess" name="Comms Process" level="process">
+     <component id="commsrootserver" name="Comms Root Server" introduced="7.0s" purpose="mandatory">
+      <unit bldFile="/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+     </component>
+     <component id="commsrootserverconfig" name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
+      <unit mrp="/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp" bldFile="/os/commsfw/commsprocess/commsrootserverconfig/etc"/>
+     </component>
+    </collection>
+    <collection id="commsconfig" name="Comms Config" level="process">
+     <component id="commsdatabase" name="Comms Database" purpose="mandatory">
+      <unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+     </component>
+     <component id="commsdatabaseshim" name="Comms Database Shim" introduced="8.1" purpose="mandatory">
+      <unit bldFile="/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+     </component>
+    </collection>
+    <collection id="datacommsserver" name="Data Comms Server" level="framework">
+     <component id="esockserver" name="ESock Server" purpose="mandatory">
+      <unit version="3" bldFile="/os/commsfw/datacommsserver/esockserver/group" mrp="/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+     </component>
+     <component id="esockserverconfig" name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config" filter="test">
+      <unit version="3" mrp="/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" bldFile="/os/commsfw/datacommsserver/esockserver/etc"/>
+     </component>
+     <component id="networkingdialogapi" name="Networking Dialog API" introduced="6.1" purpose="optional">
+      <unit bldFile="/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+     </component>
+     <component id="networkingdialogstub" name="Networking Dialog Stub" introduced="6.1" purpose="optional">
+      <unit bldFile="/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
+     </component>
+     <component id="networkcontroller" name="Network Controller" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/commsfw/datacommsserver/networkcontroller/group" mrp="/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+     </component>
+    </collection>
+    <collection id="serialserver" name="Serial Server" level="server">
+     <component id="serialportcsy" name="Serial Port CSY" introduced="ER5" purpose="optional" class="plugin">
+      <unit bldFile="/os/commsfw/serialserver/serialportcsy" mrp="/os/commsfw/serialserver/serialportcsy/ser-comms_serialportcsy.mrp"/>
+     </component>
+     <component id="packetloopbackcsy" name="Packet Loopback CSY" introduced="8.1" purpose="development">
+      <unit bldFile="/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+     </component>
+     <component id="c32serialserver" name="C32 Serial Server" introduced="ER5" purpose="mandatory">
+      <unit bldFile="/os/commsfw/serialserver/c32serialserver/group" mrp="/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+     </component>
+     <component id="c32serialserverconfig" name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config">
+      <unit bldFile="/os/commsfw/serialserver/c32serialserverconfig" mrp="/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+     </component>
+     <component id="c32serialserverdocs" name="C32 Serial Server Documentation" purpose="development" class="doc">
+      <unit mrp="/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection id="commsfwutils" name="Comms Framework Utilities" level="framework">
+     <component id="commsbufs" name="Comms Buffers" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/commsfw/commsfwutils/commsbufs/group" mrp="/os/commsfw/commsfwutils/commsbufs/group/comms-infras_commsbufs.mrp"/>
+     </component>
+    </collection>
+    <collection id="commsfw_info" name="Comms Framework Info" level="app-if">
+     <component id="commsinfrastructuredocs" name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc">
+      <unit mrp="/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+     </component>
+     <component id="commsfw_metadata" name="Communications Framework Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
+     </component>
+    </collection>
+    <collection id="commsfwsupport" name="Comms Framework Support" level="support">
+     <component id="commselements" name="Comms Elements" introduced="8.0" purpose="mandatory">
+      <unit bldFile="/os/commsfw/commsfwsupport/commselements/group" mrp="/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+     </component>
+    </collection>
+    <collection id="commsinfrastructureapitest" name="Comms-Infras API Tests" level="app-if">
+     <component id="commsinfrastructuresvs" name="Comms Infrastructure Verification Suite" introduced="^3" purpose="development">
+      <unit mrp="/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
+     </component>
+    </collection>
+    <collection id="commsfwtools" name="Comms Framework Tools" level="app-if">
+     <component id="preparedefaultcommsdatabase" name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config" target="desktop">
+      <unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+     </component>
+     <component id="installdefaultcommsdatabase" name="Install Default Comms Database" purpose="mandatory" target="desktop">
+      <unit bldFile="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+     </component>
+     <component id="commstools" name="Comms Tools" introduced="^3" purpose="development" target="desktop">
+      <unit bldFile="/os/commsfw/commsfwtools/commstools/group" mrp="/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
+     <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
+      <unit bldFile="/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
+     </component>
+    </collection>
+    <collection id="tcpiputils" name="TCP/IP Utilities" level="plugin">
+     <component id="dnd" name="DND" introduced="7.0" purpose="mandatory">
+      <unit bldFile="/os/networkingsrv/tcpiputils/dnd/group" mrp="/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
+     </component>
+     <component id="dndconfig" name="DND Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
+      <unit mrp="/os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp" bldFile="/os/networkingsrv/tcpiputils/dnd/data"/>
+     </component>
+     <component id="dhcp" name="DHCP" introduced="8.0" purpose="optional">
+      <unit bldFile="/os/networkingsrv/tcpiputils/dhcp/group" mrp="/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
+     </component>
+     <component id="networkaddressandporttranslation" name="Network Address and Port Translation" introduced="^2" purpose="mandatory" class="plugin">
+      <unit bldFile="/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
+     </component>
+     <component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/networkingsrv/tcpiputils/punycodeconv/group" mrp="/os/networkingsrv/tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
+     </component>
+    </collection>
+    <collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
+     <component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+     </component>
+     <component id="genericscprparameters" name="Generic SCPR Parameters" introduced="^3" purpose="optional">
+      <unit bldFile="/os/networkingsrv/linklayercontrol/genericscprparameters/group" mrp="/os/networkingsrv/linklayercontrol/genericscprparameters/group/networking_genericscprparams.mrp"/>
+     </component>
+     <component id="mbmsparameters" name="MBMS Parameters" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/linklayercontrol/mbmsparameters/group" mrp="/os/networkingsrv/linklayercontrol/mbmsparameters/group/networking_mbmsparams.mrp"/>
+     </component>
+     <component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
+      <unit version="2" bldFile="/os/networkingsrv/linklayercontrol/networkinterfacemgr/group" mrp="/os/networkingsrv/linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+     </component>
+    </collection>
+    <collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
+     <component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+     </component>
+     <component id="ethernetpacketdriver" name="Ethernet Packet Driver" introduced="7.0" purpose="optional" class="plugin" filter="test">
+      <unit mrp="/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp" bldFile="/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group"/>
+     </component>
+     <component id="pppnif" name="PPP NIF" introduced="ER5" purpose="optional" class="plugin">
+      <unit version="2" bldFile="/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+     </component>
+     <component id="pppconfig" name="PPP Config" introduced="ER5" purpose="optional" class="config" filter="test">
+      <unit version="2" mrp="/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" bldFile="/os/networkingsrv/linklayerprotocols/pppnif/data"/>
+     </component>
+     <component id="slipnif" name="SLIP NIF" purpose="development" class="plugin">
+      <unit bldFile="/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+     </component>
+     <component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+     </component>
+    </collection>
+    <collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
+     <component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
+      <unit bldFile="/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
+     </component>
+    </collection>
+    <collection id="networkcontrol" name="Network Control" level="plugin">
+     <component id="qosfwconfig" name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" filter="test">
+      <unit mrp="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp" bldFile="/os/networkingsrv/networkcontrol/qosfwconfig/qos/data"/>
+     </component>
+     <component id="qoslib" name="QoS Library" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/networkingsrv/networkcontrol/qoslib/group" mrp="/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
+     </component>
+     <component id="pfqoslib" name="PF QoS Library" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
+     </component>
+     <component id="qosfwprt" name="QoS Framework PRT" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
+     </component>
+     <component id="qosipscpr" name="QoS IP SCPR" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/networkcontrol/qosipscpr/group" mrp="/os/networkingsrv/networkcontrol/qosipscpr/group/networking_qosipscpr.mrp"/>
+     </component>
+     <component id="ipnetworklayer" name="IP Network Layer" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/networkcontrol/ipnetworklayer/group" mrp="/os/networkingsrv/networkcontrol/ipnetworklayer/group/networking_ipproto.mrp"/>
+     </component>
+     <component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/networkcontrol/iptransportlayer/group" mrp="/os/networkingsrv/networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
+     </component>
+     <component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/networkingsrv/networkcontrol/commsuserpromptmgr/group" mrp="/os/networkingsrv/networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
+     </component>
+    </collection>
+    <collection id="networkprotocols" name="Network Protocols" level="plugin">
+     <component id="tcpipv4config" name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config" filter="test">
+      <unit mrp="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp" bldFile="/os/networkingsrv/networkprotocols/tcpipv4v6prt/data"/>
+     </component>
+     <component id="ipeventnotifier" name="IP Event Notifier" introduced="8.1" purpose="mandatory" class="plugin">
+      <unit bldFile="/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
+     </component>
+     <component id="tcpipv4v6prt" name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" class="plugin">
+      <unit bldFile="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
+     </component>
+     <component id="iphook" name="IP Hook" introduced="7.0" purpose="mandatory">
+      <unit bldFile="/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+     </component>
+     <component id="mobileip" name="Mobile IP" introduced="8.1" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/networkprotocols/mobileip/group" mrp="/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
+     </component>
+     <component id="dnsproxy" name="DNS Proxy" introduced="^3" purpose="optional">
+      <unit bldFile="/os/networkingsrv/networkprotocols/dnsproxy/group" mrp="/os/networkingsrv/networkprotocols/dnsproxy/group/networking_dnsproxy.mrp"/>
+     </component>
+    </collection>
+    <collection id="networksecurity" name="Network Security" level="framework">
+     <component id="tls" name="TLS" introduced="6.0" purpose="mandatory">
+      <unit bldFile="/os/networkingsrv/networksecurity/tls/group" mrp="/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+     </component>
+     <component id="tlsprovider" name="TLS Provider" introduced="8.1" purpose="mandatory">
+      <unit bldFile="/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
+     </component>
+     <component id="ipsec" name="IPsec" introduced="7.0" purpose="optional">
+      <unit bldFile="/os/networkingsrv/networksecurity/ipsec/group" mrp="/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
+     </component>
+    </collection>
+    <collection id="networkingtestandutils" name="Networking Test and Utils" level="app-if">
+     <component id="networkingunittest" name="Networking Unit Test" introduced="7.0" purpose="development" filter="test">
+      <unit mrp="/os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp" bldFile="/os/networkingsrv/networkingtestandutils/networkingunittest/group"/>
+     </component>
+     <component id="networkingexamples" name="Networking Examples" introduced="7.0" purpose="development">
+      <unit bldFile="/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
+     </component>
+     <component id="exampleinternetutilities" name="Example Internet Utilities" introduced="ER5" purpose="development" filter="test">
+      <unit mrp="/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp" bldFile="/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group"/>
+     </component>
+     <component id="ipprobe" name="IP Probe" introduced="7.0s" purpose="development" class="plugin" filter="test">
+      <unit mrp="/os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp" bldFile="/os/networkingsrv/networkingtestandutils/ipprobe/group"/>
+     </component>
+     <component id="ipv6to4tunnel" name="IPv6 to 4 Tunnel" purpose="development" class="plugin" filter="test">
+      <unit mrp="/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp" bldFile="/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group"/>
+     </component>
+     <component id="ipanalyzer" name="IP Analyzer" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+      <unit mrp="/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp" bldFile="/os/networkingsrv/networkingtestandutils/ipanalyzer/group"/>
+     </component>
+     <component id="networkingintegrationtest" name="Networking Integration Test" introduced="ER5" purpose="development">
+      <unit bldFile="/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
+     </component>
+     <component id="networkingperformancemeasurementtools" name="Networking Performance Measurement Tools" introduced="^3" purpose="development">
+      <unit bldFile="/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group" mrp="/os/networkingsrv/networkingtestandutils/networkingperformancemeasurementtools/group/networking_netperf.mrp"/>
+     </component>
+    </collection>
+    <collection id="networkingsrv_info" name="Networking Services Info" level="app-if">
+     <component id="networkingrom" name="Networking ROM" purpose="mandatory">
+      <!--  production component: contains the IBY files -->
+      <unit bldFile="/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
+     </component>
+     <component id="networkingdocs" name="Networking Documentation" purpose="development" class="doc">
+      <unit mrp="/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+     </component>
+     <component id="networkingsrv_metadata" name="Networking Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
+     </component>
+    </collection>
+    <collection id="pppcompressionplugins" name="PPP Compression Plugins" level="plugin">
+     <component id="predictorcompression" name="Predictor Compression" introduced="6.0" purpose="optional" class="plugin">
+      <unit bldFile="/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="wlan" level="services" tech-domain="dc" name="WLAN" levels="hw low mid high tools test">
+    <collection id="wlan_plat" name="WLAN Platform Interfaces" level="test">
+     <component id="wlan_dbif_api" name="WLAN DBIF API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_dbif_api/group"/>
+     </component>
+     <component id="wlan_hal_api" name="WLAN HAL API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_hal_api/group"/>
+     </component>
+     <component id="wlan_management_api" name="WLAN Management API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_management_api/group"/>
+     </component>
+     <component id="wlan_device_settings_api" name="WLAN Device Settings API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+     </component>
+     <component id="wlan_control_api" name="WLAN Control API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_control_api/group"/>
+     </component>
+     <component id="wlan_hw_initialization_data_api" name="WLAN Hardware Initialization Data API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+     </component>
+     <component id="wlan_power_save_plugin_api" name="WLAN Power Save Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+     </component>
+     <component id="wlan_info_api" name="WLAN Info API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_info_api/group"/>
+     </component>
+     <component id="wlan_agent_hotspot_plugin_api" name="WLAN Agent Hotspot Plug-in API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+     </component>
+     <component id="wlan_osa_api" name="WLAN OSA API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_osa_api/group"/>
+     </component>
+     <component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_spia_api/group"/>
+     </component>
+     <component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_hpa_api/group"/>
+     </component>
+     <component id="wlan_eapol_plugin_api" name="WLAN EAPOL Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+     </component>
+     <component id="wlan_generic_plugin_api" name="WLAN Generic Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+     </component>
+     <component id="wlan_aws_plugin_api" name="WLAN AWS Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+     </component>
+    </collection>
+    <collection id="wlan_pub" name="WLAN Public Interfaces" level="test">
+     <component id="wlan_sdk_info_api" name="WLAN SDK Info API" class="api" filter="s60">
+      <unit bldFile="/os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+     </component>
+    </collection>
+    <collection id="wlan_bearer" name="WLAN Bearer" level="hw">
+     <component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
+      <unit bldFile="/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
+     </component>
+     <component id="wlanagent" filter="s60" name="WLAN Agent">
+      <unit bldFile="/os/wlan/wlan_bearer/wlanagent/group"/>
+     </component>
+     <component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
+      <unit bldFile="/os/wlan/wlan_bearer/wlandbif_cd/group"/>
+     </component>
+     <!-- should follow component directory rules for stuff in wlan_symbian/ and put in a single component or split up properly -->
+     <component id="wlanengine" filter="s60" name="WLAN Engine">
+      <unit bldFile="/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
+     </component>
+     <component id="wlanldd" filter="s60" name="WLAN LDD">
+      <unit bldFile="/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
+     </component>
+     <component id="wlannwif" filter="s60" name="WLAN Network Interface">
+      <unit bldFile="/os/wlan/wlan_bearer/wlannwif/group"/>
+     </component>
+    </collection>
+    <collection id="wlanapitest" name="WLAN API Tests" level="test">
+     <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/wlan/wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="/os/wlan/wlanapitest/wlanhaitest/group"/>
+     </component>
+    </collection>
+    <collection id="wlan_info" name="WLAN Info" level="test">
+     <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
+     <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
+      <unit bldFile="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
+     </component>
+    </collection>
+    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+     <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
+     </component>
+    </collection>
+    <collection id="smsprotocols" name="SMS Protocols" level="framework">
+     <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
+      <unit bldFile="/os/cellularsrv/smsprotocols/smsstack/group" mrp="/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
+     </component>
+    </collection>
+    <collection id="telephonyprotocols" name="Telephony Protocols" level="framework">
+     <component id="csdagt" name="CSD AGT" introduced="6.1" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
+     </component>
+     <component id="psdagt" name="PSD AGT" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
+     </component>
+     <component id="gprsumtsqosprt" name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+     </component>
+     <component id="gprsumtsqosinterface" name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
+     </component>
+     <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
+     </component>
+     <component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
+     </component>
+     <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
+     </component>
+     <component id="pdplayer" name="PDP Layer" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/pdplayer/group" mrp="/os/cellularsrv/telephonyprotocols/pdplayer/group/networking_pdp.mrp"/>
+     </component>
+     <component id="rawipnif" name="Raw IP NIF" introduced="8.1" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
+     </component>
+    </collection>
+    <collection id="telephonyserver" name="Telephony Server" level="server">
+     <component id="etelserverandcore" name="ETel Server and Core" purpose="mandatory">
+      <unit bldFile="/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
+     </component>
+     <component id="etelconfig" name="ETel Config" purpose="mandatory" class="config" filter="test">
+      <unit mrp="/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp" bldFile="/os/cellularsrv/telephonyserver/etelserverandcore/data"/>
+     </component>
+     <component id="etelmultimode" name="ETel Multimode" introduced="7.0" purpose="mandatory">
+      <unit bldFile="/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+     </component>
+     <component id="etelpacketdata" name="ETel Packet Data" introduced="7.0" purpose="mandatory">
+      <unit bldFile="/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+     </component>
+     <component id="etelsimtoolkit" name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory">
+      <unit bldFile="/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
+     </component>
+    </collection>
+    <collection id="telephonyserverplugins" name="Telephony Server Plugins" level="plugin">
+     <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+     </component>
+     <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
+      <unit mrp="/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="/os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+     </component>
+     <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
+     </component>
+     <component id="simtsy" name="SIM TSY" introduced="7.0" purpose="development" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+     </component>
+     <component id="ctsydispatchlayer" name="C-TSY Dispatch Layer" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group" mrp="/os/cellularsrv/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp"/>
+     </component>
+     <component id="simatktsy" name="SIMATK TSY" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyserverplugins/simatktsy/group" mrp="/os/cellularsrv/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
+     </component>
+    </collection>
+    <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
+     <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
+      <unit bldFile="/os/cellularsrv/telephonyutils/dial/group" mrp="/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
+     </component>
+     <component id="telephonywatchers" name="Telephony Watchers" introduced="6.0" purpose="optional" class="plugin">
+      <unit bldFile="/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+     </component>
+     <component id="etel3rdpartyapi" name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
+      <unit bldFile="/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
+     </component>
+    </collection>
+    <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+     <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
+      <unit mrp="/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+     </component>
+     <component id="telephonydocs" name="Telephony Documentation" purpose="development" class="doc">
+      <unit mrp="/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+     </component>
+     <component id="cellularsrv_metadata" name="Cellular Baseband Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
+     </component>
+    </collection>
+    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+     <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
+      <unit bldFile="/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
+     </component>
+    </collection>
+    <collection id="cellularsrvapitest" name="Telephony API Tests" level="app-if">
+     <component id="datatransferhaitest" name="Data Transfer HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group/datatransferhaitest.mrp" bldFile="/os/cellularsrv/cellularsrvapitest/datatransferhaitest/group"/>
+     </component>
+     <component id="telephonyhaitest" name="Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group/telephonyhaitest.mrp" bldFile="/os/cellularsrv/cellularsrvapitest/telephonyhaitest/group"/>
+     </component>
+     <component id="telephonydevsoundhaitest" name="DevSound Telephony HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
+     <component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
+      <unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+     </component>
+     <component id="bluetooth_power_management_api" name="Bluetooth Power Management API" class="api" filter="s60">
+      <unit bldFile="/os/bt/bt_plat/bluetooth_power_management_api/group"/>
+     </component>
+     <component id="at_command_handler_plugin_api" name="AT Command Handler Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+     </component>
+    </collection>
+    <collection id="bluetooth" name="Bluetooth Core" level="framework">
+     <component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
+      <unit bldFile="/os/bt/bluetooth/btstack" mrp="/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
+     </component>
+     <component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
+      <unit bldFile="/os/bt/bluetooth/btcomm" mrp="/os/bt/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
+     </component>
+     <component id="btsdp" name="Bluetooth SDP" introduced="6.1" purpose="optional">
+      <unit bldFile="/os/bt/bluetooth/btsdp" mrp="/os/bt/bluetooth/btsdp/bluetooth_sdp.mrp"/>
+     </component>
+     <component id="btextnotifiers" name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional">
+      <unit bldFile="/os/bt/bluetooth/btextnotifiers" mrp="/os/bt/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
+     </component>
+     <component id="gavdp" name="Bluetooth GAVDP" introduced="8.1" purpose="optional">
+      <unit bldFile="/os/bt/bluetooth/gavdp/group" mrp="/os/bt/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
+     </component>
+     <component id="btexample" name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" filter="test">
+      <unit mrp="/os/bt/bluetooth/btexample/test/bluetooth_tests_examples.mrp" bldFile="/os/bt/bluetooth/btexample/test/group"/>
+     </component>
+     <component id="btlogger" name="Bluetooth Logging Engine" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/bt/bluetooth/btlogger/group" mrp="/os/bt/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
+     </component>
+     <component id="btdocs" name="Bluetooth Documentation" purpose="development" class="doc">
+      <unit mrp="/os/bt/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection id="bluetoothmgmt" name="Bluetooth Management" level="plugin">
+     <component id="btmgr" name="Bluetooth Manager" introduced="6.0" purpose="optional">
+      <unit bldFile="/os/bt/bluetoothmgmt/btmgr" mrp="/os/bt/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
+     </component>
+     <component id="btconfig" name="Bluetooth Config" purpose="optional" class="config">
+      <unit bldFile="/os/bt/bluetoothmgmt/btconfig" mrp="/os/bt/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
+     </component>
+     <component id="btrom" name="Bluetooth ROM" introduced="9.1" purpose="optional">
+      <unit bldFile="/os/bt/bluetoothmgmt/btrom" mrp="/os/bt/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
+     </component>
+     <component id="bluetoothclientlib" name="Bluetooth Client Library" introduced="6.0" purpose="optional">
+      <unit bldFile="/os/bt/bluetoothmgmt/bluetoothclientlib" mrp="/os/bt/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
+     </component>
+     <component id="btcommon" name="Bluetooth Build Utilities" purpose="optional" filter="test">
+      <unit mrp="/os/bt/bluetoothmgmt/btcommon/bluetooth_common.mrp" bldFile="/os/bt/bluetoothmgmt/btcommon"/>
+     </component>
+    </collection>
+    <collection id="bluetoothcommsprofiles" name="Bluetooth Comms Profiles" level="app-if">
+     <component id="btpan" name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" class="plugin">
+      <unit bldFile="/os/bt/bluetoothcommsprofiles/btpan/group" mrp="/os/bt/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
+     </component>
+    </collection>
+    <collection id="bthci" name="Host Controller Interface" level="server">
+     <component id="bthci2" name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional">
+      <unit bldFile="/os/bt/bthci/bthci2/group" mrp="/os/bt/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
+     </component>
+     <component id="hciextensioninterface" name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional">
+      <unit bldFile="/os/bt/bthci/hciextensioninterface" mrp="/os/bt/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
+     </component>
+     <component id="hci2implementations" name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" class="plugin">
+      <unit bldFile="/os/bt/bthci/hci2implementations/group" mrp="/os/bt/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
+     </component>
+    </collection>
+    <collection id="irda" name="IrDA" level="plugin">
+     <component id="irdastack" name="IrDA Stack" purpose="optional">
+      <unit bldFile="/os/bt/irda/irdastack/group" mrp="/os/bt/irda/irdastack/group/infra-red_irda.mrp"/>
+     </component>
+    </collection>
+    <collection id="bluetoothapitest" name="Bluetooth API Tests" level="app-if">
+     <component id="bluetoothsvs" name="Bluetooth Verification Suite" introduced="^3" purpose="development" filter="test">
+      <unit mrp="/os/bt/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp" bldFile="/os/bt/bluetoothapitest/bluetoothsvs/group"/>
+     </component>
+    </collection>
+    <collection id="atext" name="AT Extensions" level="server">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
+      <unit bldFile="/os/bt/atext/group"/>
+     </component>
+    </collection>
+    <collection id="bt_info" name="Bluetooth Info" level="app-if">
+     <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+      <unit mrp="/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="usb" level="services" tech-domain="de" name="USB" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
+     <component id="usb_audio_stream_plugin_api" name="USB Audio Stream Plugin API" class="api" filter="s60">
+      <unit bldFile="/os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
+     </component>
+    </collection>
+    <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
+     <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
+    </collection>
+    <collection id="usbmgmt" name="USB Management" level="server">
+     <component id="usbmgr" name="USB Manager" purpose="optional">
+      <unit version="2" bldFile="/os/usb/usbmgmt/usbmgr/group" mrp="/os/usb/usbmgmt/usbmgr/group/usb_manager.mrp"/>
+     </component>
+     <component id="usbmgrtest" name="USB Manager Tests" introduced="7.0" purpose="development" filter="test">
+      <unit version="2" mrp="/os/usb/usbmgmt/usbmgrtest/group/usb_test.mrp" bldFile="/os/usb/usbmgmt/usbmgrtest/group"/>
+     </component>
+     <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
+      <unit mrp="/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection id="usb_info" name="USB Info" level="app-if">
+     <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+      <unit mrp="/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+    <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
+     <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_pub/audio_effects_api/group"/>
+     </component>
+     <component id="audio_effects_presets_api" name="Audio Effects Presets API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_pub/audio_effects_presets_api/group"/>
+     </component>
+     <component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_pub/drm_audio_player_api/group"/>
+     </component>
+     <component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
+     </component>
+    </collection>
+    <collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
+     <component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/aac_decoder_config_api/group"/>
+     </component>
+     <component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
+     </component>
+     <component id="aac_decoder_config_proxy_api" name="AAC Decoder Config Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+     </component>
+     <component id="added_devsound_control_api" name="Added DevSound Control API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/added_devsound_control_api/group"/>
+     </component>
+     <component id="added_devsound_control_msg_hdlr_api" name="Added DevSound Control Msg Hdlr API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+     </component>
+     <component id="added_devsound_control_proxy_api" name="Added DevSound Control Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+     </component>
+     <component id="audio_effects_msg_hdlr_api" name="Audio Effects Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+     </component>
+     <component id="audio_effects_proxy_api" name="Audio Effects Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/audio_effects_proxy_api/group"/>
+     </component>
+     <component id="audio_policy_header_api" name="Audio Policy Header API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/audio_policy_header_api/group"/>
+     </component>
+     <component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/audio_routing_api/group"/>
+     </component>
+     <component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
+     </component>
+     <component id="audio_routing_proxy_api" name="Audio Routing Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/audio_routing_proxy_api/group"/>
+     </component>
+     <component id="custom_interface_builder_api" name="Custom Interface Builder API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/custom_interface_builder_api/group"/>
+     </component>
+     <component id="custom_interface_message_handler_factory_api" name="Custom Interface Message Handler Factory API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+     </component>
+     <component id="custom_interface_proxy_factory_api" name="Custom Interface Proxy Factory API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
+     </component>
+     <component id="custom_interface_utility_api" name="Custom Interface Utility API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/custom_interface_utility_api/group"/>
+     </component>
+     <component id="devsound_adaptation_api" name="DevSound Adaptation API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/devsound_adaptation_api/group"/>
+     </component>
+     <component id="display_posting_api" name="Display Posting API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/display_posting_api/group"/>
+     </component>
+     <component id="eaac_plus_decoder_interface_api" name="eAAC Plus Decoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
+     </component>
+     <component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="eaac_plus_decoder_interface_proxy_api" name="eAAC Plus Decoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
+     </component>
+     <component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/error_concealment_interface_api/group"/>
+     </component>
+     <component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="error_concealment_interface_proxy_api" name="Error Concealment Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
+     </component>
+     <component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+     </component>
+     <component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g711_decoder_interface_api/group"/>
+     </component>
+     <component id="g711_decoder_interface_msg_hdlr_api" name="G711 Decoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="g711_decoder_interface_proxy_api" name="G711 Decoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
+     </component>
+     <component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g711_encoder_interface_api/group"/>
+     </component>
+     <component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="g711_encoder_interface_proxy_api" name="G711 Encoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
+     </component>
+     <component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g729_decoder_interface_api/group"/>
+     </component>
+     <component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="g729_decoder_interface_proxy_api" name="G729 Decoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
+     </component>
+     <component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g729_encoder_interface_api/group"/>
+     </component>
+     <component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
+     </component>
+     <component id="g729_encoder_interface_msg_hdlr_api" name="G729 Encoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/global_audio_settings_api/group"/>
+     </component>
+     <component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/global_audio_settings_definition_api/group"/>
+     </component>
+     <component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+     </component>
+     <component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="ilbc_decoder_interface_proxy_api" name="Ilbc Decoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
+     </component>
+     <component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+     </component>
+     <component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="ilbc_encoder_interface_proxy_api" name="Ilbc Encoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+     </component>
+     <component id="mdf_plugin_uids" name="MDF Plug-in UIDs" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/mdf_plugin_uids/group"/>
+     </component>
+     <component id="multimedia_fourcc_definitions_api" name="Multimedia FourCC Definitions API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+     </component>
+     <component id="nokia_audio_policy_header_api" name="Nokia Audio Policy Header API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+     </component>
+     <component id="nokia_multimedia_fourcc_definitions_api" name="Nokia Multimedia Fourcc Definitions API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
+     </component>
+     <component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+     </component>
+     <component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 Decoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="ra8_decoder_interface_proxy_api" name="RA8 Decoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
+     </component>
+     <component id="rds_adaptation_api" name="RDS Adaptation API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/rds_adaptation_api/group"/>
+     </component>
+     <component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/restricted_audio_output_api/group"/>
+     </component>
+     <component id="restricted_audio_output_msg_hdlr_api" name="Restricted Audio Output Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
+     </component>
+     <component id="restricted_audio_output_proxy_api" name="Restricted Audio Output Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
+     </component>
+     <component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+     </component>
+     <component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="sbc_encoder_interface_proxy_api" name="SBC Encoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+     </component>
+     <component id="secure_output_mdf_custom_interface" name="Secure Output MDF Custom Interface" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
+     </component>
+     <component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/speech_encoder_config_api/group"/>
+     </component>
+     <component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
+     </component>
+     <component id="speech_encoder_config_proxy_api" name="Speech Encoder Config Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+     </component>
+     <component id="telephony_audio_routing_client_api" name="Telephony Audio Routing Client API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+     </component>
+     <component id="telephony_audio_routing_manager_api" name="Telephony Audio Routing Manager API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+     </component>
+     <component id="video_buffer_management_mdf_custom_interface" name="Video Buffer Management MDF Custom Interface" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+     </component>
+     <component id="video_decoder_rotation_mdf_custom_interface" name="Video Decoder Rotation MDF Custom Interface" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+     </component>
+     <component id="video_decoder_scaling_mdf_custom_interface" name="Video Decoder Scaling MDF Custom Interface" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+     </component>
+     <component id="video_reclaim_extbuffers_ci" name="Video Reclaim Extbuffers Custom Interface" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+     </component>
+     <component id="video_window_control_custom_interface" name="Video Window Control Custom Interface" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/video_window_control_custom_interface/group"/>
+     </component>
+     <component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/wma_decoder_interface_api/group"/>
+     </component>
+     <component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component id="wma_decoder_interface_proxy_api" name="WMA Decoder Interface Proxy API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+     </component>
+     <component id="eaacplusutil_api" name="EAac Plus Util API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/eaacplusutil_api/group"/>
+     </component>
+     <component id="frametable_api" name="Frametable API" class="api" filter="s60">
+      <unit bldFile="/os/mm/mm_plat/frametable_api/group"/>
+     </component>
+    </collection>
+    <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
+     <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
+      <unit bldFile="/os/mm/devsoundextensions/drmaudioplayer/group"/>
+     </component>
+     <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
+      <unit bldFile="/os/mm/devsoundextensions/mmextfw/group"/>
+     </component>
+     <component id="audiorouting" filter="s60" name="Audio Routing">
+      <unit bldFile="/os/mm/devsoundextensions/audiorouting/group"/>
+     </component>
+     <component id="effects" filter="s60" name="Effects">
+      <unit bldFile="/os/mm/devsoundextensions/effects/group"/>
+     </component>
+     <component id="effectspresets" filter="s60" name="Effects Presets">
+      <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
+     </component>
+     <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
+      <!-- need to #include the lot from a single bld.inf
+      		Also move to a standard component location, not under effectspresets -->
+      <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
+      <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
+      <unit bldFile="/os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
+     </component>
+     <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
+      <unit bldFile="/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
+     </component>
+     <component id="mmfcustominterfaces" filter="s60" name="MMF Custom Interfaces">
+      <unit bldFile="/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
+     </component>
+     <component id="addeddevsoundcontrol" filter="s60" name="Added DevSound Control">
+      <unit bldFile="/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
+     </component>
+     <component id="globalaudiosettings" filter="s60" name="Global Audio Settings">
+      <unit bldFile="/os/mm/devsoundextensions/globalaudiosettings/group"/>
+     </component>
+     <component id="restrictedaudiooutput" filter="s60" name="Restricted Audio Output">
+      <unit bldFile="/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
+     </component>
+     <component id="ciextnfactoryplugins" filter="s60" name="Custom Interface Extension Factory Plugins" class="plugin">
+      <unit bldFile="/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
+     </component>
+    </collection>
+    <collection id="mdfdevvideoextensions" name="MDF Dev Video Extensions" level="device-fw">
+     <component id="nga_mdf_postprocessor" name="NGA MDF Postprocessor" filter="s60">
+      <unit bldFile="/os/mm/mdfdevvideoextensions/nga_mdf_postprocessor/group"/>
+     </component>
+    </collection>
+    <collection id="audio" name="Audio Codecs" level="middleware">
+     <component id="arm_cmmf_codecs" filter="s60" name="ARM CMMF Codecs" class="plugin">
+      <unit bldFile="/os/mm/audio/arm_cmmf_codecs/group"/>
+     </component>
+    </collection>
+    <collection id="video" name="Video Codecs" level="middleware">
+     <!-- empty -->
+    </collection>
+    <collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
+     <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+      <unit bldFile="/os/mm/imagingandcamerafws/imagingfws/group" mrp="/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
+     </component>
+     <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+      <unit mrp="/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="/os/mm/imagingandcamerafws/imagingunittest/group"/>
+     </component>
+     <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+      <unit mrp="/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="/os/mm/imagingandcamerafws/imaginginttest/group"/>
+     </component>
+     <component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/mm/imagingandcamerafws/camerafw/group" mrp="/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
+     </component>
+     <component id="cameraunittest" name="Camera Unit Tests" introduced="9.2" purpose="development" filter="test">
+      <unit mrp="/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp" bldFile="/os/mm/imagingandcamerafws/cameraunittest/group"/>
+     </component>
+    </collection>
+    <collection id="mmlibs" name="Multimedia Libraries" level="middleware">
+     <component id="mmutilitylib" name="Multimedia Utility Library" introduced="8.1" purpose="mandatory">
+      <unit bldFile="/os/mm/mmlibs/mmutilitylib/group" mrp="/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
+     </component>
+     <component id="mmfw" name="Multimedia Framework" introduced="7.0s" purpose="mandatory">
+      <unit bldFile="/os/mm/mmlibs/mmfw/group" mrp="/os/mm/mmlibs/mmfw/group/multimedia_mmf.mrp"/>
+     </component>
+    </collection>
+    <collection id="mmplugins" name="Multimedia Plugins" level="middleware">
+     <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/mm/mmplugins/imagingplugins/group" mrp="/os/mm/mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+     </component>
+     <component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/mm/mmplugins/cameraplugins/group" mrp="/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
+     </component>
+     <component id="lib3gp" name="3GP Library" introduced="^2" purpose="optional">
+      <unit bldFile="/os/mm/mmplugins/lib3gp/group" mrp="/os/mm/mmplugins/lib3gp/group/multimedia_3gplibrary.mrp"/>
+     </component>
+     <component id="lib3gpunittest" name="3GP Unit Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmplugins/lib3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp" bldFile="/os/mm/mmplugins/lib3gpunittest/group"/>
+     </component>
+     <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/mm/mmplugins/mmfwplugins/group" mrp="/os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
+     </component>
+    </collection>
+    <collection id="mm_info" name="Multimedia Info" level="app-if">
+     <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
+      <unit mrp="/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+     </component>
+     <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
+      <unit bldFile="/os/mm/tsrc/group"/>
+     </component>
+     <component id="mm_metadata" name="Multimedia Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
+     </component>
+    </collection>
+    <collection id="mmresourcemgmt" name="Multimedia Resource Management" level="middleware">
+     <component id="mmresctrl" name="Multimedia Resource Controller" introduced="^2" purpose="development">
+      <unit bldFile="/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+     </component>
+    </collection>
+    <collection id="mmdevicefw" name="Multimedia Device Framework" level="device-fw">
+     <component id="mdf" name="Media Device Framework" introduced="9.2" purpose="mandatory">
+      <unit bldFile="/os/mm/mmdevicefw/mdf/group" mrp="/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
+     </component>
+     <component id="mdfunittest" name="MDF Unit Tests" introduced="9.2" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp" bldFile="/os/mm/mmdevicefw/mdfunittest/group"/>
+     </component>
+     <component id="speechrecogsupport" name="Speech Recognition Support" introduced="7.0s" purpose="mandatory">
+      <unit bldFile="/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
+     </component>
+    </collection>
+    <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+     <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
+      <unit bldFile="/os/mm/mmswadaptation/videorenderer/group" mrp="/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+     </component>
+    </collection>
+    <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
+     <component id="mmtestfw" name="Multimedia Test Framework" introduced="7.0s" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp" bldFile="/os/mm/mmtestenv/mmtestfw/group"/>
+     </component>
+     <component id="mmtestfwunittest" name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp" bldFile="/os/mm/mmtestenv/mmtestfwunittest/group"/>
+     </component>
+     <component id="mmtestagent" name="Multimedia Test Agent" introduced="8.0" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp" bldFile="/os/mm/mmtestenv/mmtestagent/group"/>
+     </component>
+     <component id="mmtesttools" name="Multimedia Test Tools" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="/os/mm/mmtestenv/mmtesttools/Group"/>
+     </component>
+    </collection>
+    <collection id="omxil" name="OpenMAX IL" level="hw-if">
+     <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
+      <unit version="1" bldFile="/os/mm/omxil/omxilapi/group" mrp="/os/mm/omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
+     </component>
+     <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
+      <unit version="1" bldFile="/os/mm/omxil/omxilcore/group" mrp="/os/mm/omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
+     </component>
+     <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+      <unit version="1" bldFile="/os/mm/omxil/omxilcomponentcommon/group" mrp="/os/mm/omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
+     </component>
+     <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
+      <unit version="1" bldFile="/os/mm/omxil/omxilrefcomps/ref_components/group" mrp="/os/mm/omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
+     </component>
+     <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
+      <unit mrp="/os/mm/omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="/os/mm/omxil/omxilunittest/group"/>
+     </component>
+     <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
+      <unit mrp="/os/mm/omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="/os/mm/omxil/omxilcoreconftest/group"/>
+     </component>
+     <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
+      <unit bldFile="/os/mm/omxil/mmilapi/group" mrp="/os/mm/omxil/mmilapi/group/multimedia_il_api.mrp"/>
+     </component>
+    </collection>
+    <collection id="devsound" name="Sound Device" level="devices">
+     <component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
+      <unit bldFile="/os/mm/devsound/devsoundapi/group" mrp="/os/mm/devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
+     </component>
+     <component id="a3fdevsound" name="A3F DevSound" introduced="^2" purpose="optional">
+      <unit bldFile="/os/mm/devsound/a3fdevsound/group" mrp="/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
+     </component>
+     <component id="a3facf" name="A3F Audio Component Framework" introduced="^2" purpose="optional">
+      <unit bldFile="/os/mm/devsound/a3facf/group" mrp="/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
+     </component>
+     <component id="devsoundpluginsupport" name="DevSound Plugin Support" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/mm/devsound/devsoundpluginsupport/group" mrp="/os/mm/devsound/devsoundpluginsupport/group/multimedia_mdf_devsound_pluginsupport.mrp"/>
+     </component>
+     <component id="refdevsound" name="Reference DevSound Plugins" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/mm/devsound/devsoundrefplugin/group" mrp="/os/mm/devsound/devsoundrefplugin/group/multimedia_mdf_devsound_refplugin.mrp"/>
+     </component>
+     <component id="btdevsound" name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" class="plugin">
+      <unit bldFile="/os/mm/devsound/sounddevbt/group" mrp="/os/mm/devsound/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
+     </component>
+     <component id="a3ftrace" name="A3F Trace Utility" introduced="^2" purpose="development">
+      <unit bldFile="/os/mm/devsound/a3ftrace/group" mrp="/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
+     </component>
+     <component id="a3fintegrationtest" name="A3F Integration Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp" bldFile="/os/mm/devsound/a3fintegrationtest/group"/>
+     </component>
+     <component id="a3fsrvstart" name="A3F Server Start" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/os/mm/devsound/a3fsrvstart/group" mrp="/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
+     </component>
+    </collection>
+    <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+     <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/mm/devsound/hwdevapi/group" mrp="/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
+     </component>
+     <component id="a3facl" name="A3F Audio Component Library" introduced="^2" purpose="development">
+      <unit bldFile="/os/mm/mmhais/a3facl/group" mrp="/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
+     </component>
+     <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional">
+      <unit bldFile="/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+     </component>
+     <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional">
+      <unit bldFile="/os/mm/mmhais/refacladapt/group" mrp="/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+     </component>
+     <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory">
+      <unit bldFile="/os/mm/mmhais/videohai/group" mrp="/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
+     </component>
+     <component id="dvbhreceiverhai" name="Mobile TV DVB-H Receiver HAI" introduced="^2" purpose="optional">
+      <unit bldFile="/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
+     </component>
+     <component id="dvbhunittest" name="Mobile TV DVB-H Unit Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="/os/mm/mmhais/dvbhunittest/hai/dvbh/group"/>
+     </component>
+    </collection>
+    <collection id="mmapitest" name="Multimedia API Tests" level="app-if">
+     <component id="mmsvs" name="Multimedia Verification Suite" introduced="^2" purpose="development">
+      <unit mrp="/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
+     </component>
+     <component id="devvideohaitest" name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="/os/mm/mmapitest/devvideohaitest/group"/>
+     </component>
+     <component id="devsoundhaitest" name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="/os/mm/mmapitest/devsoundhaitest/group"/>
+     </component>
+     <component id="devsoundexthaitest" name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="/os/mm/mmapitest/devsoundexthaitest/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+    <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
+     <component id="exif_api" name="Exif API" class="api" filter="s60">
+      <unit bldFile="/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+      <unit bldFile="/os/imagingext/imagingext_pub/exif_api/tsrc/group" filter="test,api_test"/>
+     </component>
+    </collection>
+    <collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
+     <component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
+      <unit bldFile="/os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+     </component>
+     <component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
+      <unit bldFile="/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+      <unit bldFile="/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
+      <unit bldFile="/os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+     </component>
+     <component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
+      <unit bldFile="/os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+     </component>
+     <component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
+      <unit bldFile="/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+     </component>
+     <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
+      <unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+     </component>
+    </collection>
+    <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+     <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+      <unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
+     </component>
+     <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
+      <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
+      <unit bldFile="/os/imagingext/imageadaptationextensions/group"/>
+     </component>
+    </collection>
+    <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
+     <component id="exiflib" filter="s60" name="Exif Library">
+      <unit bldFile="/os/imagingext/imagingmodules/exiflib/group"/>
+     </component>
+     <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
+      <unit bldFile="/os/imagingext/imagingmodules/jp2kcodec/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+    <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+     <component id="vgi" filter="s60" name="VGI">
+      <unit bldFile="/os/graphics/graphicsaccelaration/vgi/group"/>
+     </component>
+    </collection>
+    <collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
+     <component id="m3gcore11" filter="s60" name="M3G Core 1.1">
+      <unit bldFile="/os/graphics/m3g/m3gcore11/group"/>
+     </component>
+    </collection>
+    <collection id="graphicsresourceservices" name="Graphics Resource Services" level="engines">
+     <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
+     </component>
+     <component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphicsutils" name="Graphics Utils" level="engines">
+     <component id="commongraphicsheaders" name="Common Graphics Headers" introduced="^3" purpose="mandatory">
+      <unit bldFile="/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+     <!-- displayldd to be moved here -->
+     <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphicscomposition" name="Graphics Composition" level="engines">
+     <component id="openwfcinterface" name="OpenWF Composition Interface" introduced="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicscomposition/openwfcinterface/group" mrp="/os/graphics/graphicscomposition/openwfcinterface/group/graphics_openwfcinterface.mrp"/>
+     </component>
+     <component id="openwfcompositionengine" name="OpenWF Composition Engine" introduced="^3" purpose="development">
+      <unit bldFile="/os/graphics/graphicscomposition/openwfcompositionengine/group" mrp="/os/graphics/graphicscomposition/openwfcompositionengine/group/graphics_openwfcompositionengine.mrp"/>
+     </component>
+     <component id="openwfsupport" name="OpenWF Support" introduced="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicscomposition/openwfsupport/group" mrp="/os/graphics/graphicscomposition/openwfsupport/group/graphics_openwfsupport.mrp"/>
+     </component>
+     <component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicscomposition/surfaceupdate/group" mrp="/os/graphics/graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphicstest" name="Graphics Test" level="app-if">
+     <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
+      <unit mrp="/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="/os/graphics/graphicstest/graphicstestharness/group"/>
+     </component>
+     <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
+      <unit bldFile="/os/graphics/graphicstest/uibench/group" mrp="/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphics_plat" name="Graphics Platform Interfaces" level="app-if">
+     <component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
+      <unit bldFile="/os/graphics/graphics_plat/m3g_core_api/group"/>
+     </component>
+    </collection>
+    <collection id="graphics_info" name="Graphics Info" level="app-if">
+     <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
+      <unit mrp="/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+     </component>
+     <component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
+     </component>
+    </collection>
+    <collection id="windowing" name="Windowing" level="app-if">
+     <component id="windowserver" name="Window Server" purpose="mandatory">
+      <unit bldFile="/os/graphics/windowing/windowserver/group" mrp="/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+     </component>
+     <component id="windowserverplugins" name="Window Server Plugins" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/graphics/windowing/windowserverplugins/group" mrp="/os/graphics/windowing/windowserverplugins/group/graphics_wserv_std_plugins.mrp"/>
+     </component>
+    </collection>
+    <collection id="printingservices" name="Printing Services" level="app-if">
+     <component id="printerdriversupport" name="Printer Driver Support" purpose="optional">
+      <unit bldFile="/os/graphics/printingservices/printerdriversupport/group" mrp="/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+     </component>
+     <component id="printerdrivers" name="Printer Drivers" purpose="optional" class="plugin">
+      <unit bldFile="/os/graphics/printingservices/printerdrivers/group" mrp="/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+     </component>
+    </collection>
+    <collection id="fbs" name="Font and Bitmap Server" level="device-interface">
+     <component id="fontandbitmapserver" name="Font and Bitmap Server" purpose="mandatory">
+      <unit bldFile="/os/graphics/fbs/fontandbitmapserver/group" mrp="/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+     </component>
+    </collection>
+    <collection id="opengles" name="OpenGLES" level="internal-adaptations">
+     <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional">
+      <unit bldFile="/os/graphics/opengles/openglesinterface/group" mrp="/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+     </component>
+     <component id="opengles_stub" filter="sf_build" name="OpenGL ES Stub" purpose="optional" introduced="^2">
+      <unit bldFile="/os/graphics/opengles/openglesinterface/group/opengles_stub"/>
+     </component>
+    </collection>
+    <collection id="openvg" name="OpenVG" level="internal-adaptations">
+     <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional">
+      <unit bldFile="/os/graphics/openvg/openvginterface/group" mrp="/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+     </component>
+     <component id="openvg11" filter="s60" name="OpenVG 1.1">
+      <!-- this needs to be moved to it's own component directory, ie openvg/openvg11 -->
+      <unit bldFile="/os/graphics/openvg/openvginterface/group/openvg11"/>
+     </component>
+     <component id="sfopenvg" filter="sf_build" name="Khronos OpenVG Reference Implementation" introduced="^2" purpose="optional">
+      <unit bldFile="/os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
+     </component>
+    </collection>
+    <collection id="egl" name="EGL" level="internal-adaptations">
+     <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="optional">
+      <unit bldFile="/os/graphics/egl/eglinterface/group" mrp="/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
+     </component>
+     <component id="eglswitch" name="EGL Switch" introduced="^3" purpose="optional">
+      <unit bldFile="/os/graphics/egl/eglswitch/group" mrp="/os/graphics/egl/eglswitch/group/graphics_eglswitch.mrp"/>
+     </component>
+     <component id="eglrefimpl" name="EGL Reference Implementation" introduced="^3" purpose="optional">
+      <unit bldFile="/os/graphics/egl/eglrefimpl/group" mrp="/os/graphics/egl/eglrefimpl/group/graphics_eglrefimpl.mrp"/>
+     </component>
+     <component id="egltest" name="EGL Tests" introduced="^3" purpose="development">
+      <unit bldFile="/os/graphics/egl/egltest/group" mrp="/os/graphics/egl/egltest/group/graphics_egltest.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphicsdeviceinterface" name="Graphics Device Interface" level="device-interface">
+     <component id="gdi" name="GDI" purpose="mandatory">
+      <unit bldFile="/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
+     </component>
+     <component id="bitgdi" name="BitGDI" purpose="mandatory">
+      <unit bldFile="/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+     </component>
+     <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+     </component>
+     <component id="screendriver" name="Screen Driver" introduced="6.1" purpose="optional" class="plugin">
+      <unit bldFile="/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+     </component>
+     <component id="directgdi" name="DirectGDI" introduced="^3" deprecated="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicsdeviceinterface/directgdi/group" mrp="/os/graphics/graphicsdeviceinterface/directgdi/group/graphics_directgdi.mrp"/>
+     </component>
+     <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
+     </component>
+     <component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+      <unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
+     <component id="gdi_tools" name="GDI Tools" purpose="development" target="desktop">
+      <unit bldFile="/os/graphics/graphicstools/gdi_tools/group" mrp="/os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+     </component>
+    </collection>
+    <collection id="graphicsapitest" name="Graphics API Tests" level="app-if">
+     <component id="graphicssvs" name="Graphics Verification Suite" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp" bldFile="/os/graphics/graphicsapitest/graphicssvs/group"/>
+     </component>
+     <component id="screendriverhaitest" name="Screen Driver HAI Tests" introduced="^2" purpose="development" filter="test">
+      <unit mrp="/os/graphics/graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="/os/graphics/graphicsapitest/screendriverhaitest/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="textandloc" level="services" tech-domain="ui" name="Text and Localisation Services" levels="encoding util fonts tools text">
+    <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
+     <component id="findutil_api" name="Find Utility API" class="api" filter="s60">
+      <unit bldFile="/os/textandloc/textandloc_plat/findutil_api/group"/>
+     </component>
+     <component id="japanese_language_utilities_api" name="Japanese Language Utilities API" class="api" filter="s60">
+      <unit bldFile="/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+     </component>
+     <component id="sortutil_api" name="Sorting Utility API" class="api" filter="s60">
+      <unit bldFile="/os/textandloc/textandloc_plat/sortutil_api/group"/>
+     </component>
+    </collection>
+    <collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
+     <component id="directory_localizer_api" name="Directory Localizer API" class="api" filter="s60">
+      <unit bldFile="/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+     </component>
+    </collection>
+    <collection id="charconvfw" name="Character Conversion" level="encoding">
+     <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
+      <unit bldFile="/os/textandloc/charconvfw/charconv_fw/group" mrp="/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+     </component>
+     <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
+      <unit bldFile="/os/textandloc/charconvfw/charconvplugins/group" mrp="/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
+     </component>
+     <component id="fatfilenameconversionplugins" name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" class="plugin">
+      <unit bldFile="/os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="/os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
+     </component>
+    </collection>
+    <collection id="fontandtxtsrv" name="Font and Text Services" level="fonts">
+     <component id="iculayoutengine" name="ICU Layout Engine" introduced="9.2" purpose="optional" class="plugin">
+      <unit bldFile="/os/textandloc/fontservices/textshaperplugin/group" mrp="/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
+     </component>
+     <component id="fontstore" name="Font Store" purpose="mandatory">
+      <unit bldFile="/os/textandloc/fontservices/fontstore/group" mrp="/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+     </component>
+     <component id="textrendering" name="Text Rendering" purpose="mandatory">
+      <!-- placeholder for text code from GDI -->
+     </component>
+     <component id="freetypefontrasteriser" name="FreeType Font Rasteriser" purpose="optional" class="plugin">
+      <unit bldFile="/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
+     </component>
+     <component id="referencefonts" name="Reference Fonts" introduced="6.0" purpose="optional">
+      <unit bldFile="/os/textandloc/fontservices/referencefonts/group" mrp="/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
+     </component>
+    </collection>
+    <collection id="textlayout" name="Text Layout" level="text">
+     <component id="texthandling" name="Text Handling" purpose="optional">
+      <unit bldFile="/os/textandloc/textrendering/texthandling/group" mrp="/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
+     </component>
+     <component id="textformatting" name="Text Formatting" purpose="optional">
+      <unit bldFile="/os/textandloc/textrendering/textformatting/group" mrp="/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
+     </component>
+     <component id="word" name="Word" purpose="development" filter="test">
+      <unit mrp="/os/textandloc/textrendering/word/group/app-framework_word.mrp" bldFile="/os/textandloc/textrendering/word/group"/>
+     </component>
+    </collection>
+    <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
+     <!-- components in this collection need to be moved to the right collection.
+    		Either move into the units' directories, or create a new textandlocutils directory -->
+     <component id="numbergrouping" filter="s60" name="Number Grouping">
+      <unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
+     </component>
+     <component id="jplangutil" filter="s60" name="Japanese Language Utilities">
+      <unit bldFile="/os/textandloc/charconvfw/jplangutil/group"/>
+     </component>
+     <component id="sortutil" filter="s60" name="Sorting Utility">
+      <unit bldFile="/os/textandloc/charconvfw/sortutil/group"/>
+     </component>
+     <component id="inlinetext" filter="s60" name="Inline Text">
+      <unit bldFile="/os/textandloc/charconvfw/inlinetext/group"/>
+     </component>
+     <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+      <!-- placeholder for split from bafl -->
+     </component>
+     <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/textandloc/textrendering/numberformatting/group" mrp="/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+     </component>
+    </collection>
+    <collection id="localesupport" name="Locale Support" level="util">
+     <component id="reflocales" name="Reference Locales" purpose="optional" class="plugin">
+      <unit bldFile="/os/textandloc/localisation/localesupport" mrp="/os/textandloc/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+     </component>
+     <component id="initlocale" name="Initialise Locale" introduced="^2" purpose="mandatory">
+      <!-- placeholder for split from bafl -->
+     </component>
+    </collection>
+    <collection id="textandloctools" name="Text and Localisation Tools" level="tools">
+     <component id="fontcompiler" name="Font Compiler" purpose="development" target="desktop">
+      <!-- placeholder for split from GDI Tools -->
+     </component>
+     <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
+      <unit bldFile="/os/graphics/graphicstools/bitmapfonttools/group" mrp="/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
+     </component>
+    </collection>
+    <collection id="textandloc_info" name="Text and Localisation Info" level="text">
+     <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
+    <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
+     <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
+      <!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
+	  Remove this component and uncomment the other units when fixed-->
+      <unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
+     </component>
+     <component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
+      <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+     </component>
+     <component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
+      <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+     </component>
+     <component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
+      <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+     </component>
+    </collection>
+    <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
+     <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
+      <unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
+     </component>
+     <component id="xmlsec" filter="s60" name="XML Security">
+      <unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
+     </component>
+     <component id="xmlseccrypto" filter="s60" name="XML Security Crypto">
+      <unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
+     </component>
+     <component id="xmlsecwrapper" filter="s60" name="XML Security Wrapper">
+      <unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
+     </component>
+    </collection>
+    <collection id="xml" name="XML" level="generic">
+     <component id="xmlfw" name="XML Framework" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/xmlsrv/xml/xmlfw/group" mrp="/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
+     </component>
+     <component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
+      <unit bldFile="/os/xmlsrv/xml/libxml2libs/group" mrp="/os/xmlsrv/xml/libxml2libs/group/syslibs_libxml2.mrp"/>
+     </component>
+     <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
+      <unit bldFile="/os/xmlsrv/xml/legacyminidomparser/GROUP" mrp="/os/xmlsrv/xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp"/>
+     </component>
+     <component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
+      <unit bldFile="/os/xmlsrv/xml/xmldomandxpath/group" mrp="/os/xmlsrv/xml/xmldomandxpath/group/syslibs_xmldom.mrp"/>
+     </component>
+     <component id="xmlexpatparser" name="XML Expat Parser" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/xmlsrv/xml/xmlexpatparser/group" mrp="/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
+     </component>
+     <component id="xmllibxml2parser" name="XML Libxml2 Parser" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/os/xmlsrv/xml/xmllibxml2parser/group" mrp="/os/xmlsrv/xml/xmllibxml2parser/group/syslibs_xmlparser2.mrp"/>
+     </component>
+     <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/os/xmlsrv/xml/wbxmlparser/group" mrp="/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
+     </component>
+    </collection>
+    <collection id="xmlsrv_info" name="XML Services Info" level="specific">
+     <component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="deviceplatformrelease" level="services" tech-domain="to" name="Device Platform Release" levels="bld mid top">
+    <collection id="s60extras" name="S60 Extras" level="mid">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
+      <unit bldFile="/os/deviceplatformrelease/S60Extras/group"/>
+     </component>
+    </collection>
+    <collection id="locfiles" name="Locale Files" level="mid">
+     <component id="locfiles_build" filter="s60" name="S60 Locale Files Build" class="config" purpose="development">
+      <!-- need to move component down a directory -->
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group"/>
+     </component>
+     <component id="locfiles_set1" name="Locale Files Set 1" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set1"/>
+     </component>
+     <component id="locfiles_set2" name="Locale Files Set 2" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set2"/>
+     </component>
+     <component id="locfiles_set3" name="Locale Files Set 3" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set3"/>
+     </component>
+     <component id="locfiles_set4" name="Locale Files Set 4" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set4"/>
+     </component>
+     <component id="locfiles_set5" name="Locale Files Set 5" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set5"/>
+     </component>
+     <component id="locfiles_set6" name="Locale Files Set 6" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set6"/>
+     </component>
+     <!-- is the a problem with SF builds with the following? -->
+     <component id="locfiles_set7" name="Locale Files Set 7" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set7"/>
+     </component>
+     <component id="locfiles_set8" name="Locale Files Set 8" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set8"/>
+     </component>
+     <component id="locfiles_set9" name="Locale Files Set 9" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set9"/>
+     </component>
+     <component id="locfiles_set10" name="Locale Files Set 10" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set10"/>
+     </component>
+     <component id="locfiles_set11" name="Locale Files Set 11" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set11"/>
+     </component>
+     <component id="locfiles_set12" name="Locale Files Set 12" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set12"/>
+     </component>
+     <component id="locfiles_set13" name="Locale Files Set 13" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set13"/>
+     </component>
+     <component id="locfiles_set14" name="Locale Files Set 14" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set14"/>
+     </component>
+     <component id="locfiles_set15" name="Locale Files Set 15" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set15"/>
+     </component>
+     <component id="locfiles_set16" name="Locale Files Set 16" class="config" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/locfiles/group/set16"/>
+     </component>
+    </collection>
+    <collection id="version" name="Version" level="top">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
+      <unit bldFile="/os/deviceplatformrelease/Version/group"/>
+     </component>
+    </collection>
+    <collection id="helps_loc2" name="Helps Locale 2" level="top">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="helps_loc2_build" name="Helps Locale 2 Build" filter="s60">
+      <unit bldFile="/os/deviceplatformrelease/helps_loc2/group"/>
+     </component>
+    </collection>
+    <collection id="sf_config" name="SF Config" level="mid">
+     <component id="config" filter="s60" name="Config" class="config" purpose="development">
+      <unit base="/os/deviceplatformrelease/sf_config/config"/>
+     </component>
+     <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
+      <!-- will shoudl give the id/path something more unique than cenrep -->
+      <unit bldFile="/os/deviceplatformrelease/sf_config/cenrep/group"/>
+     </component>
+    </collection>
+    <!-- should be located locally in buildplatforms/group 
+    <collection id="s60bld" name="S60 Build">
+      <component id="buildplatforms" filter="s60" name="Build Platforms">
+        <unit bldFile="/tools/buildplatforms/group"/>
+      </component>
+    </collection>-->
+    <collection id="symbianosbld" name="Symbian OS Build" level="bld">
+     <component id="cedarutils" name="Cedar Utils" purpose="development">
+      <unit mrp="/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+     </component>
+     <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
+      <unit mrp="/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+     </component>
+     <component id="foundation_s60_packages" name="Foundation S60 Packages" class="config" introduced="^3" deprecated="^3" purpose="development" target="desktop">
+      <unit mrp="/os/deviceplatformrelease/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
+     </component>
+    </collection>
+    <collection id="foundation_system" name="Foundation System" level="top">
+     <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
+     </component>
+    </collection>
+    <collection id="deviceplatformrelease_info" name="Device Platform Release Info" level="top">
+     <component id="deviceplatformrelease_metadata" name="Device Platform Release Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="osrndtools" level="services" tech-domain="to" name="OS R&amp;D tools" levels="fw trace">
+    <collection id="stif" name="STIF" level="fw">
+     <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/stif_plat/group"/>
+     </component>
+     <component id="testinterface" filter="s60" name="Test Interface" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/testinterface/group"/>
+     </component>
+     <component id="testserver" filter="s60" name="Test Server" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/testserver/group"/>
+     </component>
+     <component id="testengine" filter="s60" name="Test Engine" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/testengine/group"/>
+     </component>
+     <component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/testserverstarter/group"/>
+     </component>
+     <component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/stiftfwif/group"/>
+     </component>
+     <component id="consoleui" filter="s60" name="Console UI" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/consoleui/group"/>
+     </component>
+     <component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/testcombiner/group"/>
+     </component>
+     <component id="demomodule" filter="s60" name="Demo Module" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/demomodule/group"/>
+     </component>
+     <component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/atslogger/group"/>
+     </component>
+     <component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/atsinterface/group"/>
+     </component>
+     <component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/testscripter/group"/>
+     </component>
+     <component id="suevent" filter="s60" name="SU Event" purpose="development">
+      <unit bldFile="/os/osrndtools/stif/suevent/group"/>
+     </component>
+     <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
+      <meta rel="config">
+       <defined condition="__S60_"/>
+      </meta>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+      <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+     </component>
+     <component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+      <!--  move exports into self-contained component. Remove this when configuration is in place-->
+      <unit bldFile="/os/osrndtools/stif/group"/>
+     </component>
+    </collection>
+    <collection id="memspy" name="Memspy" level="trace">
+     <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+      <unit bldFile="/os/osrndtools/memspy/memspy_plat/group"/>
+     </component>
+     <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+      <unit bldFile="/os/osrndtools/memspy/driver/group"/>
+     </component>
+     <component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+      <unit bldFile="/os/osrndtools/memspy/engine/group"/>
+     </component>
+     <component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+      <unit bldFile="/os/osrndtools/memspy/commandline/group"/>
+     </component>
+     <component id="console" filter="s60" name="Memspy Console" purpose="development">
+      <unit bldFile="/os/osrndtools/memspy/console/group"/>
+     </component>
+     <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+      <!--  move exports into self-contained component.-->
+      <unit bldFile="/os/osrndtools/memspy/group"/>
+     </component>
+    </collection>
+    <collection id="hti" name="Harmonized Test Interface" level="trace">
+     <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+      <unit bldFile="/os/osrndtools/hti/hti_plat/group"/>
+     </component>
+     <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
+      <unit bldFile="/os/osrndtools/hti/hticfg/group"/>
+     </component>
+     <component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
+      <unit bldFile="/os/osrndtools/hti/htiautostart/group"/>
+     </component>
+     <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
+      <unit bldFile="/os/osrndtools/hti/htiframework/group"/>
+     </component>
+     <component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
+      <!-- need to #include these from a single unit or separate into component at the right directory level -->
+      <unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+      <unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+      <unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+      <unit bldFile="/os/osrndtools/hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+     </component>
+     <component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
+      <!-- need to #include these from a single unit or separate into component at the right directory level -->
+      <unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+      <unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+      <unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+      <unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+      <unit bldFile="/os/osrndtools/hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+     </component>
+     <component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
+      <unit bldFile="/os/osrndtools/hti/htifilehlp/group"/>
+     </component>
+     <component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
+      <unit bldFile="/os/osrndtools/hti/htiwatchdog/group"/>
+     </component>
+     <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+      <!--  move exports into self-contained component.-->
+      <unit bldFile="/os/osrndtools/hti/group"/>
+     </component>
+    </collection>
+    <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
+     <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+  </layer>
+  <layer id="mw" name="Middleware" levels="generic specific">
+   <package id="appsupport" level="generic" tech-domain="rt" name="Generic Application Support" levels="system plugin framework server generic specific">
+    <collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
+     <component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+     </component>
+     <component id="network_status_api" name="Network Status API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_pub/network_status_api/group"/>
+     </component>
+    </collection>
+    <collection id="appsupport_plat" name="Generic Application Support Platform Interfaces" level="specific">
+     <component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+     </component>
+     <component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+     </component>
+     <component id="context_access_api" name="Context Access API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/context_access_api/group"/>
+     </component>
+     <component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+     </component>
+     <component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+     </component>
+     <component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+     </component>
+     <component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+     </component>
+     <component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+     </component>
+     <component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+     </component>
+     <component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+     </component>
+     <component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+     </component>
+     <component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+     </component>
+     <component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+     </component>
+     <component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+     </component>
+     <component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+     </component>
+     <component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+     </component>
+     <component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+     </component>
+     <component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+     </component>
+     <component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+     </component>
+     <component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+     </component>
+     <component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+     </component>
+     <component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+     </component>
+     <component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+     </component>
+     <component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+     </component>
+     <component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+     </component>
+     <component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+     </component>
+     <component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+     </component>
+     <component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+     </component>
+     <component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+     </component>
+     <component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60">
+      <unit bldFile="/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+     </component>
+    </collection>
+    <collection id="contextframework" name="Context Framework" level="framework">
+     <!-- the units that are commented out need to be put back when configuration is in place.
+		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
+     <component id="cfw" filter="s60" name="Context Framework">
+      <meta rel="config">
+       <defined condition="RD_CONTEXT_FRAMEWORK"/>
+      </meta>
+      <!--<unit bldFile="contextframework/cfw/group"/> -->
+     </component>
+     <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+      <meta rel="config">
+       <defined condition="RD_CONTEXT_FRAMEWORK"/>
+      </meta>
+      <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+     </component>
+     <component id="contextframework_build" filter="s60" name="Context Framework Build">
+      <unit bldFile="/mw/appsupport/contextframework/group"/>
+     </component>
+    </collection>
+    <collection id="coreapplicationuis" name="Core Application UIs" level="server">
+     <component id="dbrecovery" filter="s60" name="Database Recovery">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
+     </component>
+     <component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
+      <!-- No Service Power Save? Window Server? Please elaborate-->
+      <unit bldFile="/mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
+     </component>
+     <component id="rfs" filter="s60" name="Restore Factory Settings">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/rfs/group"/>
+     </component>
+     <component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
+     </component>
+     <component id="sysap" filter="s60" name="System Application">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/sysap/group"/>
+     </component>
+     <component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
+     </component>
+     <component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
+     </component>
+     <component id="kefmapper" filter="s60" name="Key Event Framework">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/kefmapper/group"/>
+     </component>
+     <component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
+     </component>
+     <component id="powersaveutilities" filter="s60" name="Power Save Utilities">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
+     </component>
+     <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
+     </component>
+     <component id="gsserverengine" filter="s60" name="GS Server Engine">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
+     </component>
+     <component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
+      <unit bldFile="/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
+     </component>
+    </collection>
+    <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
+     <!--  collection is really a component. Move down a directory -->
+     <component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
+      <unit base="/mw/appsupport/flashliteapi_3_1/group"/>
+     </component>
+    </collection>
+    <collection id="mediakeys" name="Media Keys" level="plugin">
+     <!--  collection is really a component. Move down a directory -->
+     <component id="mediakeys_build" filter="s60" name="Media Keys Build">
+      <unit bldFile="/mw/appsupport/mediakeys/group"/>
+     </component>
+    </collection>
+    <collection id="startupservices" name="Startup Services" level="system">
+     <component id="splashscreen" filter="s60" name="Splash Screen">
+      <unit bldFile="/mw/appsupport/startupservices/splashscreen/group"/>
+     </component>
+     <component id="startupanimation" filter="s60" name="Startup Animation">
+      <unit bldFile="/mw/appsupport/startupservices/startupanimation/group"/>
+     </component>
+     <component id="startup" name="Startup Application" filter="s60">
+      <unit bldFile="/mw/appsupport/startupservices/startup/group"/>
+     </component>
+    </collection>
+    <collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
+     <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+      <unit bldFile="/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
+     </component>
+     <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+      <unit bldFile="/mw/appsupport/sysresmonitoring/oommonitor/group"/>
+     </component>
+    </collection>
+    <collection id="systemsettings" name="System Settings" level="system">
+     <component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
+      <unit bldFile="/mw/appsupport/systemsettings/gssensorplugin/group"/>
+     </component>
+     <component id="gsaccessoryplugin" filter="s60" name="GS Accessory Plugin" class="plugin">
+      <unit bldFile="/mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
+     </component>
+    </collection>
+    <collection id="filehandling" name="File Handling" level="server">
+     <component id="fileconverterfw" name="File Converter Framework" purpose="optional">
+      <unit bldFile="/mw/appsupport/filehandling/fileconverterfw/group" mrp="/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
+     </component>
+     <component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
+      <unit bldFile="/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
+     </component>
+     <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
+     </component>
+    </collection>
+    <collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
+     <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+     </component>
+    </collection>
+    <collection id="commonappservices" name="Common Application Services" level="framework">
+     <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional">
+      <unit bldFile="/mw/appsupport/commonappservices/alarmserver/Group" mrp="/mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+     </component>
+     <component id="alarmservertest" name="Alarm Server Test" deprecated="^3" introduced="8.1" purpose="development">
+      <unit bldFile="/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
+     </component>
+     <component id="coreappstest" name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
+      <unit mrp="/mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="/mw/appsupport/commonappservices/coreappstest/Group"/>
+     </component>
+     <component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
+      <unit mrp="/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+     </component>
+     <component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
+      <unit bldFile="/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
+     </component>
+    </collection>
+    <collection id="tzservices" name="Time Zone Services" level="plugin">
+     <component id="tzserver" name="Time Zone Server" introduced="9.1" purpose="optional">
+      <unit bldFile="/mw/appsupport/tzservices/tzserver/group" mrp="/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
+     </component>
+     <component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
+      <unit bldFile="/mw/appsupport/tzservices/tzloc/group" mrp="/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
+     </component>
+     <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+      <unit bldFile="/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
+     </component>
+     <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+      <unit bldFile="/mw/appsupport/tzservices/tzdatabase/group" mrp="/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
+     </component>
+    </collection>
+    <collection id="contenthandling" name="Content Handling" level="plugin">
+     <component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
+      <unit bldFile="/mw/appsupport/contenthandling/webrecognisers/group" mrp="/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
+     </component>
+    </collection>
+    <collection id="openenvutils" name="Open Environment Utilities" level="specific">
+     <component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
+      <unit bldFile="/mw/appsupport/openenvutils/commandshell/group" mrp="/mw/appsupport/openenvutils/commandshell/group/oetools_zsh.mrp"/>
+     </component>
+     <component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
+      <unit bldFile="/mw/appsupport/openenvutils/telnetserver/group" mrp="/mw/appsupport/openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
+     </component>
+    </collection>
+    <collection id="printingsupport" name="Printing Support" level="generic">
+     <component id="printinguisupport" name="Printing UI Support" purpose="optional" introduced="^2" deprecated="^3">
+      <unit bldFile="/mw/appsupport/printingsupport/printinguisupport/group" mrp="/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
+     </component>
+    </collection>
+    <collection id="appfw" name="Application Framework" level="framework">
+     <component id="apparchitecture" name="Application Architecture" purpose="mandatory">
+      <unit bldFile="/mw/appsupport/appfw/apparchitecture/group" mrp="/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
+     </component>
+     <component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
+      <unit bldFile="/mw/appsupport/appfw/viewserver/group" mrp="/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
+     </component>
+     <component id="uiftestfw" name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
+      <unit mrp="/mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="/mw/appsupport/appfw/uiftestfw/group"/>
+     </component>
+    </collection>
+    <collection id="applaunchservices" name="Application Launch Services" level="generic">
+     <component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
+      <unit bldFile="/mw/appsupport/applaunchservices/aftermarketappstarter/group" mrp="/mw/appsupport/applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
+     </component>
+     <component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
+      <unit bldFile="/mw/appsupport/applaunchservices/applaunchplugins/group" mrp="/mw/appsupport/applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
+     </component>
+    </collection>
+    <collection id="tzpcside" name="Time Zone PC Side" level="plugin">
+     <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
+      <unit bldFile="/mw/appsupport/tzpcside/tzcompiler/group" mrp="/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
+     </component>
+    </collection>
+    <collection id="appsupport_info" name="Generic Application Support Info" level="specific">
+     <component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="securitysrv" level="generic" tech-domain="se" name="Security Services" levels="plugin framework server generic specific">
+    <collection id="secsrv_plat" name="Security Services Platform Interfaces" level="specific">
+     <component id="cms_api" name="CMS API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/cms_api/group"/>
+     </component>
+     <component id="pkcs12_parser_api" name="PKCS12 Parser API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+     </component>
+     <component id="java_utils_api" name="Java Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+     </component>
+     <component id="wim_cert_api" name="WIM Cert API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+     </component>
+     <component id="device_key_store_encryption_plugin_api" name="Device Key Store Encryption Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+     </component>
+     <component id="x509certnameparser_api" name="X.509 Certificate Name Parser API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+     </component>
+     <component id="remote_lock_api" name="Remote Lock API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+     </component>
+     <component id="pkidialog_api" name="PKI Dialog API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+     </component>
+     <component id="provisioning_api" name="Provisioning API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+     </component>
+     <component id="keyguard_configuration_api" name="Keyguard Configuration API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+     </component>
+     <component id="keylock_policy_api" name="Keylock Policy API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+     </component>
+     <component id="security_code_ui_api" name="Security Code UI API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+     </component>
+     <component id="gba_api" name="GBA API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/gba_api/group"/>
+     </component>
+     <component id="keyguard_access_api" name="Keyguard Access API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+     </component>
+     <component id="devicelock_access_api" name="Device Lock Access API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
+     </component>
+     <component id="lockapp_server_api" name="Lock Application Server API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
+     </component>
+     <component id="devencadaptation_api" name="Device Encryption Adaptation API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+     </component>
+     <component id="devenccommonutils_api" name="Device Encryption Common Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
+     </component>
+    </collection>
+    <collection id="cms" name="Certificate Management Service" level="server">
+     <!-- collection is really a component. Need to move down a directory-->
+     <component id="cms_build" filter="s60" name="CMS" introduced="^3">
+      <unit bldFile="/mw/securitysrv/cms/group"/>
+     </component>
+    </collection>
+    <collection id="pkiutilities" name="PKI Utilities" level="plugin">
+     <component id="x509certnameparser" filter="s60" name="X.509 Certificate Name Parser">
+      <unit bldFile="/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+     </component>
+     <component id="pkcs12" filter="s60" name="PKCS #12">
+      <unit bldFile="/mw/securitysrv/pkiutilities/pkcs12/group"/>
+     </component>
+     <component id="certmanui" filter="s60" name="Certificate Management UI">
+      <unit bldFile="/mw/securitysrv/pkiutilities/certmanui/group"/>
+     </component>
+     <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
+      <unit bldFile="/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+     </component>
+     <component id="certsaver" filter="s60" name="Certificate Saver">
+      <unit bldFile="/mw/securitysrv/pkiutilities/certsaver/group"/>
+     </component>
+     <component id="secmodui" filter="s60" name="Security Module UI">
+      <unit bldFile="/mw/securitysrv/pkiutilities/secmodui/group"/>
+     </component>
+     <component id="devicetoken" filter="s60" name="Device Token">
+      <unit bldFile="/mw/securitysrv/pkiutilities/devicetoken/group"/>
+     </component>
+     <component id="certificates" filter="s60" name="Certificates">
+      <unit bldFile="/mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
+     </component>
+     <component id="pkiutilities_build" filter="s60" name="PKI Utilities Build">
+      <!-- need to split this into the above components -->
+      <unit bldFile="/mw/securitysrv/pkiutilities/group"/>
+     </component>
+     <component id="ocsp" name="Online Certificate Status Protocol" introduced="^2" purpose="optional">
+      <unit bldFile="/mw/securitysrv/pkiutilities/ocsp/group" mrp="/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+     </component>
+    </collection>
+    <collection id="wim" name="Wireless Identity Module " level="framework">
+     <!-- collection is really a component. Need to move down a directory-->
+     <component id="wim_build" filter="s60" name="WIM Build">
+      <unit bldFile="/mw/securitysrv/wim/group"/>
+     </component>
+    </collection>
+    <collection id="remotelock" name="Remote Lock" level="generic">
+     <!-- collection is really a component. Need to move down a directory-->
+     <component id="remotelock_build" filter="s60" name="Remote Lock Build">
+      <unit bldFile="/mw/securitysrv/remotelock/group"/>
+     </component>
+    </collection>
+    <collection id="securitydialogs" name="Security Dialogs" level="specific">
+     <component id="keylockpolicyapi" filter="s60" name="Keylock Policy API">
+      <unit bldFile="/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+     </component>
+     <component id="autolock" name="Autolock" filter="s60">
+      <unit bldFile="/mw/securitysrv/securitydialogs/autolock/group"/>
+     </component>
+     <component id="secui" filter="s60" name="Security UI">
+      <unit bldFile="/mw/securitysrv/securitydialogs/secui/group"/>
+     </component>
+     <component id="securitynotifier" filter="s60" name="Security Notifier">
+      <unit bldFile="/mw/securitysrv/securitydialogs/securitynotifier/group"/>
+     </component>
+     <component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
+      <unit bldFile="/mw/securitysrv/securitydialogs/lockclient/group"/>
+     </component>
+     <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
+      <unit bldFile="/mw/securitysrv/securitydialogs/lockapp/group"/>
+     </component>
+     <component id="simlockui" filter="s60" name="SIM Lock UI" introduced="^3">
+      <unit bldFile="/mw/securitysrv/securitydialogs/simlockui/group"/>
+     </component>
+    </collection>
+    <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
+     <!-- collection is really a component. Need to move down a directory-->
+     <component id="boottimeintegritycheck_build" filter="s60" name="Boot Time Integrity Check Build">
+      <unit bldFile="/mw/securitysrv/boottimeintegritycheck/group"/>
+     </component>
+    </collection>
+    <collection id="gba" name="Generic Bootstrapping Architecture" level="server">
+     <component id="uicc" filter="s60" name="UICC" class="plugin" introduced="^2">
+      <unit bldFile="/mw/securitysrv/gba/uicc/group"/>
+     </component>
+     <component id="gbaserver" filter="s60" name="GBA Server" introduced="^2">
+      <unit bldFile="/mw/securitysrv/gba/gbaserver/group"/>
+     </component>
+     <component id="gbaapi" filter="s60" name="GBA API" introduced="^2">
+      <unit bldFile="/mw/securitysrv/gba/gbaapi/group"/>
+     </component>
+     <component id="gbafilter" filter="s60" name="GBA HTTP Filter" class="plugin" introduced="^2">
+      <unit bldFile="/mw/securitysrv/gba/gbafilter/group"/>
+     </component>
+     <component id="gba_build" filter="s60" name="Generic Boot Architecture Build" introduced="^2">
+      <!-- need to split this into the above components, or remove #includes and make this GBA ROM  -->
+      <unit bldFile="/mw/securitysrv/gba/group"/>
+     </component>
+    </collection>
+    <collection id="devencdiskutils" name="Device Encryption Disk Utils" level="server">
+     <component id="devenccommonutils" filter="s60" name="Device Encryption Common Utils" introduced="^3">
+      <unit bldFile="/mw/securitysrv/devencdiskutils/DevEncCommonUtils/group"/>
+     </component>
+     <component id="devencrfsplugin" filter="s60" name="Device Encryption RFS Plugin" introduced="^3" class="plugin">
+      <unit bldFile="/mw/securitysrv/devencdiskutils/DevEncRfsPlugin/group"/>
+     </component>
+     <component id="pk5recognizer" filter="s60" name="Device Encryption Pk5 Recognizer" introduced="^3" class="plugin">
+      <unit bldFile="/mw/securitysrv/devencdiskutils/Pk5Recognizer/group"/>
+     </component>
+     <component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
+      <unit bldFile="/mw/securitysrv/devencdiskutils/DevEncStarter/group"/>
+     </component>
+     <component id="devencdiskutils" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+      <!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
+      <unit bldFile="/mw/securitysrv/devencdiskutils/group"/>
+     </component>
+    </collection>
+    <collection id="securitysrv_info" name="Security Services Info" level="specific">
+     <component id="securitysrv_test" filter="s60,test,api_test" purpose="development" name="Security Services Test">
+      <unit bldFile="/mw/securitysrv/tsrc/group"/>
+     </component>
+     <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="drm" level="generic" tech-domain="se" name="DRM" levels="plugin framework server generic specific">
+    <collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
+     <component id="roap_api" name="ROAP API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/roap_api/group"/>
+     </component>
+     <component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/drm_common_api/group"/>
+     </component>
+     <component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/drm_rights_api/group"/>
+     </component>
+     <component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/drm_legacy_api/group"/>
+     </component>
+     <component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/dcf_repository_api/group"/>
+     </component>
+     <component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/drm_service_api/group"/>
+     </component>
+     <component id="drm_secondary_display_api" name="DRM Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/drm_secondary_display_api/group"/>
+     </component>
+     <component id="drm_license_manager_api" name="DRM License Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/drm_license_manager_api/group"/>
+     </component>
+     <component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/drm_utility_api/group"/>
+     </component>
+     <component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/drm_agents_api/group"/>
+     </component>
+     <component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/wmdrm_core_api/group"/>
+     </component>
+     <component id="wmdrm_access_api" name="WMDRM Access API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_plat/wmdrm_access_api/group"/>
+     </component>
+     <component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="__WINDOWS_MEDIA_DRM"/>
+      </meta>
+      <unit bldFile="/mw/drm/drm_plat/camese_utility_api/group"/>
+     </component>
+     <component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="__WINDOWS_MEDIA_DRM"/>
+      </meta>
+      <unit bldFile="/mw/drm/drm_plat/camese_framework_api/group"/>
+     </component>
+    </collection>
+    <collection id="drm_pub" name="DRM Public Interfaces" level="specific">
+     <component id="drm_helper_api" name="DRM Helper API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_pub/drm_helper_api/group"/>
+     </component>
+     <component id="oma_drm_caf_agent_api" name="OMA DRM CAF Agent API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+     </component>
+     <component id="drm_license_checker_api" name="DRM License Checker API" class="api" filter="s60">
+      <unit bldFile="/mw/drm/drm_pub/drm_license_checker_api/group"/>
+     </component>
+    </collection>
+    <collection id="commondrm" name="Common DRM" level="generic">
+     <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+     <component id="drmencryptor" filter="s60" name="DRM Encryptor">
+      <!-- this should have its own bld.inf or be removed as a component -->
+     </component>
+     <component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
+      <!-- this should have its own bld.inf or be removed as a component -->
+     </component>
+     <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
+      <unit bldFile="/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+     </component>
+     <component id="drmutility" filter="s60" name="DRM Utility">
+      <meta rel="config">
+       <defined condition="RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM"/>
+      </meta>
+      <!-- Uncomment unit when configuration is in place. Currently #included from commondrm_build -->
+      <!--<unit bldFile="commondrm/drmutility/group"/>-->
+     </component>
+     <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
+      <unit bldFile="/mw/drm/commondrm/drmserviceapiwrapper/group"/>
+     </component>
+     <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
+      <unit bldFile="/mw/drm/commondrm/drmrightsstoringlocation/group"/>
+     </component>
+     <component id="commondrm_build" filter="s60" name="Common DRM Build">
+      <!-- should be split into the above files, or them collapsed into a single component -->
+      <unit bldFile="/mw/drm/commondrm/group"/>
+     </component>
+    </collection>
+    <collection id="omadrm" name="OMA DRM" level="server">
+     <!-- collection is really a component. Move down a directory -->
+     <component id="omadrm_build" filter="s60" name="OMA DRM Build">
+      <unit bldFile="/mw/drm/omadrm/group"/>
+     </component>
+     <component id="rndcerts" filter="s60,test" name="R&amp;D Certificates">
+      <unit bldFile="/mw/drm/omadrm/rndcerts/group"/>
+     </component>
+     <component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
+      <unit bldFile="/mw/drm/omadrm/foundationcerts/group"/>
+     </component>
+    </collection>
+    <collection id="wmdrm" name="Windows Media DRM" level="framework">
+     <!-- collection is really a component. Move down a directory -->
+     <component id="wmdrm_build" filter="s60" name="WM DRM Build">
+      <unit bldFile="/mw/drm/wmdrm/group"/>
+     </component>
+    </collection>
+    <collection id="drm_info" name="DRM Info" level="specific">
+     <component id="drm_api_test" filter="s60,test,api_test" name="DRM Build" purpose="development">
+      <unit bldFile="/mw/drm/tsrc/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="locationsrv" level="specific" tech-domain="lo" name="Location Services" levels="plugin fw server if">
+    <collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
+     <component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+     </component>
+     <component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+     </component>
+     <component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+     </component>
+     <component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+     </component>
+     <component id="blid_application_satellite_info_api" name="BLID Application Satellite Info API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+     </component>
+    </collection>
+    <collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
+     <component id="map_and_navigation_api" name="Map and Navigation API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
+     </component>
+     <component id="map_and_navigation_provider_discovery_api" name="Map and Navigation Provider Discovery API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
+     </component>
+     <component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+     </component>
+     <component id="map_image_api" name="Map Image API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/map_image_api/group"/>
+     </component>
+     <component id="map_and_navigation_aiw_api" name="Map and Navigation AIW API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
+     </component>
+     <component id="map_and_navigation_provider_api" name="Map and Navigation Provider API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
+     </component>
+     <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+     </component>
+     <component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+     </component>
+     <component id="location_settings_launch_api" name="Location Settings Launch API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
+     </component>
+     <component id="map_image_conversion_plugin_api" name="Map Image Conversion Plug-In API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
+     </component>
+     <component id="psy_configuration_ui_plugin_api" name="PSY Configuration UI Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
+     </component>
+     <component id="np_proxy_configuration_api" name="NP Proxy Configuration API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+     </component>
+     <component id="supl_terminal_initiation_api" name="SUPL Terminal Initiation API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+     </component>
+     <component id="location_notation_preferences_settings_api" name="Location Notation Preferences Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
+     </component>
+     <component id="supl_settings_notifier_secondary_display_api" name="SUPL Settings Notifier Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
+     </component>
+     <component id="supl_network_initiation_api" name="SUPL Network Initiation API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+     </component>
+     <component id="privacy_notifiers_secondary_display_api" name="Privacy Notifiers Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
+     </component>
+     <component id="oma_supl_configuration_parameter_api" name="OMA SUPL Configuration Parameter API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+     </component>
+     <component id="supl_query_secondary_display_api" name="SUPL Query Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
+     </component>
+     <component id="location_triggering_management_api" name="Location Triggering Management API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+     </component>
+     <component id="location_triggering_status_information_api" name="Location Triggering Status Information API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+     </component>
+     <component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+     </component>
+     <component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
+      <unit bldFile="/mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+     </component>
+    </collection>
+    <collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
+     <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
+      <unit bldFile="/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
+     </component>
+     <component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
+      <unit bldFile="/mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
+     </component>
+     <component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
+      <!-- need to break this up into the other components -->
+      <unit bldFile="/mw/locationsrv/genericpositioningplugins/group"/>
+     </component>
+    </collection>
+    <collection id="landmarks" name="Landmarks" level="server">
+     <component id="locationlandmarks" filter="s60" name="Location Landmarks">
+      <unit bldFile="/mw/locationsrv/landmarks/locationlandmarks/group"/>
+     </component>
+    </collection>
+    <collection id="locationmapnavfw" name="Location Map and Navigation Framework" level="fw">
+     <component id="mnlibrary" filter="s60" name="Map and Navigation Library">
+      <unit bldFile="/mw/locationsrv/locationmapnavfw/library/group"/>
+     </component>
+     <component id="mnaiwprovider" filter="s60" name="Map and Navigation AIW Provider" class="plugin">
+      <unit bldFile="/mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
+     </component>
+     <component id="locationmapnavfw_build" filter="s60" name="Location Map and Navigation Framework Build">
+      <!-- need to break this up into the other components -->
+      <unit bldFile="/mw/locationsrv/locationmapnavfw/group"/>
+     </component>
+    </collection>
+    <collection id="locationsystemui" name="Location System UI" level="if">
+     <component id="locationsysui" filter="s60" name="Location System UI">
+      <unit bldFile="/mw/locationsrv/locationsystemui/locationsysui/group"/>
+     </component>
+    </collection>
+    <collection id="supl" name="SUPL" level="fw">
+     <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
+      <unit bldFile="/mw/locationsrv/supl/locationsuplfw/group"/>
+     </component>
+     <component id="locationomasuplprotocolhandler" filter="s60" name="OMA SUPL Protocol Handler">
+      <unit bldFile="/mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+     </component>
+     <component id="supltiapiimplementation" filter="s60" name="SUPL TI API Implementation" introduced="^3">
+      <unit bldFile="/mw/locationsrv/supl/supltiapiimplementation/group"/>
+     </component>
+    </collection>
+    <collection id="locationtriggering" name="Location Triggering" level="server">
+     <component id="ltlogger" filter="s60" name="LT Logger">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltlogger/group"/>
+     </component>
+     <component id="ltclientlib" filter="s60" name="LT Client Library">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltclientlib/group"/>
+     </component>
+     <component id="ltmanagementlib" filter="s60" name="LT Management Library">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+     </component>
+     <component id="ltcontainer" filter="s60" name="LT Container">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltcontainer/group"/>
+     </component>
+     <component id="ltserver" filter="s60" name="LT Server">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltserver/group"/>
+     </component>
+     <component id="ltstrategypluginapi" filter="s60" name="LT Strategy Plugin API">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+     </component>
+     <component id="ltstrategyengine" filter="s60" name="LT Strategy Engine">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+     </component>
+     <component id="ltmovementdetectionpluginapi" filter="s60" name="Movement Detection Plugin API">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+     </component>
+     <component id="ltcellidmovementdetector" filter="s60" name="Cell ID Movement Detector">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+     </component>
+     <component id="lbtmgmtui" filter="s60" name="LBT Management UI" class="plugin">
+      <unit bldFile="/mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
+     </component>
+     <component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
+      <unit bldFile="/mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
+     </component>
+     <component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
+      <!--  should remove #include from this and maybe put exports in the above components -->
+      <unit bldFile="/mw/locationsrv/locationtriggering/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="accesssec" level="generic" tech-domain="dc" name="Access Security" levels="plugin framework server generic specific">
+    <collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
+     <component id="wapi_security_settings_ui_api" name="WAPI Security Settings UI API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
+     </component>
+     <component id="wep_security_settings_ui_api" name="WEP Security Settings UI API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
+     </component>
+     <component id="wi-fi_protected_setup_ui_api" name="Wi-Fi Protected Setup UI API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
+     </component>
+     <component id="wlan_eap_settings_ui_api" name="WLAN EAP Settings UI API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
+     </component>
+     <component id="wpa_security_settings_ui_api" name="WPA Security Settings UI API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
+     </component>
+     <component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+     </component>
+     <component id="eapsim_db_api" name="EAP-SIM DB API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
+     </component>
+     <component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/eap_type_api/group"/>
+     </component>
+     <component id="eaptlspeap_db_api" name="EAP-TLS-PEAP DB API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
+     </component>
+     <component id="eapleap_db_api" name="LEAP DB API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
+     </component>
+     <component id="eapgtc_db_api" name="EAP-GTC DB API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
+     </component>
+     <component id="eapmschapv2_db_api" name="EAP-MSCHAPV2 DB API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
+     </component>
+     <component id="eapaka_db_api" name="EAP-AKA DB API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
+     </component>
+     <component id="wapi_db_api" name="WAPI DB API" class="api" filter="s60">
+      <unit bldFile="/mw/accesssec/accesssec_plat/wapi_db_api/group"/>
+     </component>
+    </collection>
+    <collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
+     <component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
+      <!-- the directory for this needs to be moved up to the right level -->
+      <unit bldFile="/mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+     </component>
+     <component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
+      <unit bldFile="/mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
+     </component>
+     <component id="wifiprotectedsetup" filter="s60" name="WIFI Protected Setup" introduced="^1">
+      <unit bldFile="/mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
+     </component>
+     <component id="wlaneapsettingsui" filter="s60" name="WLAN EAP Settings UI" introduced="9.3">
+      <unit bldFile="/mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
+     </component>
+     <component id="wpasecuritysettingsui" filter="s60" name="WPA Security Settings UI" introduced="9.1">
+      <unit bldFile="/mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
+     </component>
+    </collection>
+    <collection id="eapol" name="EAPOL" level="framework">
+     <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
+      <unit bldFile="/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="ipconnmgmt" level="generic" tech-domain="dc" name="IP Connectivity Management" levels="plugin framework server generic utils">
+    <collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="utils">
+     <component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
+     </component>
+     <component id="bearer_settings_plugin_api" name="Bearer Settings Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+     </component>
+     <component id="commsdat_wlan_api" name="CommsDat WLAN API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+     </component>
+     <component id="connection_monitor_extension_api" name="Connection Monitor Extension API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+     </component>
+     <component id="connection_ui_utilities_api" name="Connection UI Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+     </component>
+     <component id="disconnect_dialog_api" name="Disconnect Dialog API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+     </component>
+     <component id="disconnect_dialog_disable_api" name="Disconnect Dialog Disable API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+     </component>
+     <component id="extended_connection_settings_api" name="Extended Connection Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+     </component>
+     <component id="mpm_default_connection_api" name="MPM Default Connection API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+     </component>
+     <component id="pdpcontextmanager2_reset_factory_settings_api" name="PDP Context Manager 2 Reset Factory Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
+     </component>
+     <component id="pdpcontextmanager2_settings_api" name="PDP Context Manager 2 Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+     </component>
+     <component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
+     </component>
+    </collection>
+    <collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="utils">
+     <component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
+     </component>
+     <component id="access_point_engine_api" name="Access Point Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
+     </component>
+     <component id="access_point_settings_handler_api" name="Access Point Settings Handler API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
+     </component>
+     <component id="data_connection_log_counters_api" name="Data Connection Log Counters API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
+     </component>
+     <component id="connection_monitor_server_api" name="Connection Monitor Server API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+     </component>
+     <component id="connection_settings_ui_api" name="Connection Settings UI API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+     </component>
+     <component id="agent_dialog_api" name="Agent Dialog API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+     </component>
+     <component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
+      <unit bldFile="/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+     </component>
+    </collection>
+    <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
+     <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
+     </component>
+    </collection>
+    <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
+     <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
+      <unit bldFile="/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
+     </component>
+    </collection>
+    <collection id="apengine" name="Access Point Engine" level="framework">
+     <component id="apeng" filter="s60" name="Access Point Engine">
+      <unit bldFile="/mw/ipconnmgmt/apengine/apeng/group"/>
+     </component>
+     <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
+      <unit bldFile="/mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
+     </component>
+     <component id="apsettingsplugin" filter="s60" name="Access Point Settings Plugin" class="plugin">
+      <unit bldFile="/mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
+     </component>
+    </collection>
+    <collection id="bearermanagement" name="Bearer Management" level="framework">
+     <component id="mpm" filter="s60" name="Mobility Policy Manager">
+      <unit bldFile="/mw/ipconnmgmt/bearermanagement/mpm/group"/>
+     </component>
+     <component id="extendedconnpref" filter="s60" name="Extended Connection Preferences">
+      <unit bldFile="/mw/ipconnmgmt/bearermanagement/extendedconnpref/group"/>
+     </component>
+     <component id="s60mcpr" filter="s60" name="S60 Meta-Connection Provider" class="plugin">
+      <unit bldFile="/mw/ipconnmgmt/bearermanagement/S60MCPR/group"/>
+     </component>
+    </collection>
+    <collection id="cmmanager" name="Connection Method Manager" level="framework">
+     <component id="cmmgr" filter="s60" name="CM Manager">
+      <unit bldFile="/mw/ipconnmgmt/cmmanager/cmmgr/group"/>
+     </component>
+     <component id="gsconnsettingsplugin" filter="s60" name="GS Connection Settings Plugin" introduced="^3" class="plugin">
+      <unit bldFile="/mw/ipconnmgmt/cmmanager/gsconnsettingsplugin/group"/>
+     </component>
+    </collection>
+    <collection id="connectionmonitoring" name="Connection Monitoring" level="server">
+     <component id="connectionmonitorplugin" filter="s60" name="Connection Monitor Plugin" class="plugin">
+      <unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
+     </component>
+     <component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
+      <unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
+     </component>
+     <component id="connmon" filter="s60" name="Connection Monitor">
+      <!-- either split into two components, or #include from a common bld.inf -->
+      <unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
+      <unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
+     </component>
+     <component id="connmonext" filter="s60" name="Connection Monitor Extension API">
+      <unit bldFile="/mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
+     </component>
+    </collection>
+    <collection id="connectionutilities" name="Connection Utilities" level="utils">
+     <component id="connectiondialogs" filter="s60" name="Connection Dialogs">
+      <unit bldFile="/mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+     </component>
+    </collection>
+    <collection id="dbcreator" name="DB Creator" level="utils">
+     <component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
+      <unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
+     </component>
+     <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
+      <meta rel="config">
+       <not-defined condition="WINSCW"/>
+      </meta>
+      <!-- uncomment when config is turned on -->
+      <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+     </component>
+     <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
+      <unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
+     </component>
+     <component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
+      <unit bldFile="/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
+     </component>
+     <component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
+      <!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
+      <unit bldFile="/mw/ipconnmgmt/dbcreator/group"/>
+     </component>
+    </collection>
+    <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="utils">
+     <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
+      <!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
+      <unit bldFile="/mw/ipconnmgmt/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="netprotocols" level="generic" tech-domain="dc" name="High-level Internet Protocols" levels="plugin framework server generic specific">
+    <collection id="netprotocols_plat" name="High-level Internet Protocols Platform Interfaces" level="specific">
+     <component id="cookie_manager_api" name="Cookie Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+     </component>
+     <component id="http_cache_mgr_api" name="HTTP Cache Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+     </component>
+     <component id="http_filters_api" name="HTTP Filters API" class="api" filter="s60">
+      <unit bldFile="/mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+     </component>
+    </collection>
+    <collection id="httpfilters" name="HTTP Filters" level="plugin">
+     <component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
+      <unit bldFile="/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+     </component>
+     <component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
+      <unit bldFile="/mw/netprotocols/httpfilters/cookie/group"/>
+     </component>
+     <component id="deflatefilter" filter="s60" name="Deflate Filter" class="plugin">
+      <unit bldFile="/mw/netprotocols/httpfilters/deflatefilter/group"/>
+     </component>
+     <component id="httpfilteracceptheader" filter="s60" name="Accept Header Filter" class="plugin">
+      <unit bldFile="/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+     </component>
+     <component id="httpfilterauthentication" filter="s60" name="Authentication Filter" class="plugin">
+      <unit bldFile="/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+     </component>
+     <component id="httpfilterconnhandler" filter="s60" name="Connection Handler Fitler" class="plugin">
+      <unit bldFile="/mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+     </component>
+     <component id="httpfilteriop" filter="s60" name="HTTP IOP Filter" class="plugin">
+      <unit bldFile="/mw/netprotocols/httpfilters/httpfilteriop/group"/>
+     </component>
+     <component id="httpfilterproxy" filter="s60" name="HTTP Proxy Filter" class="plugin">
+      <unit bldFile="/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+     </component>
+     <component id="uaproffilter" filter="s60" name="UAProf Filter" class="plugin">
+      <unit bldFile="/mw/netprotocols/httpfilters/uaproffilter/group"/>
+     </component>
+    </collection>
+    <collection id="applayerprotocols" name="Application Layer Protocols" level="server">
+     <component id="httptransportfw" name="HTTP Transport Framework" introduced="6.2" purpose="optional">
+      <unit bldFile="/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+     </component>
+     <component id="httpexamples" name="HTTP Examples" introduced="6.2" purpose="development">
+      <unit bldFile="/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+     </component>
+     <component id="wappushsupport" name="WAP Push Support" introduced="6.2" purpose="optional">
+      <unit bldFile="/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+     </component>
+     <component id="wapbase" name="WAP Base" introduced="6.0" purpose="optional">
+      <unit bldFile="/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+     </component>
+     <component id="ftpengine" name="FTP Engine" introduced="6.0" purpose="optional">
+      <unit bldFile="/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+     </component>
+     <component id="telnetengine" name="Telnet Engine" introduced="6.0" purpose="optional">
+      <unit bldFile="/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+     </component>
+     <component id="httpserviceapi" name="HTTP Service API" introduced="TB9.2" purpose="optional">
+      <unit bldFile="/mw/netprotocols/applayerprotocols/httpservice/group" mrp="/mw/netprotocols/applayerprotocols/httpservice/group/http_service.mrp"/>
+     </component>
+    </collection>
+    <collection id="applayerpluginsandutils" name="Application Layer Plugins and Utils" level="framework">
+     <component id="uripermissionservices" name="URI Permission Services" introduced="^2" purpose="optional">
+      <unit bldFile="/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+     </component>
+     <component id="bookmarksupport" name="Bookmark Support" introduced="9.1" purpose="optional">
+      <unit bldFile="/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+     </component>
+     <component id="httpprotocolplugins" name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" class="plugin">
+      <unit bldFile="/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+     </component>
+     <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
+      <unit bldFile="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+     </component>
+    </collection>
+    <collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
+     <component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="ipappprotocols" level="generic" tech-domain="dc" name="IP App Protocols" levels="plugin conn server if">
+    <collection id="ipappprotocols_plat" name="IP App Protocols Platform Interfaces" level="if">
+     <component id="srtp_api" name="SRTP API" class="api" filter="s60">
+      <unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+     </component>
+     <component id="rtprtcp_api" name="RTP/RTCP API" class="api" filter="s60">
+      <unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+     </component>
+    </collection>
+    <collection id="rtp" name="RTP" level="server">
+     <component id="srtpstack" filter="s60" name="SRTP Stack">
+      <unit bldFile="/mw/ipappprotocols/rtp/srtpstack/group"/>
+     </component>
+     <component id="rtpstack" filter="s60" name="RTP Stack">
+      <unit bldFile="/mw/ipappprotocols/rtp/rtpstack/group"/>
+     </component>
+    </collection>
+    <collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
+     <component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+      <!-- Real Time Data Protocol -->
+      <unit bldFile="/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+     </component>
+     <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+      <unit version="2" bldFile="/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+     </component>
+    </collection>
+    <collection id="sipplugins" name="SIP Plugins" level="plugin">
+     <component id="sippwlanplugin" filter="s60" name="SIP WLAN Plugin" class="plugin">
+      <unit bldFile="/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+     </component>
+     <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
+      <unit bldFile="/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+     </component>
+     <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
+      <unit bldFile="/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+     </component>
+     <component id="sippsystemstatemonitor" filter="s60" name="SIP System State Monitor" class="plugin">
+      <unit bldFile="/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+     </component>
+     <component id="sippsipadapter" filter="s60" name="SIP Adapter" class="plugin" introduced="^3">
+      <unit bldFile="/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+     </component>
+    </collection>
+    <collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
+     <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+     </component>
+    </collection>
+    <collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
+     <component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="wirelessacc" level="specific" tech-domain="dc" name="Wireless Access" levels="framework generic ui">
+    <collection id="hsfw_plat" name="HotSpot Framework Platform Interfaces" level="ui">
+     <component id="hotspot_framework_client_api" name="HotSpot Framework Client API" class="api" filter="s60">
+      <unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+     </component>
+     <component id="internet_connectivity_test_service_api" name="Internet Connectivity Test Service API" class="api" filter="s60">
+      <unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+     </component>
+     <component id="internet_connectivity_test_service_settings_api" name="Internet Connectivity Test Service Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+     </component>
+     <component id="hotspot_framework_client_plugin_api" name="HotSpot Framework Client Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+     </component>
+    </collection>
+    <collection id="hotspotfw" name="HotSpot Framework" level="framework">
+     <component id="hsserver" filter="s60" name="HotSpot Server">
+      <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+     </component>
+     <component id="hsclient" filter="s60" name="HotSpot Client">
+      <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
+     </component>
+     <component id="internetconnectivitytestservice" filter="s60" name="Internet Connectivity Test Service">
+      <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+      <!-- <unit bldFile="hotspotfw/internetconnectivitytestservice/group"/> -->
+     </component>
+     <component id="ictsdialogs" filter="s60" name="Internet Connectivity Test Service Dialogs" deprecated="^3">
+      <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+      <!-- <unit bldFile="hotspotfw/ictsdialogs/group"/> -->
+     </component>
+     <component id="hspluginforagent" filter="s60" name="HotSpot Plugin for Agent" class="plugin">
+      <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+      <!-- <unit bldFile="hotspotfw/hspluginforagent/group"/> -->
+     </component>
+     <component id="hsbrowser" filter="s60" name="HotSpot Browser">
+      <!-- needs bld.inf un-#included from hotspotfw/group/bld.inf, or this component should be removed-->
+      <!-- <unit bldFile="hotspotfw/hsbrowser/group"/> -->
+     </component>
+     <component id="hotspotfw_build" filter="s60" name="Hotspot Framework Build">
+      <!--  should break up this bld.inf into the above components, or collapse them all into a single component -->
+      <unit bldFile="/mw/wirelessacc/hotspotfw/group"/>
+     </component>
+    </collection>
+    <collection id="wlanutilities" name="WLAN Utilities" level="generic">
+     <component id="wlanplugin" filter="s60" name="WLAN Plugin" class="plugin">
+      <unit bldFile="/mw/wirelessacc/wlanutilities/wlanplugin/group"/>
+     </component>
+     <component id="wlansettingsui" filter="s60" name="WLAN Settings UI">
+      <unit bldFile="/mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
+     </component>
+     <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
+      <unit bldFile="/mw/wirelessacc/wlanutilities/wlansniffer/group"/>
+     </component>
+     <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
+      <unit bldFile="/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="vpnclient" level="specific" tech-domain="dc" name="VPN Client" levels="engine ui api">
+    <!-- is the !oem_build filter needed? -->
+    <collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
+     <component id="vpnapi" filter="s60" class="api" name="VPN API">
+      <unit bldFile="/mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
+     </component>
+    </collection>
+    <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
+     <component id="vpnapi" filter="s60" name="VPN API">
+      <unit bldFile="/mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
+     </component>
+    </collection>
+    <collection id="vpnengine" name="VPN Engine" level="engine">
+     <!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
+    		or maybe split the collection into more reasonable groups  -->
+     <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
+      <unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
+     </component>
+     <component id="eventviewer" filter="s60" name="Event Viewer">
+      <unit bldFile="/mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
+     </component>
+     <component id="vpnins" filter="s60" name="VPN Installer">
+      <unit bldFile="/mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
+     </component>
+     <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
+      <unit bldFile="/mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
+     </component>
+     <component id="utlbase64" filter="s60" name="Base64 Utilities">
+      <unit bldFile="/mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
+     </component>
+     <component id="utlcrypto" filter="s60" name="Crypto Utilities">
+      <unit bldFile="/mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
+     </component>
+     <component id="utlxml" filter="s60" name="XML Utilities">
+      <unit bldFile="/mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
+     </component>
+     <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
+      <unit bldFile="/mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
+     </component>
+     <component id="pkiserviceapi" filter="s60" name="PKI Service API">
+      <unit bldFile="/mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
+     </component>
+     <component id="ikecert" filter="s60" name="IKE Certificate Management">
+      <unit bldFile="/mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
+     </component>
+     <component id="kmdapi" filter="s60" name="Key Management Daemon API">
+      <unit bldFile="/mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
+     </component>
+     <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
+      <unit bldFile="/mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
+     </component>
+     <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
+      <unit bldFile="/mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
+     </component>
+     <component id="ikev1lib" filter="s60" name="IKEv1 Library">
+      <unit bldFile="/mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
+     </component>
+     <component id="ikev2lib" filter="s60" name="IKEv2 Library">
+      <unit bldFile="/mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
+     </component>
+     <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
+      <unit bldFile="/mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
+     </component>
+     <component id="sit" filter="s60" name="Socket Interaction Thread">
+      <unit bldFile="/mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
+     </component>
+     <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
+      <unit bldFile="/mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
+     </component>
+     <component id="eventmediator" filter="s60" name="Event Mediator">
+      <unit bldFile="/mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
+     </component>
+     <component id="pkiservice" filter="s60" name="PKI Service">
+      <unit bldFile="/mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
+     </component>
+     <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
+      <unit bldFile="/mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
+     </component>
+     <component id="vpnmanager" filter="s60" name="VPN Manager">
+      <unit bldFile="/mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
+     </component>
+     <component id="vpncleaner" filter="s60" name="VPN Cleaner">
+      <unit bldFile="/mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
+     </component>
+     <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
+      <unit bldFile="/mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
+     </component>
+     <component id="dmadengine" filter="s60" name="DM Adapter Engine">
+      <unit bldFile="/mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
+     </component>
+     <component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
+      <unit bldFile="/mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
+     </component>
+     <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
+      <unit bldFile="/mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
+     </component>
+     <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
+      <unit bldFile="/mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
+     </component>
+    </collection>
+    <collection id="vpnui" name="VPN UI" level="ui">
+     <component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
+      <unit bldFile="/mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
+     </component>
+     <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
+      <unit bldFile="/mw/vpnclient/vpnui/vpndialogmanager/group" filter="!oem_build"/>
+     </component>
+     <component id="vpnmanagementui" filter="s60" name="VPN Management UI" class="plugin">
+      <unit bldFile="/mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
+     </component>
+     <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
+      <unit bldFile="/mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
+     </component>
+     <component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
+      <unit bldFile="/mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
+     </component>
+    </collection>
+    <collection id="vpnclient_info" name="VPN Client Info" level="api">
+     <component id="vpnclient_help" filter="s60" name="VPN Client Help">
+      <unit bldFile="/mw/vpnclient/help/group" filter="!oem_build"/>
+     </component>
+     <component id="vpnclient_build" filter="s60" name="VPN Client Build">
+      <!-- should split this up into the other components and remove this-->
+      <unit bldFile="/mw/vpnclient/group" filter="!oem_build"/>
+     </component>
+    </collection>
+   </package>
+   <package id="ipappsrv" level="specific" tech-domain="vc" name="IP App Services" levels="framework generic server conn plugin">
+    <collection id="ipappsrv_plat" name="IP App Services Platform Interfaces" level="plugin">
+     <component id="transcoder_api" name="Transcoder API" class="api" filter="s60">
+      <unit bldFile="/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+     </component>
+     <component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
+      <unit bldFile="/mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+     </component>
+     <component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
+      <unit bldFile="/mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+     </component>
+     <component id="media_control_api" name="Media Control API" class="api" filter="s60">
+      <unit bldFile="/mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+     </component>
+     <component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
+      <unit bldFile="/mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+     </component>
+     <component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+     </component>
+    </collection>
+    <collection id="natfw" name="NAT Framework" level="framework">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
+      <unit bldFile="/mw/ipappsrv/natfw/group"/>
+     </component>
+    </collection>
+    <collection id="multimediacommscontroller" name="Multimedia Comms Controller" level="conn">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="multimediacommscontroller_build" filter="s60" name="Multimedia Comms Controller Build">
+      <unit bldFile="/mw/ipappsrv/multimediacommscontroller/group"/>
+     </component>
+    </collection>
+    <collection id="multimediacommsengine" name="Multimedia Comms Engine" level="generic">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="multimediacommsengine_build" filter="s60" name="Multimedia Comms Engine Build">
+      <unit bldFile="/mw/ipappsrv/multimediacommsengine/group"/>
+     </component>
+    </collection>
+    <collection id="natplugins" name="NAT Plugins" level="plugin">
+     <component id="natpcliprovisioningnatfwadapter" filter="s60" name="Client Provisioning NAT Framework Traversal Adapter" class="plugin" introduced="^2">
+      <unit bldFile="/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
+     </component>
+     <component id="natpdevmgmtnatfwadapter" filter="s60" name="Device Management NAT Framework Traversal Adapter" class="plugin">
+      <unit bldFile="/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
+     </component>
+     <component id="natptraversalcontroller" filter="s60" name="NAT Traversal Controller" class="plugin">
+      <unit bldFile="/mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
+     </component>
+     <component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
+      <unit bldFile="/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
+     </component>
+    </collection>
+    <collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
+     <component id="ipappsrv_build" name="IP App Services Build" filter="s60">
+      <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
+      <unit mrp="/mw/ipappsrv/group"/>
+     </component>
+     <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="phonesrv" level="specific" tech-domain="vc" name="Telephony and SIM Services" levels="plugin framework server generic specific">
+    <collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
+     <component id="string_parser_api" name="String Parser API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+     </component>
+     <component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+     </component>
+     <component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+     </component>
+     <component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+     </component>
+     <component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+     </component>
+     <component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+      <unit unitID="tedo.sat_refresh_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+     </component>
+     <component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+     </component>
+     <component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+     </component>
+     <component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+     </component>
+     <component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+     </component>
+     <component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+     </component>
+     <component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+      <unit unitID="tedo.sat_client_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+     </component>
+     <component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+      <unit unitID="tedo.sat_service_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+     </component>
+     <component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+     </component>
+     <component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+     </component>
+     <component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+     </component>
+     <component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+     </component>
+     <component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+     </component>
+     <component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+     </component>
+     <component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+     </component>
+     <component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+     </component>
+     <component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+     </component>
+     <component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+     </component>
+     <component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+     </component>
+     <component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+     </component>
+     <component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+     </component>
+     <component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+     </component>
+     <component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+     </component>
+     <component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+     </component>
+     <component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+     </component>
+     <component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+     </component>
+     <component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+     </component>
+     <component id="call_information_api" name="Call Information API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+      <unit unitID="tedo.call_information_api.test" bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+      <unit unitID="tedo.call_remote_party_information_api.test" bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+      <unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
+     </component>
+    </collection>
+    <collection id="telutils" name="Telephony Utils" level="generic">
+     <component id="phoneparser" filter="s60" name="Phone Parser">
+      <unit bldFile="/mw/phonesrv/telutils/phoneparser/group"/>
+     </component>
+     <component id="telephonyservice" filter="s60" name="Telephony Service">
+      <unit bldFile="/mw/phonesrv/telutils/telephonyservice/group"/>
+     </component>
+    </collection>
+    <collection id="cbs" name="Cellular Baseband Services" level="plugin">
+     <component id="cbsserver" filter="s60" name="CBS Server">
+      <unit bldFile="/mw/phonesrv/cbs/cbsserver/group"/>
+     </component>
+     <component id="cbsui" filter="s60" name="CBS UI">
+      <unit bldFile="/mw/phonesrv/cbs/cbsui/group"/>
+     </component>
+    </collection>
+    <collection id="cellular" name="Cellular" level="server">
+     <component id="telephonysettings" filter="s60" name="Telephony Settings">
+      <unit bldFile="/mw/phonesrv/cellular/telephonysettings/group"/>
+     </component>
+     <component id="sssettings" filter="s60" name="Supplementary Service Settings">
+      <unit bldFile="/mw/phonesrv/cellular/sssettings/group"/>
+     </component>
+     <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI">
+      <unit bldFile="/mw/phonesrv/cellular/psetnotesui/group"/>
+     </component>
+     <component id="servicerequest" filter="s60" name="Service Request">
+      <unit bldFile="/mw/phonesrv/cellular/servicerequest/group"/>
+     </component>
+     <component id="cellular_test" filter="s60,test,api_test" name="Cellular Tests" purpose="development">
+      <!-- can only have one unit. Need to #include from a single bld.inf  (cellular/tsrc/bld.inf?) -->
+      <unit unitID="tedo.PsetNotesUi.test" bldFile="/mw/phonesrv/cellular/PsetNotesUi/tsrc/public/basic/group"/>
+      <unit unitID="tedo.SSSettings.test" bldFile="/mw/phonesrv/cellular/SSSettings/tsrc/public/basic/group"/>
+      <unit unitID="tedo.telephonysettings.test" bldFile="/mw/phonesrv/cellular/telephonysettings/tsrc/public/basic/group"/>
+     </component>
+    </collection>
+    <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
+     <component id="callprovider" filter="s60" name="Call Provider">
+      <unit bldFile="/mw/phonesrv/convergedcallengine/callprovider/group"/>
+     </component>
+     <component id="cce" filter="s60" name="CCE">
+      <unit bldFile="/mw/phonesrv/convergedcallengine/cce/group"/>
+     </component>
+     <component id="spsettings" filter="s60" name="Service Provider Settings">
+      <unit bldFile="/mw/phonesrv/convergedcallengine/spsettings/group"/>
+     </component>
+     <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
+      <unit bldFile="/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
+     </component>
+     <component id="serviceselector" filter="s60" name="Service Selector">
+      <unit bldFile="/mw/phonesrv/convergedcallengine/serviceselector/group"/>
+     </component>
+     <component id="csplugin" filter="s60" name="CS Plugin" class="plugin">
+      <!--  should spell out CS in name -->
+      <unit bldFile="/mw/phonesrv/convergedcallengine/csplugin/group"/>
+     </component>
+     <component id="convergedcallengine_test" filter="s60,test,api_test" name="CCE Tests" purpose="development">
+      <!-- can only have one unit. Need to #include from a single bld.inf  (convergedcallengine/tsrc/bld.inf?) -->
+      <unit unitID="tedo.cce.test" bldFile="/mw/phonesrv/convergedcallengine/cce/tsrc/public/basic/group"/>
+      <unit unitID="tedo.spsettings.test" bldFile="/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/>
+     </component>
+    </collection>
+    <collection id="engines" name="Telephony Engines" level="specific">
+     <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine">
+      <unit bldFile="/mw/phonesrv/engines/vmbxengine/group"/>
+     </component>
+    </collection>
+    <collection id="networkhandling" name="Network Handling" level="plugin">
+     <component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
+      <unit bldFile="/mw/phonesrv/networkhandling/networkhandlingengine/group"/>
+     </component>
+    </collection>
+    <collection id="phoneclientserver" name="Phone Client/Server" level="server">
+     <component id="enpolicy" filter="s60" name="Emergency Number Policy">
+      <unit bldFile="/mw/phonesrv/phoneclientserver/enpolicy/group"/>
+     </component>
+     <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
+      <unit bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
+     </component>
+     <component id="dialutils" filter="s60" name="Dial Utils">
+      <unit bldFile="/mw/phonesrv/phoneclientserver/dialutils/group"/>
+     </component>
+     <component id="phoneclient" filter="s60" name="Phone Client">
+      <unit bldFile="/mw/phonesrv/phoneclientserver/phoneclient/group"/>
+     </component>
+     <component id="phoneserver" filter="s60" name="Phone Server">
+      <unit bldFile="/mw/phonesrv/phoneclientserver/phoneserver/group"/>
+     </component>
+     <component id="callui" filter="s60" name="Call UI">
+      <unit bldFile="/mw/phonesrv/phoneclientserver/callui/group"/>
+     </component>
+     <component id="phoneclientserver_test" filter="s60,test,api_test" name="Phone Client/Server Tests" purpose="development">
+      <!-- can only have one unit. Need to #include from a single bld.inf  (phoneclientserver/tsrc/bld.inf?) -->
+      <unit unitID="tedo.aiwdialdata.test" bldFile="/mw/phonesrv/phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
+      <unit unitID="tedo.dialutils.test" bldFile="/mw/phonesrv/phoneclientserver/dialutils/tsrc/public/basic/group"/>
+      <unit unitID="tedo.phoneclient.test" bldFile="/mw/phonesrv/phoneclientserver/phoneclient/tsrc/public/basic/group"/>
+     </component>
+    </collection>
+    <collection id="satengine" name="SIM Application Toolkit Engine" level="generic">
+     <component id="satserver" filter="s60" name="SAT Server">
+      <unit bldFile="/mw/phonesrv/satengine/satserver/group"/>
+     </component>
+    </collection>
+    <collection id="satui" name="SIM Application Toolkit UI" level="specific">
+     <component id="satapp" filter="s60" name="SAT Application">
+      <unit bldFile="/mw/phonesrv/satui/satapp/group"/>
+     </component>
+     <component id="satplugin" filter="s60" name="SAT Plugin" class="plugin">
+      <unit bldFile="/mw/phonesrv/satui/satplugin/group"/>
+     </component>
+    </collection>
+    <collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
+     <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
+      <unit bldFile="/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+     </component>
+    </collection>
+    <collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
+     <component id="phonesrv_test" filter="s60,test,api_test" name="Telephony and SIM Services Tests" purpose="development">
+      <!-- can only have one unit. Need to #include from a single bld.inf  (phonesrv_plat/tsrc/bld.inf?) -->
+      <unit unitID="tedo.telephony_mediator_api.test" bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="messagingmw" level="specific" tech-domain="pr" name="Messaging Middleware" levels="stack fw api">
+    <collection id="msgfw_pub" name="Messaging Middleware Public Interfaces" level="api">
+     <component id="send_ui_api" name="Send UI API" class="api" filter="s60">
+      <unit bldFile="/mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+     </component>
+    </collection>
+    <collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
+     <component id="always_online_plugin_api" name="Always Online Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+     </component>
+     <component id="always_online_client_api" name="Always Online Client API" class="api" filter="s60">
+      <unit bldFile="/mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+     </component>
+     <component id="msg_common_utils_api" name="Messaging Common Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+     </component>
+     <component id="send_ui_plugin_api" name="Send UI Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+     </component>
+     <component id="send_ui_datautils_api" name="Send UI Data Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+     </component>
+    </collection>
+    <collection id="msgbranched" name="Messaging Branched" level="fw">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="msgbranched_build" filter="s60" name="Messaging Branched Build">
+      <unit bldFile="/mw/messagingmw/msgbranched/group"/>
+     </component>
+    </collection>
+    <collection id="messagingfw" name="Messaging Framework" level="fw">
+     <!-- should break this collection up into smaller related collections -->
+     <component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
+      <unit bldFile="/mw/messagingmw/messagingfw/alwaysonline/group"/>
+     </component>
+     <component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
+      <unit bldFile="/mw/messagingmw/messagingfw/msgcommonutils/group"/>
+     </component>
+     <component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2">
+      <unit bldFile="/mw/messagingmw/messagingfw/senduiservices/group"/>
+     </component>
+     <component id="scheduledsendmtm" name="Scheduled Send MTM" introduced="6.0" purpose="optional" class="plugin">
+      <unit bldFile="/mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="/mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+     </component>
+     <component id="msgsrvnstore" name="Message Server and Store" purpose="optional">
+      <unit bldFile="/mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="/mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+     </component>
+     <component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
+      <unit bldFile="/mw/messagingmw/messagingfw/biomsgfw/group" mrp="/mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+     </component>
+     <component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
+      <unit bldFile="/mw/messagingmw/messagingfw/msgconf/group" mrp="/mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+     </component>
+     <component id="watcherfw" name="Watcher Framework" purpose="optional">
+      <unit bldFile="/mw/messagingmw/messagingfw/watcherfw/group" mrp="/mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+     </component>
+     <component id="msgtest" name="Messaging Test" purpose="development">
+      <unit bldFile="/mw/messagingmw/messagingfw/msgtest/group" mrp="/mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+     </component>
+     <component id="msgtests" name="Messaging Tests" purpose="development" filter="test">
+      <unit mrp="/mw/messagingmw/messagingfw/msgtests/group/messaging.mrp" bldFile="/mw/messagingmw/messagingfw/msgtests/group"/>
+     </component>
+     <component id="msgtestfw" name="Messaging Test Framework" deprecated="^3" purpose="development" filter="test">
+      <unit mrp="/mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="/mw/messagingmw/messagingfw/msgtestfw/group"/>
+     </component>
+     <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
+      <unit mrp="/mw/messagingmw/messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="/mw/messagingmw/messagingfw/msgtestproduct/group"/>
+     </component>
+     <component id="sendas" name="Send As" purpose="optional">
+      <unit bldFile="/mw/messagingmw/messagingfw/sendas/group" mrp="/mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+     </component>
+     <component id="msgurlhandler" name="Message URL Handler" introduced="7.0" purpose="optional">
+      <unit bldFile="/mw/messagingmw/messagingfw/msgurlhandler/group" mrp="/mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+     </component>
+     <component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
+      <unit bldFile="/mw/messagingmw/messagingfw/wappushfw/group" mrp="/mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+     </component>
+     <component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
+      <unit bldFile="/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="/mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
+     </component>
+     <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="/mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
+     </component>
+    </collection>
+    <collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
+     <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="imsrv" level="specific" tech-domain="pr" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+    <collection id="imsrv_plat" name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+     <component id="ximp_core_data_model_api" name="XIMP Core Data Model API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+     </component>
+     <component id="ximp_presence_protocol_plugin_host_api" name="XIMP Presence Protocol Plug-in Host API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+     </component>
+     <component id="ximp_presence_data_model_api" name="XIMP Presence Data Model API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+     </component>
+     <component id="ximp_presence_protocol_plugin_api" name="XIMP Presence Protocol Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+     </component>
+     <component id="ximp_presence_management_api" name="XIMP Presence Management API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+     </component>
+     <component id="ximp_core_protocol_plugin_host_api" name="XIMP Core Protocol Plug-in Host API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+     </component>
+     <component id="ximp_core_management_api" name="XIMP Core Management API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+     </component>
+     <component id="ximp_presence_base_api" name="XIMP Presence Base API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+     </component>
+     <component id="ximp_core_protocol_plugin_api" name="XIMP Core Protocol Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+     </component>
+     <component id="ximp_core_base_api" name="XIMP Core Base API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+     </component>
+     <component id="ximp_presence_cache_api" name="XIMP Presence Cache API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+     </component>
+     <component id="ximp_core_feature_plugin_api" name="XIMP Core Feature Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+     </component>
+     <component id="ximp_im_protocol_plugin_host_api" name="XIMP IM Protocol Plugin Host API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+     </component>
+     <component id="ximp_im_data_model_api" name="XIMP IM Data Model API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+     </component>
+     <component id="ximp_im_protocol_plugin_api" name="XIMP IM Protocol Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+     </component>
+     <component id="ximp_im_management_api" name="XIMP IM Management API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+     </component>
+     <component id="ximp_im_base_api" name="XIMP IM Base API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+     </component>
+     <component id="ximp_search_protocol_plugin_host_api" name="XIMP Search Protocol Plugin Host API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+     </component>
+     <component id="ximp_search_data_model_api" name="XIMP Search Data Model API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+     </component>
+     <component id="ximp_search_protocol_plugin_api" name="XIMP search Protocol Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+     </component>
+     <component id="ximp_search_management_api" name="XIMP Search Management API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+     </component>
+     <component id="ximp_search_base_api" name="XIMP Search Base API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+     </component>
+     <component id="xmpp_settings_api" name="XMPP Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+     </component>
+     <component id="im_cache_client_api" name="IM Cache Client API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+     </component>
+     <component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
+     </component>
+     <component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+      <unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+     </component>
+    </collection>
+    <collection id="ximpfw" name="XIMP Framework" level="framework">
+     <!-- collection is really a component. Needs to be moved down a directory -->
+     <component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
+      <unit bldFile="/mw/imsrv/ximpfw/group"/>
+     </component>
+    </collection>
+    <collection id="imservices" name="IM Services" level="generic">
+     <component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/mw/imsrv/imservices/imfeatureplugin/group"/>
+     </component>
+     <component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/mw/imsrv/imservices/searchfeatureplugin/group"/>
+     </component>
+     <component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
+      <unit bldFile="/mw/imsrv/imservices/xmppsettingsapi/group"/>
+     </component>
+     <component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
+      <unit bldFile="/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+     </component>
+     <component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
+      <unit bldFile="/mw/imsrv/imservices/ossprotocoladaptation/group"/>
+     </component>
+     <component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
+      <unit bldFile="/mw/imsrv/imservices/instantmessagingcache/group"/>
+     </component>
+    </collection>
+    <collection id="brandingserver" name="Branding Server" level="specific">
+     <!-- collection is really a component. Needs to be moved down a directory -->
+     <component id="brandingserver_build" filter="s60" name="Branding Server Build">
+      <unit bldFile="/mw/imsrv/brandingserver/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="legacypresence" level="specific" tech-domain="pr" name="Legacy Presence Services" levels="engine fw ui">
+    <collection id="pressrv_plat" name="Legacy Presence Services Platform Interfaces" level="ui">
+     <component id="presence_list_api" name="Presence List API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+     </component>
+     <component id="watcher_info_api" name="Watcher Info API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+     </component>
+     <component id="simple_documents_api" name="SIMPLE Documents API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+     </component>
+     <component id="authorization_api" name="Authorization API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/authorization_api/group"/>
+     </component>
+     <component id="xdm_protocol_plugin_api" name="XDM Protocol Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+     </component>
+     <component id="watcher_api" name="Watcher API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/watcher_api/group"/>
+     </component>
+     <component id="xdm_api" name="XDM API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/xdm_api/group"/>
+     </component>
+     <component id="registration_api" name="Registration API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/registration_api/group"/>
+     </component>
+     <component id="publisher_api" name="Publisher API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/publisher_api/group"/>
+     </component>
+     <component id="messaging_connection_manager_api" name="Messaging Connection Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+     </component>
+     <component id="xdm_settings_api" name="XDM Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+     </component>
+     <component id="simple_settings_api" name="SIMPLE Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+     </component>
+     <component id="simple_instant_msg_api" name="Simple Instant Msg API" class="api" filter="s60">
+      <unit bldFile="/mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+     </component>
+    </collection>
+    <collection id="xdmengine" name="XDM Engine" level="engine">
+     <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+     <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
+      <unit bldFile="/mw/legacypresence/xdmengine/group"/>
+     </component>
+    </collection>
+    <collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
+     <!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
+     <component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
+      <unit bldFile="/mw/legacypresence/xdmsettingsui/group"/>
+     </component>
+    </collection>
+    <collection id="xdmprotocols" name="XDM Protocols" level="fw">
+     <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
+     <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
+      <unit bldFile="/mw/legacypresence/xdmprotocols/group"/>
+     </component>
+    </collection>
+    <collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
+     <!-- collection is really a component. Need to move down a directory-->
+     <component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
+      <unit bldFile="/mw/legacypresence/msgconnmanager/group"/>
+     </component>
+    </collection>
+    <collection id="presencesettingsui" name="Presence Settings UI" level="ui">
+     <!-- collection is really a component. Need to move down a directory-->
+     <component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
+      <unit bldFile="/mw/legacypresence/presencesettingsui/group"/>
+     </component>
+    </collection>
+    <collection id="simpleengine" name="SIMPLE Engine" level="engine">
+     <!-- collection is really a component. Need to move down a directory-->
+     <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
+      <unit bldFile="/mw/legacypresence/simpleengine/group"/>
+     </component>
+    </collection>
+    <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
+     <!-- collection is really a component. Need to move down a directory-->
+     <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
+      <unit bldFile="/mw/legacypresence/presencefwsimpleadpt/group"/>
+     </component>
+    </collection>
+    <collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
+     <component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
+      <unit bldFile="/mw/legacypresence/simpledatamodeladapter/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="opensrv" level="specific" tech-domain="pr" name="Open Services" levels="prt lib server eng">
+    <collection id="opensrv_plat" name="Open Services Platform Interfaces" level="eng">
+     <component id="messagequeue_api" name="Message Queue API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
+     </component>
+    </collection>
+    <collection id="loudmouth" name="Loudmouth" level="prt">
+     <!-- collection is really a component so it needs to be moved down a directory -->
+     <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
+      <unit bldFile="/mw/opensrv/loudmouth/group"/>
+     </component>
+    </collection>
+    <collection id="libtelepathy" name="Telepathy Library" level="lib">
+     <!-- collection is really a component so it needs to be moved down a directory -->
+     <component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
+      <unit bldFile="/mw/opensrv/libtelepathy/group"/>
+     </component>
+    </collection>
+    <collection id="telepathygabble" name="Telepathy Gabble" level="eng">
+     <!-- collection is really a component so it needs to be moved down a directory -->
+     <component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
+      <unit bldFile="/mw/opensrv/telepathygabble/group"/>
+     </component>
+    </collection>
+    <collection id="isolationserver" name="Isolation Server" level="server">
+     <component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
+      <unit bldFile="/mw/opensrv/isolationserver/messagequeue/group"/>
+     </component>
+     <component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
+      <unit bldFile="/mw/opensrv/isolationserver/isoserver/group"/>
+     </component>
+     <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
+      <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
+      <unit bldFile="/mw/opensrv/isolationserver/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="remotemgmt" level="specific" tech-domain="dm" name="Remote Management" levels="plugin framework server generic specific">
+    <collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
+     <component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+     </component>
+    </collection>
+    <collection id="remotemgmt_plat" name="Remote Management Platform Interfaces" level="specific">
+     <component id="common_agent_util_and_definitions_api" name="Common Agent util and definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+     </component>
+     <component id="policy_management_certificate_api" name="Policy Management Certificate API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+     </component>
+     <component id="oma_provisioning_adapter_api" name="OMA Provisioning Adapter API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+     </component>
+     <component id="device_management_parameter_api" name="Device Management Parameter API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+     </component>
+     <component id="data_synchronization_plugin_api" name="Data Synchronization Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+     </component>
+     <component id="sync_alert_handler_api" name="Sync Alert Handler API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+     </component>
+     <component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+     </component>
+     <component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+     </component>
+     <component id="device_management_plugin_api" name="Device Management plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+     </component>
+     <component id="dm_tree_apis" name="DM Tree APIs" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+     </component>
+     <component id="terminal_security_device_lock_api" name="Terminal Security Device Lock API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+     </component>
+     <component id="policy_management_request_api" name="Policy Management Request API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+     </component>
+     <component id="ds_constant_definitions_api" name="DS Constant Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+     </component>
+     <component id="scp_server_api" name="SCP Server API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+     </component>
+     <component id="data_synchronization_notification_api" name="Data Synchronization Notification API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+     </component>
+     <component id="oma_provisioning_engine_api" name="OMA Provisioning Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+     </component>
+     <component id="dm_utils_api" name="DM Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+     </component>
+     <component id="syncml_alert_api" name="SyncML Alert API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+     </component>
+     <component id="obex_client_session_api" name="OBEX Client session API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+     </component>
+     <component id="setting_enforcement_info_api" name="Setting Enforcement Info API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+     </component>
+     <component id="dm_constant_definitions_api" name="DM Constant Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+     </component>
+     <component id="oma_ds_extensions_api" name="OMA DS Extensions API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+     </component>
+     <component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+     </component>
+     <component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+     </component>
+     <component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+     </component>
+     <component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+     </component>
+     <component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+     </component>
+     <component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+     </component>
+     <component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+     </component>
+     <component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+     </component>
+     <component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+     </component>
+     <component id="update_package_storage_plugin_api" name="Update Package Storage Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+     </component>
+     <component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+     </component>
+     <component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+     </component>
+     <component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+     </component>
+     <component id="dcmo_control_api" name="DCMO Control API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+     </component>
+     <component id="ds_capability_mgmt_plugin_api" name="DS Capability Management Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+     </component>
+     <component id="dm_native_notifier_api" name="DM Native Notifier API" class="api" filter="s60">
+      <unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
+     </component>
+    </collection>
+    <collection id="policymanagement" name="Policy Management" level="generic">
+     <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
+      <unit bldFile="/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+     </component>
+     <component id="dmutilserver" filter="s60" name="DM Util Server">
+      <unit bldFile="/mw/remotemgmt/policymanagement/dmutilserver/group"/>
+     </component>
+     <component id="policyengine" filter="s60" name="Policy Engine">
+      <unit bldFile="/mw/remotemgmt/policymanagement/policyengine/group"/>
+     </component>
+     <component id="policymanagement_build" filter="s60" name="Policy Management Build">
+      <!--  need to distribute exports, etc into the other components and remove this-->
+      <unit bldFile="/mw/remotemgmt/policymanagement/group"/>
+     </component>
+    </collection>
+    <collection id="syncmlfw" name="SyncML Framework" level="server">
+     <component id="syncmlfw_build" filter="s60" name="SyncML Framework Build">
+      <!--  need to break this up into components. Too convoluted a structure to be in a single bld.inf-->
+      <unit bldFile="/mw/remotemgmt/syncmlfw/group"/>
+     </component>
+    </collection>
+    <collection id="terminalsecurity" name="Terminal Security" level="specific">
+     <component id="scp" filter="s60" name="Security Code Proxy">
+      <!-- can only have one unit, need to have these #included from a single bld.inf -->
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpdatabase/group"/>
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/scp/scpeventhandler/group"/>
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/scp/dmeventnotifier/group"/>
+     </component>
+     <component id="terminalsecurity_client" filter="s60" name="Terminal Control Client">
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/client/group"/>
+     </component>
+     <component id="terminalsecurity_server" filter="s60" name="Terminal Control Server">
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/server/group"/>
+     </component>
+     <component id="tcadapter" filter="s60" name="Terminal Control Adapter">
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+     </component>
+     <component id="terminalsecurity_build" filter="s60" name="Terminal Security Build">
+      <!--  need to distribute exports, etc into the other components and remove this-->
+      <unit bldFile="/mw/remotemgmt/terminalsecurity/group"/>
+     </component>
+    </collection>
+    <collection id="omaprovisioning" name="OMA Provisioning" level="specific">
+     <component id="pnputil" filter="s60" name="PnP Util">
+      <unit bldFile="/mw/remotemgmt/omaprovisioning/pnputil/group"/>
+     </component>
+     <component id="provisioning" filter="s60" name="Provisioning">
+      <unit bldFile="/mw/remotemgmt/omaprovisioning/provisioning/group"/>
+     </component>
+    </collection>
+    <collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
+     <component id="diagframework" filter="s60" name="Diagnostics Framework">
+      <unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+     </component>
+     <component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
+      <unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+     </component>
+     <component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
+      <!--  can only have one unit, merge or split into two components -->
+      <unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+      <unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+     </component>
+     <component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
+      <!--  need to distribute exports, etc into the other components and remove this-->
+      <unit bldFile="/mw/remotemgmt/devicediagnosticsfw/group"/>
+     </component>
+    </collection>
+    <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
+     <component id="dcmoclient" filter="s60" name="DCMO Client">
+      <unit bldFile="/mw/remotemgmt/dcmofw/dcmoclient/group"/>
+     </component>
+     <component id="dcmoserver" filter="s60" name="DCMO Server">
+      <unit bldFile="/mw/remotemgmt/dcmofw/dcmoserver/group"/>
+     </component>
+     <component id="dcmocustcmd" filter="s60" name="DCMO Custom Commands">
+      <unit bldFile="/mw/remotemgmt/dcmofw/dcmocustcmd/group"/>
+     </component>
+     <component id="dcmofw_build" filter="s60" name="DCMO Build">
+      <!--  need to distribute exports, etc into the other components and remove this-->
+      <unit bldFile="/mw/remotemgmt/dcmofw/group"/>
+     </component>
+    </collection>
+    <collection id="fotaapplication" name="FOTA Application" level="generic">
+     <component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
+      <!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+      <unit bldFile="/mw/remotemgmt/fotaapplication/group"/>
+     </component>
+     <component id="fotaserver" filter="s60" name="FOTA Server">
+      <meta rel="config">
+       <defined condition="__SYNCML_DM_FOTA"/>
+      </meta>
+      <!-- uncomment when #ifdefs are resolved -->
+      <!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+     </component>
+     <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
+      <!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+      <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+     </component>
+    </collection>
+   </package>
+   <package id="remotestorage" level="generic" tech-domain="de" name="Remote Storage" levels="framework if">
+    <collection id="rsfw_plat" name="Remote Storage Platform Interfaces" level="if">
+     <component id="rsfw_access_protocol_plugin_api" filter="s60" class="api" name="Remote Storage Framework Access Protocol Plugin API">
+      <unit bldFile="/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+     </component>
+    </collection>
+    <collection id="remotestoragefw" name="Remote Storage Framework" level="framework">
+     <component id="mountstore" filter="s60" name="RSFW Mount Store">
+      <unit bldFile="/mw/remotestorage/remotestoragefw/mountstore/group"/>
+     </component>
+     <component id="rsfwnotifierplugins" filter="s60" name="RSFW Notifier Plugins" class="plugin">
+      <unit bldFile="/mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
+     </component>
+     <component id="remotefileengine" filter="s60" name="Remote File Engine">
+      <unit bldFile="/mw/remotestorage/remotestoragefw/remotefileengine/group"/>
+     </component>
+     <component id="mountmanager" filter="s60" name="RSFW Mount Manager">
+      <unit bldFile="/mw/remotestorage/remotestoragefw/mountmanager/group"/>
+     </component>
+     <component id="webdavaccessplugin" filter="s60" name="WebDAV Access Plugin" class="plugin">
+      <unit bldFile="/mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
+     </component>
+     <component id="remotefilesystemplugin" filter="s60" name="Remote Filesystem Plugin" class="plugin">
+      <unit bldFile="/mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
+     </component>
+     <component id="remotestoragegsplugin" filter="s60" name="RS GS Plugin" class="plugin">
+      <meta rel="config">
+       <defined condition="__REMOTE_STORAGE_FW"/>
+      </meta>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+      <!-- <unit bldFile="remotestoragefw/gsplugin/group"/>-->
+     </component>
+     <component id="remotedriveconfigurationbiocontrol" filter="s60" name="Remote Drive Configuration BIO Control">
+      <meta rel="config">
+       <defined condition="__REMOTE_STORAGE_FW"/>
+      </meta>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from remotestoragefw_build -->
+      <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
+     </component>
+     <component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
+      <!-- move exports to other components.
+				This is needed for #includes of configured component until congigiration is in place -->
+      <unit bldFile="/mw/remotestorage/remotestoragefw/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="remoteconn" level="generic" tech-domain="de" name="Remote Connectivity" levels="plugin framework server generic specific">
+    <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
+     <component id="secon" filter="s60" name="Service Controllers">
+      <unit bldFile="/mw/remoteconn/connectivitymodules/secon/group"/>
+     </component>
+    </collection>
+    <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
+     <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+     </component>
+    </collection>
+    <collection id="mtptransports" name="MTP Transports" level="plugin">
+     <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="/mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+     </component>
+     <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/mw/remoteconn/mtptransports/mtpptpiptransport/group" mrp="/mw/remoteconn/mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
+     </component>
+     <component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/mw/remoteconn/mtptransports/mtpcontroller/group" mrp="/mw/remoteconn/mtptransports/mtpcontroller/group/mtpcontroller.mrp"/>
+     </component>
+    </collection>
+    <collection id="mtpfws" name="MTP Frameworks" level="framework">
+     <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
+      <unit bldFile="/mw/remoteconn/mtpfws/mtpfw/group" mrp="/mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/>
+     </component>
+    </collection>
+    <collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
+     <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
+      <unit bldFile="/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+     </component>
+     <component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/mw/remoteconn/mtpdataproviders/mtpimagedp/group" mrp="/mw/remoteconn/mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
+     </component>
+     <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
+      <unit bldFile="/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group" mrp="/mw/remoteconn/mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
+     </component>
+    </collection>
+    <collection id="backupandrestore" name="Backup and Restore" level="specific">
+     <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
+      <unit bldFile="/mw/remoteconn/backupandrestore/backupengine/group" mrp="/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+     </component>
+     <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
+      <unit bldFile="/mw/remoteconn/backupandrestore/backuptest/group" mrp="/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+     </component>
+    </collection>
+    <collection id="obex" name="OBEX" level="generic">
+     <component id="obexprotocol" name="OBEX Protocol" introduced="9.1" purpose="optional">
+      <unit bldFile="/mw/remoteconn/obex/obexprotocol/group" mrp="/mw/remoteconn/obex/obexprotocol/group/obex.mrp"/>
+     </component>
+     <component id="obexextensionapi" name="OBEX Extension API" introduced="9.2" purpose="optional">
+      <unit bldFile="/mw/remoteconn/obex/obexextensionapi/group" mrp="/mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="srvdiscovery" level="generic" tech-domain="de" name="Service Discovery and Usage" levels="plugin framework server generic specific">
+    <collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
+     <component id="upnpstack_plat" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
+     </component>
+     <component id="upnpstack_plat" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
+     </component>
+     <component id="upnpstack_plat" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
+     </component>
+     <component id="upnpstack_plat" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
+     </component>
+     <component id="upnpstack_plat" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+     </component>
+     <component id="upnpstack_plat" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
+     </component>
+    </collection>
+    <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
+     <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+      <unit bldFile="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
+     </component>
+    </collection>
+    <collection id="upnp" name="UPnP" level="server">
+     <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+      <unit bldFile="/mw/srvdiscovery/upnp/upnpstack/group"/>
+     </component>
+    </collection>
+    <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
+     <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="dlnasrv" level="specific" tech-domain="de" name="DLNA Services" levels="stack server ctrl framework plugin">
+    <!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+    <collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
+     <component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+     </component>
+     <component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
+      <unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+     </component>
+     <component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
+      <unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+     </component>
+     <component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+     </component>
+     <component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
+      <unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+     </component>
+     <component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
+      <unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+     </component>
+     <component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
+      <unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+     </component>
+     <component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+     </component>
+    </collection>
+    <collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
+     <component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
+      <unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+     </component>
+     <component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
+      <!-- put exports in other component instead -->
+      <unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/group"/>
+     </component>
+    </collection>
+    <collection id="upnpmediaserver" name="UPnP Media Server" level="server">
+     <component id="avobjects" filter="s60" name="A/V Objects">
+      <unit bldFile="/mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+     </component>
+     <component id="mediaserverclient" filter="s60" name="Media Server Client">
+      <unit bldFile="/mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+     </component>
+     <component id="connectionmanagerservice" filter="s60" name="Connection Manager Service">
+      <unit bldFile="/mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+     </component>
+     <component id="contentdirectoryservice" filter="s60" name="Content Directory Service">
+      <unit bldFile="/mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+     </component>
+     <component id="mediaserverengine" filter="s60" name="Media Server Engine">
+      <unit bldFile="/mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+     </component>
+     <component id="upnpmediaserver_build" filter="s60" name="UPnP Media Server Build">
+      <!-- move exports into one of above components -->
+      <unit bldFile="/mw/dlnasrv/upnpmediaserver/group"/>
+     </component>
+    </collection>
+    <collection id="upnpavcontroller" name="UPnP A/V Controller" level="ctrl">
+     <component id="upnpxmlparser" filter="s60" name="UPnP XML Parser" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+     </component>
+     <component id="upnpavcontrollerserver" filter="s60" name="UPnP A/V Controller Server" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+     </component>
+     <component id="upnpavcontrollerclient" filter="s60" name="UPnP A/V Ccontroller Client" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+     </component>
+     <component id="upnpavcontrollerhelper" filter="s60" name="UPnP A/V Controller Helper" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+     </component>
+     <component id="upnpavcontroller_build" filter="s60" name="UPnP A/V Controller Build" introduced="^2">
+      <!-- move exports content into one of above components -->
+      <unit bldFile="/mw/dlnasrv/upnpavcontroller/group"/>
+     </component>
+    </collection>
+    <collection id="upnpframework" name="UPnP Framework" level="framework">
+     <component id="upnputilities" filter="s60" name="UPnP Utilities" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpframework/upnputilities/group"/>
+     </component>
+     <component id="upnpextensionpluginif" filter="s60" name="UPnP Home Media Extension Plugin Interface" introduced="^2" deprecated="^3">
+      <meta rel="config">
+       <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+      </meta>
+      <!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+     </component>
+     <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
+      <meta rel="config">
+       <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+      </meta>
+      <!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+     </component>
+     <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
+      <meta rel="config">
+       <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+      </meta>
+      <!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+     </component>
+     <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
+      <meta rel="config">
+       <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+      </meta>
+      <!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+     </component>
+     <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
+      <meta rel="config">
+       <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+      </meta>
+      <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+     </component>
+     <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+     </component>
+     <component id="upnpcommand" filter="s60" name="UPnP Command" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpframework/upnpcommand/group"/>
+     </component>
+     <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
+      <!-- move exports content into one of above components -->
+      <unit bldFile="/mw/dlnasrv/upnpframework/group"/>
+     </component>
+    </collection>
+    <collection id="upnpsettings" name="UPnP Settings" level="framework">
+     <component id="upnpsettingsengine" filter="s60" name="UPnP Settings Engine" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+     </component>
+     <component id="multiselectionui" filter="s60" name="Multi-Selection UI" introduced="^2" deprecated="^3">
+      <meta rel="config">
+       <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+      </meta>
+      <!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+     </component>
+     <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
+      <meta rel="config">
+       <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+      </meta>
+      <!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+     </component>
+     <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
+      <meta rel="config">
+       <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+      </meta>
+      <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+     </component>
+     <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+     </component>
+     <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
+      <!-- move exports content into one of above components -->
+      <unit bldFile="/mw/dlnasrv/upnpsettings/group"/>
+     </component>
+    </collection>
+    <collection id="upnpsharing" name="UPnP Sharing" level="server">
+     <component id="upnpdlnaprofiler" filter="s60" name="UPnP DLNA Profiler" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+     </component>
+     <component id="upnpsecurity" filter="s60" name="UPnP Security" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+     </component>
+     <component id="upnpcontentserver" filter="s60" name="UPnP Content Server" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+     </component>
+     <component id="applicationengine" filter="s60" name="UPnP Application Engine" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpsharing/applicationengine/group"/>
+     </component>
+     <component id="upnpsharing_build" filter="s60" name="UPnP Sharing Build" introduced="^2">
+      <!-- move exports content into one of above components -->
+      <unit bldFile="/mw/dlnasrv/upnpsharing/group"/>
+     </component>
+    </collection>
+    <collection id="upnpmpxplugins" name="UPnP MPX Plugins" level="plugin">
+     <component id="upnpplaybackplugins" filter="s60" name="UPnP Playback Plugins" class="plugin" introduced="^2">
+      <unit bldFile="/mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+     </component>
+     <component id="upnpmpxplugins_build" filter="s60" name="UPnP MPX Plugins Build" introduced="^2">
+      <!-- move exports content into other component? -->
+      <unit bldFile="/mw/dlnasrv/upnpmpxplugins/group"/>
+     </component>
+    </collection>
+    <collection id="upnpharvester" name="UPnP Harvester" level="ctrl">
+     <meta rel="config">
+      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+     </meta>
+     <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
+      <!-- need to merge or #include these to a single bld.inf -->
+      <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+        <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
+     </component>
+     <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
+      <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+     </component>
+     <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
+      <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+     </component>
+     <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
+      <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
+      <!--<unit bldFile="upnpharvester/group"/>-->
+     </component>
+    </collection>
+    <collection id="homesync" name="Home Sync" level="plugin">
+     <meta rel="config">
+      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+     </meta>
+     <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
+      <!-- <unit bldFile="homesync/group"/>-->
+      <!-- move bld.inf into contentmanager dir -->
+     </component>
+    </collection>
+    <collection id="homemedia" name="Home Media" level="framework">
+     <meta rel="config">
+      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+     </meta>
+     <!-- collection is really just a component. Move down a directory -->
+     <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
+      <!-- <unit bldFile="homemedia/group"/> -->
+     </component>
+    </collection>
+    <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
+     <component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+      <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
+      <unit bldFile="/mw/dlnasrv/group"/>
+     </component>
+     <component id="dlnasrv_api_test" filter="s60,test,api_test" name="DLNA Services API Tests" purpose="development">
+      <unit bldFile="/mw/dlnasrv/tsrc/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="btservices" level="generic" tech-domain="de" name="Bluetooth Services" levels="framework server generic specific plugin">
+    <collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
+     <component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+     </component>
+     <component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+     </component>
+    </collection>
+    <collection id="btservices_plat" name="BT Services Platform Interfaces" level="plugin">
+     <component id="bluetooth_dosserver_audio_api" name="Bluetooth DOS Server Audio API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+     </component>
+     <component id="bluetooth_dut_mode_api" name="Bluetooth DUT Mode API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+     </component>
+     <component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
+     </component>
+     <component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+     </component>
+     <component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+     </component>
+     <component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+     </component>
+     <component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
+     </component>
+     <component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+     </component>
+     <component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
+     </component>
+     <component id="bluetooth_local_variation_api" name="Bluetooth Local Variation API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+     </component>
+     <component id="bluetooth_notifier_internal_api" name="Bluetooth Notifier internal API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+     </component>
+     <component id="bluetooth_sap_connection_state_api" name="Bluetooth SAP Connection State API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+     </component>
+     <component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
+      <unit bldFile="/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+     </component>
+    </collection>
+    <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+     <component id="bteng" filter="s60" name="Bluetooth Engine">
+      <unit bldFile="/mw/btservices/bluetoothengine/bteng/group"/>
+     </component>
+     <component id="btnotif" filter="s60" name="Bluetooth Notifier">
+      <unit bldFile="/mw/btservices/bluetoothengine/btnotif/group"/>
+     </component>
+     <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
+      <unit bldFile="/mw/btservices/bluetoothengine/btaudioman/group"/>
+     </component>
+     <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
+      <unit bldFile="/mw/btservices/bluetoothengine/btmac/group"/>
+     </component>
+     <component id="btsac" filter="s60" name="Bluetooth Stereo Audio Controller" class="plugin">
+      <unit bldFile="/mw/btservices/bluetoothengine/btsac/group"/>
+     </component>
+     <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
+      <unit bldFile="/mw/btservices/bluetoothengine/btaudiostreamer/group"/>
+     </component>
+     <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
+      <unit bldFile="/mw/btservices/bluetoothengine/btsap/group"/>
+     </component>
+     <component id="btui" filter="s60" name="Bluetooth UI">
+      <unit bldFile="/mw/btservices/bluetoothengine/btui/group"/>
+     </component>
+     <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
+      <unit bldFile="/mw/btservices/bluetoothengine/btpbap/group"/>
+     </component>
+     <component id="bthid" filter="s60" name="Bluetooth HID">
+      <unit bldFile="/mw/btservices/bluetoothengine/bthid/group"/>
+     </component>
+     <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
+      <unit bldFile="/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
+     </component>
+    </collection>
+    <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
+     <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
+      <unit bldFile="/mw/btservices/bluetoothappprofiles/avrcp" mrp="/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+     </component>
+    </collection>
+    <collection id="btservices_info" name="BT Services Info" level="plugin">
+     <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
+      <unit mrp="/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
+     </component>
+     <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
+      <unit bldFiile="tsrc/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="usbservices" level="generic" tech-domain="de" name="USB Services" levels="framework server generic specific plugin">
+    <collection id="usbservices_plat" name="USB Services Platform Interfaces" level="plugin">
+     <component id="pictbridge_api" name="PictBridge API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+     </component>
+     <component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+     </component>
+     <component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+     </component>
+     <component id="usb_device_control_plugin_api" name="USB Device Control Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+     </component>
+     <component id="usb_notifier_api" name="USB Notifier API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+     </component>
+     <component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+     </component>
+     <component id="usb_personality_plugin_api" name="USB Personality Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+     </component>
+     <component id="usb_secondary_display_api" name="USB Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+     </component>
+     <component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+     </component>
+     <component id="usb_watcher_info_api_header" name="USB Watcher Info API" class="api" filter="s60">
+      <unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+     </component>
+    </collection>
+    <collection id="usbservices_info" name="USB Services Info" level="plugin">
+     <component id="usbservices_test" filter="s60,test,api_test" name="USB Services Tests">
+      <unit bldFile="/mw/usbservices/tsrc/group"/>
+     </component>
+    </collection>
+    <collection id="usbengines" name="USB Engines" level="generic">
+     <component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
+      <unit bldFile="/mw/usbservices/usbengines/usbotgwatcher/group"/>
+     </component>
+     <component id="usbwatcher" filter="s60" name="USB Watcher">
+      <unit bldFile="/mw/usbservices/usbengines/usbwatcher/group"/>
+     </component>
+     <component id="usblocodplugin" filter="s60" name="USB Local Connectivity Domain Plugin" class="plugin">
+      <unit bldFile="/mw/usbservices/usbengines/usblocodplugin/group"/>
+     </component>
+     <component id="usbdevcon" filter="s60" name="USB Device Control">
+      <unit bldFile="/mw/usbservices/usbengines/usbdevcon/group"/>
+     </component>
+     <component id="usbremotepersonality" filter="s60" name="USB Remote Personality">
+      <unit bldFile="/mw/usbservices/usbengines/usbremotepersonality/group"/>
+     </component>
+    </collection>
+    <collection id="usbclasses" name="USB Classes" level="framework">
+     <component id="usbobexclasscontroller" filter="s60" name="USB OBEX Class Controller" class="plugin">
+      <unit bldFile="/mw/usbservices/usbclasses/usbobexclasscontroller/group"/>
+     </component>
+     <component id="usbbasicpersonality" filter="s60" name="USB Basic Personality" class="plugin">
+      <unit bldFile="/mw/usbservices/usbclasses/usbbasicpersonality/group"/>
+     </component>
+     <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
+      <unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
+     </component>
+     <!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
+      </component>-->
+     <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
+      <unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
+     </component>
+     <component id="usbphoneasmodem" filter="s60" name="USB Phone as Modem" introduced="^3">
+      <unit bldFile="/mw/usbservices/usbclasses/usbphoneasmodem/group"/>
+     </component>
+    </collection>
+    <collection id="usbuis" name="USB UIs" level="specific">
+     <component id="usbui" filter="s60" name="USB UI">
+      <unit bldFile="/mw/usbservices/usbuis/usbui/group"/>
+     </component>
+     <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
+      <unit bldFile="/mw/usbservices/usbuis/usbuinotif/group"/>
+     </component>
+     <component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
+      <unit bldFile="/mw/usbservices/usbuis/imageprintuiprovider/group"/>
+     </component>
+     <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
+      <unit bldFile="/mw/usbservices/usbuis/imageprintui/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="shortlinkconn" level="generic" tech-domain="de" name="Shortlink Connectivity" levels="framework server generic specific plugin">
+    <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+    <collection id="shortlinkconn_plat" name="Shortlink Connectivity Platform Interfaces" level="plugin">
+     <component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+     </component>
+     <component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+     </component>
+     <component id="dialup_connection_status_api" name="Dial-up Connection Status API" class="api" filter="s60">
+      <unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+     </component>
+     <component id="dun_secondary_display_notification_api" name="DUN Secondary Display Notification API" class="api" filter="s60">
+      <unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+     </component>
+     <component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
+      <unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+     </component>
+     <component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
+      <unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+     </component>
+     <component id="locod_bearer_plugin_api" name="Locod Bearer Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+     </component>
+     <component id="usb_obexservicemanager_client_api" name="USB OBEX Service Manager Client API" class="api" filter="s60">
+      <unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+     </component>
+    </collection>
+    <collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
+     <component id="locod" name="Local Connectivity Daemon">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/locod/group"/>
+     </component>
+     <component id="obexserviceman" name="OBEX Service Managar">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+     </component>
+     <component id="obexsendservices" name="OBEX Send Services">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+     </component>
+     <component id="obexreceiveservices" name="OBEX Receive Services">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+     </component>
+     <component id="dun" name="Dial Up Networking">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/dun/group"/>
+     </component>
+     <component id="lccustomplugin" name="LC Custom Plugins" class="plugin">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/lccustomplugin/group"/>
+     </component>
+     <component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
+     </component>
+     <component id="legacymodemplugin" name="Legacy Modem Plugin" class="plugin">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/legacymodemplugin/group"/>
+     </component>
+     <component id="modematplugin" name="Modem AT Plugin" class="plugin">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/modematplugin/group"/>
+     </component>
+     <component id="generichid" name="Generic HID">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+     </component>
+     <component id="headset" name="Headset">
+      <unit bldFile="/mw/shortlinkconn/localconnectivityservice/headset/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="imghandling" level="specific" tech-domain="mm" name="Image Handling" levels="lib util if">
+    <collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
+     <component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
+      <unit bldFile="/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+     </component>
+     <component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+      <unit bldFile="/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+     </component>
+     <component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+      <unit bldFile="/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
+     </component>
+    </collection>
+    <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+     <!-- collection is really a component, need to move down a directory -->
+     <component id="ihl" filter="s60" name="IHL">
+      <unit bldFile="/mw/imghandling/imagehandlinglib/group"/>
+     </component>
+     <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
+      <unit bldFile="/mw/imghandling/imagehandlinglib/tsrc/public/basic/group"/>
+     </component>
+    </collection>
+    <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
+     <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
+      <unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="metadatasrv" level="specific" tech-domain="mm" name="Legacy Metadata Services" levels="plugin framework server generic specific">
+    <collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
+     <component id="content_listing_framework_api" name="Content Listing Framework API" class="api" filter="s60">
+      <meta rel="config">
+       <not-defined condition="RD_MDS_2_5"/>
+      </meta>
+      <unit bldFile="/mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
+     </component>
+     <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
+      <unit bldFile="/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
+     </component>
+    </collection>
+    <collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
+     <component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
+      <unit bldFile="/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
+     </component>
+     <component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" class="api" filter="s60">
+      <meta rel="config">
+       <not-defined condition="RD_MDS_2_5"/>
+      </meta>
+      <unit bldFile="/mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
+     </component>
+     <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
+      <meta rel="config">
+       <not-defined condition="RD_MDS_2_5"/>
+      </meta>
+      <unit bldFile="/mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
+     </component>
+    </collection>
+    <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
+     <component id="mediafetch" filter="s60" name="Media Fetch">
+      <unit bldFile="/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="mds" level="specific" tech-domain="mm" name="Metadata Services" levels="mgr eng server int">
+    <collection id="mds_plat" name="Metadata Services Platform Interfaces" level="int">
+     <component id="context_engine_plugin_api" name="Context Engine Plugin API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+      <unit bldFile="/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="harvester_framework_api" name="Harvester Framework API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+      <unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/group" filter="test,api_test"/>
+      <!-- can only have one unit with the same filter, #include the following from the previous unit -->
+      <unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group" filter="test,api_test"/>
+      <unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group" filter="test,api_test"/>
+      <unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group" filter="test,api_test"/>
+      <unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group" filter="test,api_test"/>
+      <unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group" filter="test,api_test"/>
+     </component>
+     <component id="location_manager_api" name="Location Manager API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+      <unit bldFile="/mw/mds/mds_plat/location_manager_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="metadata_engine_api" name="Metadata Engine API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+      <unit bldFile="/mw/mds/mds_plat/metadata_engine_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" introduced="^2" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="RD_MDS_2_5"/>
+      </meta>
+      <unit bldFile="/mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+      <unit bldFile="/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" introduced="^2" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="RD_MDS_2_5"/>
+      </meta>
+      <unit bldFile="/mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+     </component>
+    </collection>
+    <collection id="mds_pub" name="Metadata Services Public Interfaces" level="int">
+     <component id="content_listing_framework_api" name="Content Listing Framework API" introduced="^2" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="RD_MDS_2_5"/>
+      </meta>
+      <unit bldFile="/mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+      <unit bldFile="/mw/mds/mds_pub/content_listing_framework_api/tsrc/group" filter="test,api_test"/>
+     </component>
+    </collection>
+    <collection id="metadataengine" name="Metadata Engine" level="eng">
+     <component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
+      <unit bldFile="/mw/mds/metadataengine/common/group"/>
+     </component>
+     <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
+      <unit bldFile="/mw/mds/metadataengine/server/group"/>
+     </component>
+     <component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
+      <unit bldFile="/mw/mds/metadataengine/client/group"/>
+     </component>
+     <component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
+      <!--make this collection a single component, or split this bld.inf into the other units  -->
+      <unit bldFile="/mw/mds/metadataengine/group"/>
+     </component>
+    </collection>
+    <collection id="locationmanager" name="Location Manager" level="mgr">
+     <component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
+      <unit bldFile="/mw/mds/locationmanager/locationtrail/group"/>
+     </component>
+     <component id="locationmanager_server" filter="s60" name="Location Manager Server" introduced="^2">
+      <unit bldFile="/mw/mds/locationmanager/server/group"/>
+     </component>
+     <component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
+      <unit bldFile="/mw/mds/locationmanager/client/group"/>
+     </component>
+     <component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
+      <!--make this collection a single component, or split this bld.inf into the other units  -->
+      <unit bldFile="/mw/mds/locationmanager/group"/>
+     </component>
+    </collection>
+    <collection id="contextengine" name="Context Engine" level="eng">
+     <component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
+      <unit bldFile="/mw/mds/contextengine/plugins/group"/>
+     </component>
+     <component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
+      <!--make this collection a single component, or make this unit self-contained  -->
+      <unit bldFile="/mw/mds/contextengine/group"/>
+     </component>
+    </collection>
+    <collection id="harvester" name="Harvester" level="eng">
+     <component id="blacklistclient" filter="s60" name="Blacklist Client" introduced="^2">
+      <unit bldFile="/mw/mds/harvester/blacklistclient/group"/>
+     </component>
+     <component id="blacklistserver" filter="s60" name="Blacklist Server" introduced="^2">
+      <unit bldFile="/mw/mds/harvester/blacklistserver/group"/>
+     </component>
+     <component id="harvester_common" filter="s60" name="Harvester Common" introduced="^2">
+      <unit bldFile="/mw/mds/harvester/common/group"/>
+     </component>
+     <component id="composerplugins" filter="s60" name="Composer Plugins" class="plugin" introduced="^2">
+      <unit bldFile="/mw/mds/harvester/composerplugins/group"/>
+     </component>
+     <component id="harvesterplugins" filter="s60" name="Harvester Plugins" class="plugin" introduced="^2">
+      <unit bldFile="/mw/mds/harvester/harvesterplugins/group"/>
+     </component>
+     <component id="monitorplugins" filter="s60" name="Monitor Plugins" class="plugin" introduced="^2">
+      <unit bldFile="/mw/mds/harvester/monitorplugins/group"/>
+     </component>
+     <component id="harvester_server" filter="s60" name="Harvester Server" introduced="^2">
+      <unit bldFile="/mw/mds/harvester/server/group"/>
+     </component>
+     <component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
+      <unit bldFile="/mw/mds/harvester/client/group"/>
+     </component>
+     <component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
+      <!-- split these exports into the other components -->
+      <unit bldFile="/mw/mds/harvester/group"/>
+     </component>
+    </collection>
+    <collection id="watchdog" name="Watchdog" level="server">
+     <!-- collection is really a component. Move down a directory -->
+     <component id="mdswatchdog" filter="s60" name="Metadata Watchdog" introduced="^2">
+      <unit bldFile="/mw/mds/watchdog/group"/>
+     </component>
+    </collection>
+    <collection id="clfwrapper" name="Content Listing Framework Wrapper" level="int">
+     <!-- collection is really a component. Move down a directory -->
+     <meta rel="config">
+      <defined condition="RD_MDS_2_5"/>
+     </meta>
+     <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
+      <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+      <!--<unit bldFile="clfwrapper/group"/>-->
+     </component>
+    </collection>
+    <collection id="mds_info" name="Metadata Services Info" level="int">
+     <component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
+      <!-- consider distributiing this into the rest of the components in the package -->
+      <unit bldFile="/mw/mds/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="mmuifw" level="specific" tech-domain="mm" name="Multimedia UI Framework" levels="mgr mdl util ui api">
+    <collection id="mmuifw_plat" name="Multimedia UI Framework Platform Interfaces" level="api">
+     <component id="alf_widgetfactory_api" name="ALF Widget Factory API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
+     </component>
+     <component id="alf_widgetutils_api" name="ALF Widget Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
+     </component>
+     <component id="alf_widgetmodel_api" name="ALF Widget Model API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
+     </component>
+     <component id="osn_container_api" name="OSN Container API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
+     </component>
+     <component id="osn_global_api" name="OSN Global API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
+     </component>
+     <component id="osn_string_api" name="OSN String API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
+     </component>
+     <component id="alf_resourcepool_api" name="ALF Resource Pool API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
+     </component>
+     <component id="alf_containerwidget_api" name="ALF Container Widget API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
+     </component>
+     <component id="alf_viewwidget_api" name="ALF View Widget API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
+     </component>
+     <component id="alf_scrollbarwidget_api" name="ALF Scrollbar Widget API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
+     </component>
+     <component id="alf_customlayoutmanagers_api" name="ALF Custom Layout Managers API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
+     </component>
+     <component id="gesturehelper_api" name="Gesture Helper API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
+     </component>
+     <component id="mul_coverflowwidget_api" name="MUL Coverflow Widget API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
+     </component>
+     <component id="mul_datamodel_api" name="MUL Data Model API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
+     </component>
+     <component id="mul_sliderwidget_api" name="MUL Slider Widget API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
+     </component>
+     <component id="mul_widget_api" name="MUL Widget API" class="api" filter="s60">
+      <unit bldFile="/mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
+     </component>
+    </collection>
+    <collection id="mmuifw_info" name="Multimedia UI Framework Info" level="ui">
+     <component id="mmuifw_build" filter="s60" name="Multimedia UI Framework Build">
+      <!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
+      <unit bldFile="/mw/mmuifw/group"/>
+     </component>
+    </collection>
+    <collection id="osncore" name="OS Neutral Library Core" level="util">
+     <!-- collection is really a component. Move down a directory -->
+     <component id="osncore_build" filter="s60" name="OSN Core Build">
+      <unit bldFile="/mw/mmuifw/osncore/group"/>
+     </component>
+    </collection>
+    <collection id="alfwidgetutils" name="Accelerated LAF Widget Utils" level="ui">
+     <!-- collection is really a component. Move down a directory -->
+     <component id="alfwidgetutils_build" filter="s60" name="ALF Widget Utils">
+      <unit bldFile="/mw/mmuifw/alfwidgetutils/group"/>
+     </component>
+    </collection>
+    <collection id="resourcepool" name="Resource Pool" level="util">
+     <!-- collection is really a component. Move down a directory -->
+     <component id="alfresourcepool" filter="s60" name="ALF Resource Pool">
+      <unit bldFile="/mw/mmuifw/resourcepool/group"/>
+     </component>
+    </collection>
+    <collection id="widgetmodel" name="Widget Model" level="mdl">
+     <!-- collection is really a component. Move down a directory -->
+     <component id="widgetmodel_build" filter="s60" name="Widget Model Build">
+      <unit bldFile="/mw/mmuifw/widgetmodel/group"/>
+     </component>
+    </collection>
+    <collection id="mulwidgets" name="MUL Widgets" level="ui">
+     <!-- should spell out MUL in the collection name -->
+     <component id="mullogging" filter="s60" name="MUL Logging">
+      <unit bldFile="/mw/mmuifw/mulwidgets/mullogging/group"/>
+     </component>
+     <component id="muldatamodel" filter="s60" name="MUL Data Model">
+      <unit bldFile="/mw/mmuifw/mulwidgets/muldatamodel/group"/>
+     </component>
+     <component id="mulwidgets_common" filter="s60" name="MUL Common Utils">
+      <unit bldFile="/mw/mmuifw/mulwidgets/common/group"/>
+     </component>
+     <component id="gesturehelper" filter="s60" name="Gesture Helper">
+      <unit bldFile="/mw/mmuifw/mulwidgets/gesturehelper/group"/>
+     </component>
+     <component id="mulcoverflowwidget" filter="s60" name="MUL CoverFlow Widget">
+      <unit bldFile="/mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
+     </component>
+     <component id="mulsliderwidget" filter="s60" name="MUL Slider Widget">
+      <unit bldFile="/mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
+     </component>
+     <component id="alfviewwidget" filter="s60" name="ALF View Widget">
+      <unit bldFile="/mw/mmuifw/mulwidgets/alfviewwidget/group"/>
+     </component>
+     <component id="alfcontainerwidget" filter="s60" name="ALF Container Widget">
+      <unit bldFile="/mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
+     </component>
+     <component id="alfscrollbarwidget" filter="s60" name="ALF Scrollbar Widget">
+      <unit bldFile="/mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="videoutils" level="specific" tech-domain="mm" name="Video Utils" levels="eng util if">
+    <collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
+     <component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
+      <unit bldFile="/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+     </component>
+     <component id="videoconnutility_api" name="Video Connection Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
+     </component>
+     <component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
+      <unit bldFile="/mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
+     </component>
+    </collection>
+    <collection id="videoscheduler" name="Video Scheduler" level="util">
+     <component id="schedulerclient" filter="s60" name="Video Scheduler Client">
+      <unit bldFile="/mw/videoutils/videoscheduler/schedulerclient/group"/>
+     </component>
+     <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
+      <unit bldFile="/mw/videoutils/videoscheduler/schedulerserver/group"/>
+     </component>
+    </collection>
+    <collection id="videoconnutility" name="Video Connection Utility" level="util">
+     <component id="connutilpsworker" filter="s60" name="Connection Utility Publish and Subscribe Worker">
+      <unit bldFile="/mw/videoutils/videoconnutility/connutilpsworker/group"/>
+     </component>
+     <component id="video_connutility" filter="s60" name="Video Connection Utility">
+      <unit bldFile="/mw/videoutils/videoconnutility/connutility/group"/>
+     </component>
+    </collection>
+    <collection id="videoutils_info" name="Video Utils Info" level="if">
+     <component id="videoutils_test" filter="s60,test,api_test" name="Video Utils Tests">
+      <unit bldFile="/mw/videoutils/tsrc/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="mmmw" level="generic" tech-domain="mm" name="Multimedia Middleware" levels="plugin framework server generic specific">
+    <collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
+     <component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+     </component>
+     <component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+     </component>
+     <component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+     </component>
+     <component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+     </component>
+     <component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+     </component>
+     <component id="emc_buffer_source_api" name="EMC Buffer Source API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+     </component>
+     <component id="emc_file_source_api" name="EMC File Source API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+     </component>
+     <component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+     </component>
+     <component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+     </component>
+     <component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+     </component>
+     <component id="emc_balance_effect_api" name="EMC Balance Effect API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+     </component>
+     <component id="emc_descriptor_source_api" name="EMC Descriptor Source API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+     </component>
+     <component id="emc_drm_config_intfc_api" name="EMC DRM Config Intfc API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+     </component>
+     <component id="voip_audio_services_api" name="VoIP Audio Services" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+     </component>
+     <component id="configuration_components_factory_api" name="Configuration Components Factory API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+     </component>
+     <component id="audio_output_control_utility_api" name="Audio Output Control Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+     </component>
+     <component id="audio_output_control_utility_proxy_api" name="Audio Output Control Utility Proxy API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+     </component>
+     <component id="emc_audio_effects_api" name="EMC Audio Effects API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+     </component>
+     <component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+     </component>
+     <component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+     </component>
+     <component id="radio_preset_utilities_api" name="Radio Preset Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+     </component>
+     <component id="radio_monitor_api" name="Radio Monitor API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+     </component>
+     <component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+     </component>
+     <component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
+      <unit bldFile="/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+      <unit bldFile="/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/tsrc/group" filter="test,api_test"/>
+     </component>
+    </collection>
+    <collection id="mmfenh" name="MMF Enhancements" level="generic">
+     <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
+      <unit bldFile="/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
+     </component>
+     <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
+      <unit bldFile="/mw/mmmw/mmfenh/audiooutputcontrolutility/group"/>
+     </component>
+     <component id="configurationcomponentsfactory" filter="s60" name="Configuration Components Factory">
+      <unit bldFile="/mw/mmmw/mmfenh/configurationcomponentsfactory/group"/>
+     </component>
+     <component id="enhancedaudioplayerutility" filter="s60" name="Enhanced Audio Player Utility">
+      <unit bldFile="/mw/mmmw/mmfenh/enhancedaudioplayerutility/group"/>
+     </component>
+     <component id="enhancedmediaclient" filter="s60" name="Enhanced Media Client">
+      <unit bldFile="/mw/mmmw/mmfenh/enhancedmediaclient/group"/>
+     </component>
+     <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
+      <unit bldFile="/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
+     </component>
+     <component id="progressivedownload" filter="s60" name="Progressive Download">
+      <unit bldFile="/mw/mmmw/mmfenh/progressivedownload/group"/>
+     </component>
+     <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
+      <unit bldFile="/mw/mmmw/mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
+     </component>
+    </collection>
+    <collection id="mm_fw" name="Multimedia Frameworks" level="framework">
+     <!-- Id needs to be unique, mmfw already in use -->
+     <!-- Placeholder for OpenAX AL and other stuff -->
+    </collection>
+    <collection id="mmserv" name="Multimedia Services" level="specific">
+     <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
+      <unit bldFile="/mw/mmmw/mmserv/audioeffectsui/group"/>
+     </component>
+     <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
+      <unit bldFile="/mw/mmmw/mmserv/callaudiocontrol/group"/>
+     </component>
+     <component id="metadatautility" filter="s60" name="Metadata Utility">
+      <unit bldFile="/mw/mmmw/mmserv/metadatautility/group"/>
+     </component>
+     <component id="radioutility" filter="s60" name="Radio Utility">
+      <unit bldFile="/mw/mmmw/mmserv/radioutility/group"/>
+     </component>
+     <component id="thumbnailengine" filter="s60" name="Thumbnail Engine" introduced="^2">
+      <unit bldFile="/mw/mmmw/mmserv/thumbnailengine/group"/>
+     </component>
+     <component id="tms" filter="s60" name="Telephony Multimedia Service" introduced="^3">
+      <unit bldFile="/mw/mmmw/mmserv/tms/group"/>
+     </component>
+     <component id="voipaudioservices" filter="s60" name="VoIP Audio Services">
+      <unit bldFile="/mw/mmmw/mmserv/voipaudioservices/group"/>
+     </component>
+     <component id="lib3gpextparser" filter="s60" name="3GP Extension Metadata Parser Library">
+      <unit bldFile="/mw/mmmw/mmserv/metadatautility/3GPExtParserLib_stub/group" filter="sf_build"/>
+     </component>
+    </collection>
+    <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
+     <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
+      <unit bldFile="/mw/mmmw/tsrc/group"/>
+     </component>
+     <component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="helix" level="generic" tech-domain="mm" name="Helix" levels="plugin framework server generic specific">
+    <collection id="helix_ren" name="Helix Engine" level="framework">
+     <!-- what does "ren" stand for? -->
+     <component id="helix_stub" filter="s60" name="Helix Stub" class="api" introduced="^2">
+      <unit bldFile="/mw/helix/helix_ren/helix_stub/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="camerasrv" level="specific" tech-domain="mm" name="Camera Services" levels="plugin fw api">
+    <collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
+     <component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+     </component>
+     <component id="cae_extentension_api" name="CAE Extension API" class="api" filter="s60">
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
+     </component>
+     <component id="camera_application_engine_api" name="Camera Application Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+     </component>
+     <component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+     </component>
+     <component id="asynchronous_file_saving_queue_api" name="Asynchronous File Saving Queue API" class="api" filter="s60">
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+      <unit bldFile="/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group" filter="test,api_test"/>
+     </component>
+    </collection>
+    <collection id="camappengine" name="Camera App Engine" level="fw">
+     <!-- is this collection really a component? If so, move down a directory -->
+     <component id="stillconverter" filter="s60" name="Still Image Converter">
+      <!-- should separate this from parent engine's bld.inf  -->
+      <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
+     </component>
+     <component id="camappengine_engine" filter="s60" name="Camera App Engine">
+      <!-- should separate this from parent engine's bld.inf  -->
+      <!-- <unit bldFile="camappengine/engine/group"/> -->
+     </component>
+     <component id="asynchfilesavequeue" filter="s60" name="Asynch File Save Queue">
+      <unit bldFile="/mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
+     </component>
+     <component id="camappengine_build" filter="s60" name="Camera App Engine Build">
+      <unit bldFile="/mw/camerasrv/camappengine/build"/>
+     </component>
+    </collection>
+    <collection id="camcordermmfplugin" name="Camcorder MMF Plugin" level="plugin">
+     <!-- collection is really a component. Should move down a directory -->
+     <component id="camcordermmfplugin_build" filter="s60" name="Camcorder MMF Plugin Build" class="plugin">
+      <unit bldFile="/mw/camerasrv/camcordermmfplugin/build"/>
+     </component>
+    </collection>
+    <collection id="configmanagers" name="Config Managers" level="api">
+     <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
+      <unit bldFile="/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
+     </component>
+    </collection>
+    <collection id="camerasrv_info" name="Camera Services Info" level="api">
+     <component id="camerasrv_build" filter="s60" name="Camera Services Build">
+      <!-- should split into individual bld.infs -->
+      <unit bldFile="/mw/camerasrv/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
+    <collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
+     <component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
+      <!-- this is no longer necessary when confguration is put in place -->
+      <unit bldFile="/mw/mmappfw/mmappfw_plat"/>
+     </component>
+     <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+     </component>
+     <component id="harvester_collection_mediator_api" name="Harvester Collection Mediator API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+     </component>
+     <component id="harvester_metadata_extractor_api" name="Harvester Metadata Extractor API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+     </component>
+     <component id="harvester_server_api" name="Harvester Server API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+     </component>
+     <component id="harvester_utility_api" name="Harvester Utility API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+     </component>
+     <component id="playlist_engine_api" name="Playlist Engine API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+     </component>
+     <component id="mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+     </component>
+     <component id="mpx_collection_common_definition_api" name="MPX Collection Common Definition API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+     </component>
+     <component id="mpx_collection_utility_api" name="MPX Collection Utility API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+     </component>
+     <component id="mpx_common_api" name="MPX Common API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+     </component>
+     <component id="mpx_common_definition_api" name="MPX Common Definition API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+     </component>
+     <component id="mpx_playback_common_definition_api" name="MPX Playback Common Definition API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+     </component>
+     <component id="mpx_playback_utility_api" name="MPX Playback Utility API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+     </component>
+     <component id="mpx_base_view_plugins_api" name="MPX Base View Plugins API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+     </component>
+     <component id="mpx_view_utility_api" name="MPX View Utility API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+     </component>
+     <component id="mpx_albumart_utility_api" name="MPX Album Art Utility API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+     </component>
+     <component id="media_player_settings_engine_api" name="Media Player Settings Engine API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+     </component>
+     <component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
+      </meta>
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+     </component>
+     <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="__WINDOWS_MEDIA"/>
+      </meta>
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+     </component>
+     <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+     </component>
+     <component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+     </component>
+    </collection>
+    <collection id="mpx" name="Multimedia Player" level="fw">
+     <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mpx/commonframework/group"/>
+     </component>
+     <component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mpx/playbackframework/group"/>
+     </component>
+     <component id="mpxcollectionfw" filter="s60" name="MPX Collection Framework" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mpx/collectionframework/group"/>
+     </component>
+     <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mpx/viewframework/group"/>
+     </component>
+     <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
+      <!--  Move the export to another component or remove the #includes from this one -->
+      <unit bldFile="/mw/mmappfw/mpx/group"/>
+     </component>
+    </collection>
+    <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
+     <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
+      <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+      		Can remove this once configuration is in place-->
+      <unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
+     </component>
+     <component id="collectionhelper" filter="s60" name="Media Player Collection Helper" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mmappcomponents/collectionhelper/group"/>
+     </component>
+     <component id="playlistengine" filter="s60" name="Playlist Engine" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mmappcomponents/playlistengine/group"/>
+     </component>
+     <component id="mpxharvester" filter="s60" name="Media Player Harvester" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mmappcomponents/harvester/group"/>
+     </component>
+     <component id="mmappcommonui" filter="s60" name="Multimedia App Common UI" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
+     </component>
+     <component id="mediaplayersettingsengine" filter="s60" name="Media Player Settings Engine" introduced="^1">
+      <unit bldFile="/mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
+     </component>
+     <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
+      <meta rel="config">
+       <defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
+      </meta>
+      <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+      <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+     </component>
+     <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
+      <meta rel="config">
+       <defined condition="__WINDOWS_MEDIA"/>
+      </meta>
+      <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+      <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+     </component>
+     <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
+      <unit bldFile="/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
+     </component>
+     <component id="videoplaylistutility" filter="s60" name="Video Playlist Utility" introduced="^3">
+      <unit bldFile="/mw/mmappfw/mmappcomponents/videoplaylistutility/group"/>
+     </component>
+     <component id="mmmtpdataprovider" filter="s60" name="Multimedia MTP Data Provider" introduced="^3">
+      <unit bldFile="/mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
+     </component>
+    </collection>
+    <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
+     <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
+      <!--  Move the export to another component or remove the #includes from this one -->
+      <unit bldFile="/mw/mmappfw/group"/>
+     </component>
+     <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
+      <unit bldFile="/mw/mmappfw/tsrc/group" filter="TA_MMAPPFW"/>
+     </component>
+    </collection>
+   </package>
+   <package id="inputmethods" level="generic" tech-domain="ui" name="Input Methods" levels="plugin engine framework api">
+    <collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
+     <component id="ptiengine_iti_api" name="PTI Engine API" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+      </meta>
+      <unit bldFile="/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+     </component>
+     <component id="optical_character_recognition_api" name="Optical Character Recognition API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+     </component>
+     <component id="input_language_info_api" name="Input Language Info API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+     </component>
+    </collection>
+    <collection id="inputmethods_plat" name="Input Methods Platform Interfaces" level="api">
+     <component id="pen_input_server_api" name="Pen Input Server API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="ptiengine_hwr_api" name="PTI Engine Handwriting Recognition API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="aknfep_settings_api" name="Avkon FEP Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+     </component>
+     <component id="aknfep_status_api" name="Avkon FEP Status API" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+      </meta>
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+     </component>
+     <component id="ptiengine_key_definations_api" name="PTI Engine Key Definitions API" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+      </meta>
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+     </component>
+     <component id="aknfep_definitions_api" name="Avkon FEP Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+     </component>
+     <component id="aknfep_pen_support_api" name="Avkon FEP Pen Support API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+     </component>
+     <component id="ptiengine_indic_definitions_api" name="PTI Engine Indic Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+     </component>
+     <component id="aknfep_uiinterface_api" name="Avkon FEP UI Interface API" class="api" filter="s60">
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+      <unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group" filter="test,api_test"/>
+     </component>
+    </collection>
+    <collection id="textinput" name="Text Input" level="framework">
+     <component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
+      <meta rel="config">
+       <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+      </meta>
+      <!--uncomment when configuration is turned on and textinput_build is removed-->
+      <!--  <unit bldFile="textinput/ptienginev2/group"/>-->
+     </component>
+     <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
+      <unit bldFile="/mw/inputmethods/textinput/akninputlanguage/group"/>
+     </component>
+     <component id="ptihangulcore" filter="s60" name="PIT Hangul Core" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/ptihangulcore/group"/>
+     </component>
+     <component id="ptikoreanqwertycore" filter="s60" name="PTI Korean QWERTY Core" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/ptikoreanqwertycore/group"/>
+     </component>
+     <component id="peninputarc" filter="s60" name="Pen Input Arc">
+      <unit bldFile="/mw/inputmethods/textinput/peninputarc/group"/>
+     </component>
+     <component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
+      <unit bldFile="/mw/inputmethods/textinput/peninputcommonctrls/group"/>
+     </component>
+     <component id="peninputhwrboxcn" filter="s60" name="Chinese Handwriting Recognition Box" class="plugin">
+      <unit bldFile="/mw/inputmethods/textinput/peninputhwrboxcn/group"/>
+     </component>
+     <component id="peninputvkbcn" filter="s60" name="Chinese Virtual Keyboard" class="plugin">
+      <unit bldFile="/mw/inputmethods/textinput/peninputvkbcn/group"/>
+     </component>
+     <component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
+      <unit bldFile="/mw/inputmethods/textinput/peninputcommonlayout/group"/>
+     </component>
+     <component id="peninputgenerichwr" filter="s60" name="Pen Input Generic Handwriting Recognition" class="plugin">
+      <unit bldFile="/mw/inputmethods/textinput/peninputgenerichwr/group"/>
+     </component>
+     <component id="peninputgenericvkb" filter="s60" name="Pen Input Generic Virtual Keyboard" class="plugin">
+      <unit bldFile="/mw/inputmethods/textinput/peninputgenericvkb/group"/>
+     </component>
+     <component id="peninputcommonctrlsjp" filter="s60" name="Pen Input Common Controls Japanese">
+      <unit bldFile="/mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
+     </component>
+     <component id="peninputhwrboxjp" filter="s60" name="Japanese Handwriting Recognition Box" class="plugin">
+      <unit bldFile="/mw/inputmethods/textinput/peninputhwrboxjp/group"/>
+     </component>
+     <component id="peninputvkbjp" filter="s60" name="Japanese Virtual Keyboard" class="plugin">
+      <unit bldFile="/mw/inputmethods/textinput/peninputvkbjp/group"/>
+     </component>
+     <component id="gslangplugin" filter="s60" name="GS Language Plugin" class="plugin">
+      <unit bldFile="/mw/inputmethods/textinput/GSLangPlugin"/>
+     </component>
+     <component id="peninputgenericitut" filter="s60" name="Pen Input Generic ITU-T" class="plugin" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/peninputgenericitut/group"/>
+     </component>
+     <component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/peninputhwrtrui/group"/>
+     </component>
+     <component id="peninputhwrfscn" filter="s60" name="Pen Input Chinese Full Screen Handwriting Recognition" class="plugin" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/peninputhwrfscn/group"/>
+     </component>
+     <component id="peninputvkbkr" filter="s60" name="Pen Input Korean Virtual Keyboard" class="plugin" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/peninputvkbkr/group"/>
+     </component>
+     <component id="peninputfingerhwr" filter="s60" name="Pen Input Finger Handwriting Recognition" class="plugin" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/peninputfingerhwr/group"/>
+     </component>
+     <component id="peninputsplititut" filter="s60" name="Pen Input Split ITU-T" class="plugin" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/peninputsplititut/group"/>
+     </component>
+     <component id="peninputsplitqwerty" filter="s60" name="Pen Input Split QWERTY" class="plugin" introduced="^3">
+      <unit bldFile="/mw/inputmethods/textinput/peninputsplitqwerty/group"/>
+     </component>
+     <component id="textinput_build" filter="s60" name="Text Input Build">
+      <!--needed for #ifdef, can be removed when configuration is implemented -->
+      <unit bldFile="/mw/inputmethods/textinput/group"/>
+     </component>
+    </collection>
+    <collection id="fep" name="FEP" level="engine">
+     <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
+      <unit bldFile="/mw/inputmethods/fep/aknfep/group"/>
+     </component>
+     <component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
+      <unit bldFile="/mw/inputmethods/fep/frontendprocessor/group" mrp="/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+     </component>
+    </collection>
+    <collection id="inputmethods_info" name="Input Methods Info" level="api">
+     <component id="inputmethods_api_tests" filter="s60,test,api_test" name="Input Methods API Tests" introduced="^2" purpose="development">
+      <unit bldFile="/mw/inputmethods/tsrc/group"/>
+     </component>
+     <component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="qt" level="generic" tech-domain="ui" name="Qt"/>
+   <package id="classicui" level="generic" tech-domain="ui" name="Classic UI" levels="base support server generic specific">
+    <collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
+     <component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/japanese_reading_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="global_popup_priority_controller_api" name="Global Popup Priority Controller API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="item_finder_api" name="Item Finder API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/item_finder_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="avkon_fonts_api" name="Avkon Fonts API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_utilities_api" name="Extended Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+     </component>
+     <component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/personalisation_application_api/group"/>
+     </component>
+     <component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="avkon_secondary_display_support_api" name="AVKON Secondary Display Support API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_setting_pages_api" name="Extended Setting Pages API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_lists_api" name="Extended Lists API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_lists_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="input_block_api" name="Input Block API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/input_block_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="avkon_ui_server_api" name="AVKON UI Server API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="number_grouping_api" name="Number Grouping API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/number_grouping_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_status_pane_api" name="Extended Status Pane API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_notifiers_api" name="Extended Notifiers API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="task_list_api" name="Task List API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/task_list_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+     </component>
+     <component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+     </component>
+     <component id="emergency_call_support_api" name="Emergency Call Support API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_dialogs_api" name="Extended Dialogs API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+     </component>
+     <component id="legacy_ui_framework_headers_api" name="Legacy UI Framework Headers API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+     </component>
+     <component id="extended_editors_api" name="Extended Editors API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_editors_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="alarm_api" name="Alarm API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/alarm_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="aiw_service_interface_base_api" name="AIW Service Interface Base API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="list_effects_api" name="List Effects API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/list_effects_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="find_item_ui_api" name="Find Item UI API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="server_application_services_api" name="Server Application Services API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/server_application_services_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="common_ui_settings_api" name="Common UI Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+     </component>
+     <component id="aiw_service_interface_menu_api" name="AIW Service Interface Menu API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="eikon_server_extension_client_api" name="EIKON Server Extension Client API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="skinnable_clock_api" name="Skinnable Clock API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="battery_pane_api" name="Battery Pane API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/battery_pane_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+     </component>
+     <component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+     </component>
+     <component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="avkon_status_api" name="AVKON Status API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_status_api/group"/>
+     </component>
+     <component id="application_switching_api" name="Application Switching API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/application_switching_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="avkon_localised_texts_api" name="AVKON Localised Texts API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+     </component>
+     <component id="avkon_secondary_display_api" name="AVKON Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+     </component>
+     <component id="extended_animation_api" name="Extended Animation API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_animation_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_notes_api" name="Extended Notes API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="screensaver_animation_plugin_definitions_api" name="Screensaver Animation Plugin Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
+     </component>
+     <component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/text_scroller_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="custom_cursors_api" name="Custom Cursors API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="screensaver_settings_api" name="Screensaver Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/screensaver_settings_api/group"/>
+     </component>
+     <component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+     </component>
+     <component id="extended_indicators_api" name="Extended Indicators API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_indicators_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="special_character_table_api" name="Special Character Table API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/special_character_table_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="avkon_settings_api" name="AVKON Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_settings_api/group"/>
+     </component>
+     <component id="extended_sounds_api" name="Extended Sounds API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_sounds_api/group"/>
+     </component>
+     <component id="themes_settings_api" name="Themes Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/themes_settings_api/group"/>
+     </component>
+     <component id="media_shared_document_api" name="Media Shared Document API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/media_shared_document_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_queries_api" name="Extended Queries API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_queries_api/group"/>
+     </component>
+     <component id="phone_number_text_utilities_api" name="Phone Number Text Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="screensaver_runtime_api" name="Screensaver Runtime API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
+     </component>
+     <component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_scroller_api/group"/>
+     </component>
+     <component id="key_rotator_api" name="Key Rotator API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/key_rotator_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_grids_api" name="Extended Grids API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_grids_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="generic_parameter_api" name="Generic Parameter API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/generic_parameter_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="indicator_touch_observer_api" name="Indicator Touch Observer API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+     </component>
+     <component id="popup_form_api" name="Popup Form API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/popup_form_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="stylus_activated_popup_api" name="Stylus Activated Pop-up API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="indicator_plugin_api" name="Indicator Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="layout_configuration_api" name="Layout Configuration API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/layout_configuration_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+     </component>
+     <component id="extended_initialization_api" name="Extended Initialization API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_initialization_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="long_tap_animation_api" name="Long Tap Animation API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_ui_framework_definitions_api" name="Extended UI Framework Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+     </component>
+     <component id="extended_buttons_api" name="Extended Buttons API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_buttons_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="aiw_provider_utility_api" name="AIW Provider Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="transition_effect_parameters_api" name="Transition Effect Parameters API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="extended_input_capabilities_api" name="Extended Input Capabilities API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="uikon_status_api" name="UIKON Status API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/uikon_status_api/group"/>
+     </component>
+     <component id="transition_effect_utilities_api" name="Transition Effect Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="pointer_event_modifier_api" name="Pointer Event Modifier API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="avkon_testability_api" name="AVKON Testability API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/avkon_testability_api/group"/>
+     </component>
+     <component id="ganes_api" name="ganes_api" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/ganes_api/group"/>
+     </component>
+     <component id="ode_api" name="Ode API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/ode_api/group"/>
+     </component>
+     <component id="physics_api" name="Physics API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/physics_api/group"/>
+     </component>
+     <component id="touch_pane_api" name="Touch Pane API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/touch_pane_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="touch_pane_observer_api" name="Touch Pane Observer API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+     </component>
+     <component id="alternate_fs_api" name="Alternate FS API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/alternate_fs_api/group"/>
+     </component>
+     <component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/discreet_popup_api/group"/>
+     </component>
+     <component id="touch_gesture_framework_api" name="Touch Gesture Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+      <!-- should this be commented out? -->
+      <!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+     </component>
+     <component id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/tsrc/group" filter="test,api_test"/>
+     </component>
+    </collection>
+    <collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
+     <component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/input_frame_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="window_server_event_observer_api" name="Window Server Event Observer API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="application_framework_api" name="Application Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/application_framework_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="scroller_api" name="Scroller API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/scroller_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="ui_framework_utilities_api" name="UI Framework Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="ui_framework_definitions_api" name="UI Framework Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="buttons_api" name="Buttons API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/buttons_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="queries_api" name="Queries API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/queries_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="aiw_generic_parameter_api" name="AIW Generic Parameter API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="editors_api" name="Editors API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/editors_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="fonts_api" name="Fonts API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/fonts_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="screen_clearer_api" name="Screen Clearer API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/screen_clearer_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="notifiers_api" name="Notifiers API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/notifiers_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="notes_api" name="Notes API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="screen_saver_api" name="Screen Saver API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/screen_saver_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/status_pane_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="base_controls_api" name="Base Controls API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/base_controls_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="grids_api" name="Grids API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/grids_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="context_pane_api" name="Context Pane API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/context_pane_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="lists_api" name="Lists API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/lists_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="popups_api" name="Popups API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/popups_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="misc_controls_api" name="Misc Controls API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/misc_controls_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="keylock_api" name="Keylock API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/keylock_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="options_menu_api" name="Options Menu API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/options_menu_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="hierarchical_lists_api" name="Hierarchical Lists API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="navigation_pane_api" name="Navigation Pane API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/navigation_pane_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="tabs_api" name="Tabs API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/tabs_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="title_pane_touch_observer_api" name="Title Pane Touch Observer API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+     </component>
+     <component id="choice_list_api" name="Choice List API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/choice_list_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="info_popup_note_api" name="Info Popup Note API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/info_popup_note_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="setting_pages_api" name="Setting Pages API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/setting_pages_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="screen_mode_api" name="Screen Mode API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/screen_mode_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="indicators_api" name="Indicators API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/indicators_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="error_ui_api" name="Error UI API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/error_ui_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="animation_api" name="Animation API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/animation_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="searchfield_api" name="Searchfield API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/searchfield_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="labels_api" name="Labels API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/labels_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="hotkeys_api" name="Hotkeys API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/hotkeys_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="initialization_api" name="Initialization API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/initialization_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="volume_control_api" name="Volume Control API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/volume_control_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="title_pane_api" name="Title Pane API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/title_pane_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="sounds_api" name="Sounds API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/sounds_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="aiw_service_handler_api" name="AIW Service Handler API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="aiw_criteria_api" name="AIW Criteria API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="touch_ui_utilities_api" name="Touch UI Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="generic_button_api" name="Generic Button API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/generic_button_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="form_api" name="Form API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/form_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="uikon_core_controls" name="Uikon Core Controls" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/uikon_core_controls/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="calendar_api" name="Calendar API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/calendar_api/group"/>
+     </component>
+     <component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/toolbar_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="server_application_api" name="Server Application API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/server_application_api/group"/>
+     </component>
+     <component id="slider_api" name="Slider API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/slider_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="private_ui_framework_api" name="Private UI Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="dialogs_api" name="Dialogs API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/dialogs_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="document_handler_api" name="Document handler API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/document_handler_api/group"/>
+     </component>
+     <component id="images_api" name="Images API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/images_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="stylus_popup_menu_api" name="Stylus Pop-up Menu API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="information_preview_popup_api" name="Information Preview Popup API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+      <unit bldFile="/mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="intermediate_state_api" name="Intermediate State API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/intermediate_state_api/group"/>
+     </component>
+     <component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
+      <unit bldFile="/mw/classicui/classicui_pub/help_launcher_api/group"/>
+     </component>
+    </collection>
+    <collection id="ode" name="Open Dynamics Engine" level="support">
+     <!-- the collection is really a component. Move down a directory.-->
+     <component id="ode_build" filter="s60" name="ODE">
+      <unit bldFile="/mw/classicui/ode/group"/>
+     </component>
+    </collection>
+    <collection id="uifw" name="UI Framework" level="server">
+     <component id="uiklaf" filter="s60" name="Uikon Look-and-Feel">
+      <unit bldFile="/mw/classicui/uifw/uiklaf/group"/>
+     </component>
+     <component id="eikctl" filter="s60" name="Eikon Controls">
+      <unit bldFile="/mw/classicui/uifw/eikctl/group"/>
+     </component>
+     <component id="avkon" filter="s60" name="Avkon">
+      <!-- can only have one unit. Split into 3 components, or #include all from same bld.inf -->
+      <unit bldFile="/mw/classicui/uifw/avkon/aknphysics/group"/>
+      <unit bldFile="/mw/classicui/uifw/avkon/group"/>
+      <unit bldFile="/mw/classicui/uifw/avkon/aknconf/group"/>
+     </component>
+     <component id="eikstd" filter="s60" name="Eikon Standard">
+      <unit bldFile="/mw/classicui/uifw/eikstd/group"/>
+     </component>
+     <component id="aknglobalui" filter="s60" name="Avkon Global UI">
+      <unit bldFile="/mw/classicui/uifw/aknglobalui/group"/>
+     </component>
+     <component id="ganes" filter="s60" name="Ganes">
+      <unit bldFile="/mw/classicui/uifw/ganes/group"/>
+     </component>
+    </collection>
+    <collection id="commonuis" name="Common UIs" level="specific">
+     <component id="commonui" filter="s60" name="Common UI">
+      <unit bldFile="/mw/classicui/commonuis/commonui/group"/>
+     </component>
+     <component id="commondialogs" filter="s60" name="Common Dialogs">
+      <unit bldFile="/mw/classicui/commonuis/commondialogs/group"/>
+     </component>
+    </collection>
+    <collection id="applicationinterworkingfw" name="Application Interworking Framework" level="generic">
+     <component id="aifwservicehandler" filter="s60" name="Application Interworking Service Handler">
+      <unit bldFile="/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
+     </component>
+    </collection>
+    <collection id="psln" name="Personalization" level="specific">
+     <!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+     <component id="psln_build" filter="s60" name="Personalization Build">
+      <unit bldFile="/mw/classicui/psln/group"/>
+     </component>
+    </collection>
+    <collection id="commonadapter" name="Common Adapter" level="support">
+     <!-- the collection is really a component. Move down a directory.-->
+     <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
+      <unit bldFile="/mw/classicui/commonadapter/group"/>
+     </component>
+    </collection>
+    <collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
+     <!-- the collection is really a component. Move down a directory.-->
+     <component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
+      <unit bldFile="/mw/classicui/akntouchgesturefw/group"/>
+     </component>
+    </collection>
+    <collection id="uiutils" name="UI Utils" level="specific">
+     <component id="localizer" filter="s60" name="Directory Localizer">
+      <unit bldFile="/mw/classicui/uiutils/localizer/group"/>
+     </component>
+     <component id="findutil" filter="s60" name="Find Utility">
+      <unit bldFile="/mw/classicui/uiutils/findutil/group"/>
+     </component>
+     <component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
+      <unit bldFile="/mw/classicui/uiutils/gamerecognizer/group"/>
+     </component>
+     <component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
+      <unit bldFile="/mw/classicui/uiutils/aknjapanesereading/group"/>
+     </component>
+    </collection>
+    <collection id="commonuisupport" name="Common UI Support" level="support">
+     <component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
+      <unit bldFile="/mw/classicui/commonuisupport/uikon/group" mrp="/mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
+     </component>
+     <component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
+      <unit bldFile="/mw/classicui/commonuisupport/errorresolverdata/group" mrp="/mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
+     </component>
+     <component id="uilaf" name="UI Look and Feel" introduced="6.0" purpose="mandatory">
+      <unit bldFile="/mw/classicui/commonuisupport/uilaf/GROUP" mrp="/mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
+     </component>
+     <component id="grid" name="Grid" purpose="optional">
+      <unit bldFile="/mw/classicui/commonuisupport/grid/group" mrp="/mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+     </component>
+     <component id="uifwsdocs" name="UI Frameworks Documentation" purpose="development" class="doc">
+      <unit mrp="/mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+     </component>
+    </collection>
+    <collection id="lafagnosticuifoundation" name="Look-and-Feel Agnostic UI Foundation" level="base">
+     <component id="cone" name="Control Environment" purpose="mandatory">
+      <unit bldFile="/mw/classicui/lafagnosticuifoundation/cone/group" mrp="/mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+     </component>
+     <component id="graphicseffects" name="Graphics Effects" introduced="9.2" purpose="optional">
+      <unit bldFile="/mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="/mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+     </component>
+     <component id="uigraphicsutils" name="UI Graphics Utilities" purpose="mandatory">
+      <unit bldFile="/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
+     </component>
+     <component id="clockanim" name="Clock" purpose="optional" class="plugin">
+      <unit bldFile="/mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="/mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
+     </component>
+     <component id="bmpanimation" name="BMP Animation" introduced="6.0" purpose="optional">
+      <unit bldFile="/mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="/mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
+     </component>
+     <component id="animation" name="Animation" introduced="9.1" purpose="optional">
+      <unit bldFile="/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
+     </component>
+    </collection>
+    <collection id="classicui_info" name="Classic UI Info" level="specific">
+     <!-- the multiple units in the API test components need to be resolved -->
+     <component id="classicui_plat_api_test" filter="s60,test,api_test" name="Classic UI Platform API Tests" purpose="development">
+      <!-- can only have one unit. Need to #include from a single bld.inf -->
+      <unit bldFile="/mw/classicui/tsrc/group"/>
+     </component>
+     <component id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="svgt" level="generic" tech-domain="ui" name="SVG Tiny" levels="util ui">
+    <collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
+     <component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
+      <unit bldFile="/mw/svgt/svgt_plat/svgt_api/group"/>
+     </component>
+     <component id="nvg_api" name="NVG API" introduced="9.2" class="api" filter="s60">
+      <unit bldFile="/mw/svgt/svgt_plat/nvg_api/group"/>
+     </component>
+    </collection>
+    <collection id="svgtopt" name="SVG-T Engine" level="util">
+     <component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
+      <!-- component is at collection level. Needs to be moved down a directory -->
+      <unit bldFile="/mw/svgt/svgtopt/group"/>
+     </component>
+     <component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
+      <unit bldFile="/mw/svgt/svgtopt/svgtplugin/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="uiaccelerator" level="generic" tech-domain="ui" name="UI Accelerator" levels="plugin framework server ex if">
+    <collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
+     <component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
+      <unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+     </component>
+     <component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
+      <unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+     </component>
+     <component id="alf_extended_visual_api" name="ALF Extended Visual API" class="api" filter="s60">
+      <unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+     </component>
+     <component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
+      <unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+     </component>
+     <component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
+      <unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+     </component>
+     <component id="alf_client_server_api" name="ALF Client Server API" class="api" filter="s60">
+      <unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
+     </component>
+    </collection>
+    <collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
+     <component id="hitchcock" filter="s60" name="Hitchcock">
+      <unit bldFile="/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
+     </component>
+     <component id="uiacceltk_build" filter="s60" name="UI Accelerator Toolkit Build">
+      <!-- move into the other component, or  remove the #include and make this UI Accelerator Toolkit ROM-->
+      <unit bldFile="/mw/uiaccelerator/uiacceltk/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="uiresources" level="generic" tech-domain="ui" name="UI Resources" levels="compile plugin framework server generic data">
+    <!-- are the custom filters below needed? -->
+    <collection id="uiresources_pub" name="UI Resources Public Interfaces" level="data">
+     <component id="pictograph_api" name="Pictograph API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" filter="test,api_test,pictograph_api"/>
+     </component>
+     <component id="skins_api" name="Skins API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_pub/skins_api/tsrc/group" filter="test,api_test,skins_api"/>
+     </component>
+     <component id="font_definition_api" name="Font Definition API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="test,api_test,font_definition_api"/>
+     </component>
+     <component id="graphics_api" name="Graphics API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" filter="test,api_test,graphics_api"/>
+     </component>
+     <component id="scalable_icons_api" name="Scalable Icons API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+     </component>
+     <component id="layout_id_definitions_api" name="Layout ID Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+     </component>
+    </collection>
+    <collection id="uiresources_plat" name="UI Resources Platform Interfaces" level="data">
+     <component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="test,api_test,layout_system_private_api"/>
+     </component>
+     <component id="layout_data_api" name="Layout Data API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="test,api_test,layout_data_api"/>
+     </component>
+     <component id="cdl_api" name="CDL API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="test,api_test,cdl_api"/>
+     </component>
+     <component id="extended_skins_api" name="Extended Skins API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" filter="test,api_test,extended_skins_api"/>
+     </component>
+     <component id="tfx_server_controller_plugin_api" name="TFX Server Controller Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+     </component>
+     <component id="extended_fonts_api" name="Extended Fonts API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="test,api_test,extended_fonts_api"/>
+     </component>
+     <component id="graphic_configuration_api" name="Graphic Configuration API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" filter="test,api_test,graphic_configuration_api"/>
+     </component>
+     <component id="mif_header_cdl_api" name="MIF Header CDL API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+     </component>
+     <component id="personalisation_and_skins_settings_api" name="Personalisation and Skins Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+     </component>
+     <component id="tfx_effect_setup_plugin_api" name="TFX Effect Setup Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+     </component>
+     <component id="mifconv_definitions_api" name="Mifconv Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+     </component>
+     <component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+     </component>
+     <component id="language_code_definitions_api" name="Language Code Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+     </component>
+     <component id="skins_image_attributes_api" name="Skins Image Attributes API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+      <unit bldFile="/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="test,api_test,skins_image_attributes_api"/>
+     </component>
+     <component id="private_user_area_code_definitions_api" name="Private User Area Code Definitions API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+     </component>
+     <component id="tfx_server_plugin_ids_api" name="TFX Server Plug-in IDs API" class="api" filter="s60">
+      <unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+     </component>
+    </collection>
+    <collection id="uiresources_info" name="UI Resources Info" level="data">
+     <component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
+      <unit bldFile="/mw/uiresources/tsrc/group" filter="uiresources_api_all"/>
+     </component>
+    </collection>
+    <collection id="uigraphics" name="UI Graphics" level="generic">
+     <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
+      <unit bldFile="/mw/uiresources/uigraphics/bitmaps2/group"/>
+     </component>
+     <component id="icons" filter="s60" class="config" name="Icons">
+      <unit bldFile="/mw/uiresources/uigraphics/icons/group"/>
+     </component>
+     <component id="variatedbitmaps" filter="s60" name="Variated Bitmaps" class="config">
+      <unit bldFile="/mw/uiresources/uigraphics/variatedbitmaps/group"/>
+     </component>
+     <component id="aknicon" filter="s60" name="Avkon Icon Framework">
+      <unit bldFile="/mw/uiresources/uigraphics/aknicon/group"/>
+     </component>
+     <component id="nvgrenderstage" filter="sf_build" name="NVG Render Stage">
+      <unit bldFile="/mw/uiresources/uigraphics/nvgrenderstage/group"/>
+     </component>
+    </collection>
+    <collection id="layouts" name="Layouts" level="plugin">
+     <component id="cdl" filter="s60" name="Customization Definition Language">
+      <!-- can only have one unit. Need to #include them or split into multiple components -->
+      <unit bldFile="/mw/uiresources/layouts/cdl/cdlengine/group"/>
+      <unit bldFile="/mw/uiresources/layouts/cdl/cdlserver/group"/>
+     </component>
+     <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
+      <unit bldFile="/mw/uiresources/layouts/aknlayout2/group"/>
+     </component>
+    </collection>
+    <collection id="skins" name="Skins" level="data">
+     <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
+      <unit bldFile="/mw/uiresources/skins/aknskincontent/group"/>
+     </component>
+     <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
+      <unit bldFile="/mw/uiresources/skins/aknskins/group"/>
+     </component>
+    </collection>
+    <collection id="pictographs" name="Pictographs" level="data">
+     <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
+      <unit bldFile="/mw/uiresources/pictographs/aknpictograph/group"/>
+     </component>
+    </collection>
+    <collection id="locales" name="Locales" level="framework">
+     <component id="locales_build" filter="s60" name="Locales Build">
+      <unit bldFile="/mw/uiresources/locales/loce32"/>
+     </component>
+    </collection>
+    <collection id="uiconfig" name="UI Config" level="server">
+     <component id="s60config" filter="s60" name="S60 UI Config">
+      <unit bldFile="/mw/uiresources/uiconfig/s60config/group"/>
+     </component>
+    </collection>
+    <collection id="fontsupport" name="Font Support" level="generic">
+     <component id="fontprovider" filter="s60" name="Font Provider">
+      <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
+     </component>
+     <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
+-->
+     <component id="fontutils" filter="sf_build" name="Font Utils">
+      <unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
+     </component>
+    </collection>
+    <collection id="helpthemes" name="Help Themes" level="data">
+     <!-- collection is really a component. Need to move down a directory -->
+     <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
+      <unit bldFile="/mw/uiresources/helpthemes/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="hapticsservices" level="generic" tech-domain="ui" name="Haptics Services" levels="fw server api">
+    <collection id="hapticsservices_plat" name="Haptics Services Platform Interfaces" level="api">
+     <component id="tacticon_api" name="Tacticon API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+     </component>
+     <component id="tactile_feedback_core_api" name="Tactile Feedback Core API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+     </component>
+     <component id="tactile_feedback_server_api" name="Tactile Feedback Server API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+     </component>
+    </collection>
+    <collection id="hapticsservices_pub" name="Haptics Services Public Interfaces" level="api">
+     <component id="tactile_feedback_client_api" name="Tactile Feedback Client API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+     </component>
+    </collection>
+    <collection id="tacticonserver" name="Tacticon Server" level="server">
+     <!-- collection is really a component. Move down a directory  -->
+     <component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
+      <unit bldFile="/mw/hapticsservices/tacticonserver/group"/>
+      <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+     </component>
+    </collection>
+    <collection id="tactilefeedback" name="Tactile Feedback" level="fw">
+     <component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
+      <unit bldFile="/mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+     </component>
+     <component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
+      <unit bldFile="/mw/hapticsservices/tactilefeedback/tactilefeedbackresolver/group"/>
+     </component>
+     <component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
+      <unit bldFile="/mw/hapticsservices/tactilefeedback/tactileclickplugin/group"/>
+     </component>
+     <component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
+      <unit bldFile="/mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+     </component>
+     <component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
+      <unit bldFile="/mw/hapticsservices/tactilefeedback/tactileactionplugin/group"/>
+     </component>
+     <component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
+      <!-- consider moving IBY to one fo the above components -->
+      <unit bldFile="/mw/hapticsservices/tactilefeedback/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="gsprofilesrv" level="generic" tech-domain="ui" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+    <collection id="gsprofilesrv_pub" name="GS and Profiles Services Public Interfaces" level="specific">
+     <component id="profiles_engine_active_profile_settings_api" name="Profiles Engine Active Profile Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+     </component>
+     <component id="profiles_engine_wrapper_api" name="Profiles Engine Wrapper API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+     </component>
+    </collection>
+    <collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
+     <component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+     </component>
+     <component id="profiles_mediafilelist_api" name="Media File List API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
+     </component>
+     <component id="filelist_api" name="File List API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
+     </component>
+     <component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+     </component>
+     <component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+     </component>
+     <component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+     </component>
+     <component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+     </component>
+     <component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+     </component>
+     <component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
+      <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+     </component>
+    </collection>
+    <collection id="gssettingsuis" name="General Settings UIs" level="framework">
+     <component id="gs" filter="s60" name="General Settings" introduced="9.2">
+      <unit bldFile="/mw/gsprofilesrv/gssettingsuis/gs/group"/>
+     </component>
+    </collection>
+    <collection id="profilesservices" name="Profiles Services" level="server">
+     <component id="filelist" filter="s60" name="File List" introduced="9.1">
+      <unit bldFile="/mw/gsprofilesrv/profilesservices/filelist/group"/>
+     </component>
+     <component id="mediafilelist" filter="s60" name="Media File List" introduced="^2">
+      <unit bldFile="/mw/gsprofilesrv/profilesservices/mediafilelist/group"/>
+     </component>
+     <component id="profileengine" filter="s60" name="Profile Engine" introduced="9.1">
+      <unit bldFile="/mw/gsprofilesrv/profilesservices/profileengine/group"/>
+     </component>
+     <component id="ringingtone3dplugin" filter="s60" name="Ringing Tone 3D Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="homescreensrv" level="specific" tech-domain="ui" name="Home Screen Services" levels="plugin framework server generic specific">
+    <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
+     <component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
+     </component>
+     <component id="ai_utilities_api" name="AI Utilities API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/internal/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="ai_plugin_management_api" name="AI Plug-in Management API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
+     </component>
+     <component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
+     </component>
+     <component id="ai_variation_api" name="AI Variation API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
+     </component>
+     <component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="menu_model_api" name="Menu Model API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
+     </component>
+     <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="external_home_screen_api" name="External Home Screen API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
+     </component>
+     <component id="menu_content_service_api" name="Menu Content Service API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+     </component>
+     <component id="sapi_backstepping" name="SAPI Backstepping" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
+     </component>
+     <component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
+     </component>
+     <component id="sapi_homescreenplugin" name="SAPI Homescreen Plugin" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="sapi_menucontent" name="SAPI Menu Content" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
+     </component>
+     <component id="xcfw_api" name="XCFW API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
+     </component>
+     <component id="idlefw_api" name="Idle Framework API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
+     </component>
+     <component id="hs_widget_publisher_api" name="Home Screen Publishing API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+     </component>
+     <component id="context_utility_api" name="UI Context Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/context_utility_api/group"/>
+     </component>
+     <component id="hs_settings_api" name="HS Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
+     </component>
+     <component id="hs_content_control_api" name="HS Content Control API" class="api" filter="s60">
+      <unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
+     </component>
+    </collection>
+    <collection id="xcfw" name="XML Content Framework" level="framework">
+     <!-- collection is really a component, needs to be moved down a directory -->
+     <component id="xcfw_build" filter="s60" name="XML Content Framework Build">
+      <unit bldFile="/mw/homescreensrv/xcfw/group"/>
+     </component>
+    </collection>
+    <collection id="homescreenpluginsrv" name="Home Screen Plugin Service" level="plugin">
+     <component id="hspsdefinitionengine" filter="s60" name="HS Plugin Service Definition Engine">
+      <!-- <unit bldFile="homescreenpluginsrv/hspsdefinitionengine/group"/> -->
+     </component>
+     <component id="hspsdom" filter="s60" name="HS Plugin Service DOM">
+      <!-- <unit bldFile="homescreenpluginsrv/hspsdom/group"/> -->
+     </component>
+     <component id="hspstools" filter="s60" name="HS Server Tools">
+      <meta rel="config">
+       <defined condition="____HSPS_CFG_LOG_ON____"/>
+      </meta>
+      <!-- <unit bldFile="homescreenpluginsrv/hspstools/group"/> -->
+     </component>
+     <component id="hspspluginregistry" filter="s60" name="HS Plugin Registry">
+      <!-- <unit bldFile="homescreenpluginsrv/hspspluginregistry/group"/>-->
+     </component>
+     <component id="hspsmanager" filter="s60" name="HSPS Manager">
+      <!-- <unit bldFile="homescreenpluginsrv/hspsmanager/group"/>-->
+     </component>
+     <component id="hspsodt" filter="s60" name="HSPS Object Description Tree">
+      <!-- <unit bldFile="homescreenpluginsrv/hspsodt/group"/>-->
+     </component>
+     <component id="hspsresource" filter="s60" name="HS Plugin Server Resource">
+      <!-- <unit bldFile="homescreenpluginsrv/hspsresource/group"/>-->
+     </component>
+     <component id="hspsresult" filter="s60" name="HS Plugin Server Result">
+      <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+     </component>
+     <component id="homescreen_settings_api" filter="s60" name="HS Settings API" class="api">
+      <!-- <unit bldFile="homescreenpluginsrv/hspsresult/group"/>-->
+     </component>
+     <component id="homescreenpluginsrv_build" filter="s60" name="HSPS Build">
+      <!-- need to break this up into the self-contained components above and uncomment them -->
+      <unit bldFile="/mw/homescreensrv/homescreenpluginsrv/group"/>
+     </component>
+    </collection>
+    <collection id="idlefw" name="Idle Framework" level="framework">
+     <meta rel="config">
+      <defined condition="RD_CUSTOMIZABLE_AI"/>
+     </meta>
+     <!-- Uncomment all units when configuration is in place. All currently #included from idlefw_build -->
+     <component id="idlefw_plugins" filter="s60" name="Idle Framework Plugins" class="plugin">
+      <!--<unit bldFile="idlefw/plugins/group"/>-->
+     </component>
+     <component id="hslaunch" filter="s60" name="Home Screen Launch">
+      <!--<unit bldFile="idlefw/plugins/group"/>-->
+     </component>
+     <component id="idlefw_build" filter="s60" name="Idle Framework Build">
+      <!--split this into components, or separate from the above components and move this down a directory -->
+      <unit bldFile="/mw/homescreensrv/idlefw/group"/>
+     </component>
+    </collection>
+    <collection id="menucontentsrv" name="Menu Content Service" level="generic">
+     <component id="menusatinterface" filter="s60" name="Menu SAT Interface">
+      <unit bldFile="/mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
+     </component>
+     <component id="menucontentsrv_build" filter="s60" name="Menu Content Service Build">
+      <!--split this into components, or separate from the above component and move this down a directory -->
+      <unit bldFile="/mw/homescreensrv/menucontentsrv/group"/>
+     </component>
+    </collection>
+    <collection id="backsteppingsrv" name="Back Stepping Service" level="server">
+     <!-- collection is really a component, needs to be moved down a directory -->
+     <component id="bsengine" name="Back Stepping Engine" filter="s60">
+      <unit bldFile="/mw/homescreensrv/backsteppingsrv/group"/>
+     </component>
+    </collection>
+    <collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
+     <component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
+      <!-- need to move this component outside of contentpublishingutils and into separate component directory -->
+      <meta rel="config">
+       <defined condition="CONTENT_PUBLISHER_DEBUG"/>
+      </meta>
+      <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
+     </component>
+     <component id="contentpublishingutils" filter="s60" name="Content Publishing Utils">
+      <unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
+     </component>
+     <component id="contentpublishingserver" filter="s60" name="Content Publishing Server">
+      <unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
+     </component>
+     <component id="contentharvester" filter="s60" name="Content Harvester">
+      <unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
+     </component>
+     <component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
+      <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+      		If keeping, it need to move down a directory.-->
+      <unit bldFile="/mw/homescreensrv/contentpublishingsrv/group"/>
+     </component>
+    </collection>
+    <collection id="contextutility" name="Context Utility" level="generic">
+     <!-- collection is really a component, needs to be moved down a directory -->
+     <component id="contextutility_build" name="Context Utility Build" filter="s60" introduced="^3">
+      <unit bldFile="/mw/homescreensrv/contextutility/group"/>
+     </component>
+    </collection>
+    <collection id="contentcontrolsrv" name="Content Control Service" level="server">
+     <component id="ccsrv" name="Content Control Service" filter="s60" introduced="^3">
+      <unit bldFile="/mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>
+     </component>
+     <component id="ccsrvapi" name="Content Control Service API" filter="s60" introduced="^3" class="api">
+      <unit bldFile="/mw/homescreensrv/contentcontrolsrv/ccsrvapi/group"/>
+     </component>
+     <component id="ccclientsession" name="Content Control Client Session" filter="s60" introduced="^3">
+      <unit bldFile="/mw/homescreensrv/contentcontrolsrv/ccclientsession/group"/>
+     </component>
+     <component id="hsccclient" name="HS Content Control Client" filter="s60" introduced="^3">
+      <unit bldFile="/mw/homescreensrv/contentcontrolsrv/hsccclient/group"/>
+     </component>
+     <component id="hscontentinfo" name="Home Screen Content Info" filter="s60" introduced="^3">
+      <unit bldFile="/mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
+     </component>
+     <component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
+      <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+      		If keeping, it need to move down a directory.-->
+      <unit bldFile="/mw/homescreensrv/contentcontrolsrv/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="appinstall" level="generic" tech-domain="rt" name="Application Installation" levels="tool framework generic api">
+    <collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
+     <component id="iaupdate_api" name="IA Update API" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+     </component>
+     <component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+     </component>
+     <component id="sw_installer_common_ui_api" name="SW Installer Common UI API" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+     </component>
+     <component id="sw_installer_launcher_api" name="SW Installer Launcher API" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+     </component>
+     <component id="task_management_api" name="Task Management API" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/task_management_api/group"/>
+     </component>
+     <component id="sw_installer_ui_plugin_api" name="SW Installer UI Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+     </component>
+     <component id="sw_installer_cr_keys" name="SW Installer CR Keys" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+     </component>
+     <component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+     </component>
+     <component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+     </component>
+    </collection>
+    <collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
+     <component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
+      <unit bldFile="/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+     </component>
+    </collection>
+    <collection id="ncdengine" name="Nokia Content Discover" level="framework">
+     <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+     <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
+      <unit bldFile="/mw/appinstall/ncdengine/engine/group"/>
+     </component>
+     <component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
+      <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+     </component>
+     <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
+      <unit bldFile="/mw/appinstall/ncdengine/group"/>
+     </component>
+    </collection>
+    <collection id="appinstaller" name="Application Installer" level="generic">
+     <component id="appmngr2" filter="s60" name="Application Manager 2" introduced="^2">
+      <unit bldFile="/mw/appinstall/appinstaller/appmngr2/group"/>
+     </component>
+     <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
+      <unit bldFile="/mw/appinstall/appinstaller/appinstui/group"/>
+     </component>
+    </collection>
+    <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
+     <!-- the collection is really a component. Move down a directory.-->
+     <component id="iaupdateapi_stub_build" name="IA Update API Stub Build" filter="s60" introduced="^2">
+      <unit bldFile="/mw/appinstall/iaupdateapi_stub/group"/>
+     </component>
+    </collection>
+    <collection id="iaupdate" name="Independent Apps Update" level="api">
+     <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+     <component id="iad" name="Software Update" filter="s60" introduced="^2">
+      <unit bldFile="/mw/appinstall/iaupdate/iad/group"/>
+     </component>
+     <component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
+      <unit bldFile="/mw/appinstall/iaupdate/help/group"/>
+     </component>
+     <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+      <unit bldFile="/mw/appinstall/iaupdate/group"/>
+     </component>
+    </collection>
+    <collection id="installationservices" name="Installation Services" level="generic">
+     <component id="swi" name="Secure Software Install" purpose="optional">
+      <unit bldFile="/mw/appinstall/installationservices/swi/group" mrp="/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+     </component>
+     <component id="swidevicetools" name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+      <unit bldFile="/mw/appinstall/installationservices/swidevicetools/group" mrp="/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+     </component>
+     <component id="switestfw" name="Software Install Test Framework" deprecated="^3" introduced="7.0" purpose="development" filter="test">
+      <unit mrp="/mw/appinstall/installationservices/switestfw/group/install_testframework.mrp" bldFile="/mw/appinstall/installationservices/switestfw/group"/>
+     </component>
+     <component id="swiconfig" name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+      <unit bldFile="/mw/appinstall/installationservices/swiconfig/group" mrp="/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+     </component>
+    </collection>
+    <collection id="secureswitools" name="Secure Software Install Tools" level="tool">
+     <component id="makekeys" name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" target="desktop">
+      <unit bldFile="/mw/appinstall/secureswitools/makekeys/group" mrp="/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+     </component>
+     <component id="swianalysistoolkit" name="SWI Analysis Toolkit" purpose="development" target="desktop">
+      <unit bldFile="/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+     </component>
+     <component id="openssllib" name="OpenSSL Library" purpose="optional" target="desktop">
+      <unit mrp="/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+     </component>
+     <component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
+      <unit bldFile="/mw/appinstall/secureswitools/swisistools/group" mrp="/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+     </component>
+    </collection>
+    <collection id="appinstall_info" name="Application Installation Info" level="api">
+     <component id="appinstall_test" filter="s60,test,api_test" name="Application Installation Test" purpose="development">
+      <unit bldFile="/mw/appinstall/tsrc/group"/>
+     </component>
+     <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="serviceapifw" level="specific" tech-domain="rt" name="Service API Framework" levels="plugin framework server generic specific">
+    <collection id="serviceapifw_pub" name="Service API Framework Public Interfaces" level="specific"/>
+    <collection id="serviceapifw_plat" name="Service API Framework Platform Interfaces" level="specific">
+     <component id="rtsecuritymanager_common_api" name="Runtime Security Manager Common API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+     </component>
+     <component id="rtsecuritymanager_utility_api" name="Runtime Security Manager Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+     </component>
+     <component id="rtsecuritymanager_client_api" name="Runtime Security Manager Client API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+     </component>
+     <component id="liw_provider_utility_api" name="LIW Provider Utility API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+     </component>
+     <component id="liw_service_interface_base_api" name="LIW Service Interface Base API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+     </component>
+     <component id="liw_service_interface_menu_api" name="LIW Service Interface Menu API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+     </component>
+     <component id="liw_criteria_api" name="LIW Criteria API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+     </component>
+     <component id="liw_generic_parameter_api" name="LIW Generic Parameter API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+     </component>
+     <component id="liw_service_handler_api" name="LIW Service Handler API" class="api" filter="s60">
+      <unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+     </component>
+    </collection>
+    <collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
+     <component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
+      <unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+     </component>
+     <component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
+      <unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+     </component>
+     <component id="rtsecuritymanagerclient" filter="s60" name="Runtime Security Manager Client">
+      <unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+     </component>
+     <component id="rtsecuritymanager_build" filter="s60" name="Runtime Security Manager Build">
+      <!-- Move the export to the appropriate components, or make this a ROM component by removing the #includes -->
+      <unit bldFile="/mw/serviceapifw/rtsecuritymanager/group"/>
+     </component>
+    </collection>
+    <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
+     <component id="lifwservicehandler" filter="s60" name="Service Handler">
+      <unit bldFile="/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="serviceapi" level="specific" tech-domain="rt" name="Service API" levels="os mw1 mw2 app">
+    <!-- should break up this collection into something meaningful -->
+    <collection id="serviceproviders" name="Service Providers" level="mw1">
+     <component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+     </component>
+     <component id="sapi_location" name="Location SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_location/group"/>
+     </component>
+     <component id="sapi_mediamanagement" name="Media Management SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+     </component>
+     <component id="sapi_landmarks" name="Landmarks SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+     </component>
+     <component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+     </component>
+     <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+     </component>
+     <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+     </component>
+     <component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_logging/group"/>
+     </component>
+     <component id="sapi_sensor" name="Sensor SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+     </component>
+     <component id="sapi_sysinfo" name="Sysinfo SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+     </component>
+     <component id="sapi_serviceregistry" name="Service Registry SAPI" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+     </component>
+     <component id="jsapi" name="Javascript API" filter="s60" class="plugin">
+      <unit bldFile="/mw/serviceapi/serviceproviders/jsapi/group"/>
+     </component>
+     <component id="serviceproviders_build" filter="s60" name="Service API Build">
+      <!--  distribute the exports or make this a ROM component by removing the #includes -->
+      <unit bldFile="/mw/serviceapi/serviceproviders/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="web" level="specific" tech-domain="rt" name="Web" levels="plugin utils server generic specific">
+    <collection id="web_pub" name="Web Public Interfaces" level="specific">
+     <component id="browser_control_api" name="Browser Control API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_pub/browser_control_api/group"/>
+     </component>
+     <component id="download_mgr_client_api" name="Download Manager Client API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_pub/download_mgr_client_api/group"/>
+     </component>
+     <component id="download_mgr_ui_api" name="Download Manager UI Library API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_pub/download_mgr_ui_api/group"/>
+     </component>
+     <component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_pub/favourites_engine_api/group"/>
+     </component>
+     <component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_pub/browser_plugin_api/group"/>
+     </component>
+     <component id="settings_api" name="Settings API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_pub/settings_api/group"/>
+     </component>
+    </collection>
+    <collection id="web_plat" name="Web Platform Interfaces" level="specific">
+     <component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/aiw_browser_provider_api/group"/>
+     </component>
+     <component id="browser_dialogs_provider_api" name="Browser Dialogs Provider API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/browser_dialogs_provider_api/group"/>
+     </component>
+     <component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/browser_platform_api/group"/>
+     </component>
+     <component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/cod_handler_api/group"/>
+     </component>
+     <component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/connection_manager_api/group"/>
+     </component>
+     <component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/cxml_library_api/group"/>
+     </component>
+     <component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/download_mgr_client_api_extn/group"/>
+     </component>
+     <component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/feeds_engine_api/group"/>
+     </component>
+     <component id="launcher_api" name="Launcher API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/launcher_api/group"/>
+     </component>
+     <component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
+      <meta rel="config">
+       <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+      </meta>
+      <unit bldFile="/mw/web/web_plat/multipart_parser_api/group"/>
+     </component>
+     <component id="recent_url_store_api" name="Recent URL Store API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/recent_url_store_api/group"/>
+     </component>
+     <component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/scheme_handler_plugin_api/group"/>
+     </component>
+     <component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/scriptable_plugin_api/group"/>
+     </component>
+     <component id="webutils_api" name="Web Utils API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/webutils_api/group"/>
+     </component>
+     <component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/widget_registry_api/group"/>
+     </component>
+     <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/xml_parser_api/group"/>
+     </component>
+     <component id="stmgesturefw_api" name="State Machine Gesture Framework API " class="api" filter="s60">
+      <unit bldFile="/mw/web/web_plat/stmgesturefw_api/group"/>
+     </component>
+    </collection>
+    <collection id="web_info" name="Web Info" level="specific">
+     <component id="web_build" filter="s60" name="Web Build">
+      <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+      <unit bldFile="/mw/web/group"/>
+     </component>
+    </collection>
+    <collection id="browserutilities" name="Browser Utilities" level="utils">
+     <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
+      <unit bldFile="/mw/web/browserutilities/browserdialogsprovider/group"/>
+     </component>
+     <component id="recenturlstore" filter="s60" name="Recent URL Store">
+      <unit bldFile="/mw/web/browserutilities/recenturlstore/group"/>
+     </component>
+     <component id="xmlparser" filter="s60" name="XML Interface">
+      <unit bldFile="/mw/web/browserutilities/xmlparser/group"/>
+     </component>
+     <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
+      <unit bldFile="/mw/web/browserutilities/cxmllibrary/group"/>
+     </component>
+     <component id="downloadmgr" filter="s60" name="Download Manager">
+      <unit bldFile="/mw/web/browserutilities/downloadmgr/group"/>
+     </component>
+     <component id="connectionmanager" filter="s60" name="Connection Manager">
+      <unit bldFile="/mw/web/browserutilities/connectionmanager/group"/>
+     </component>
+     <component id="browsertelservice" filter="s60" name="Browser Telephony Service">
+      <unit bldFile="/mw/web/browserutilities/browsertelservice/group"/>
+     </component>
+     <component id="favouritesengine" filter="s60" name="Favourites Engine">
+      <unit bldFile="/mw/web/browserutilities/favouritesengine/group"/>
+     </component>
+     <component id="feedsengine" filter="s60" name="Feeds Engine">
+      <unit bldFile="/mw/web/browserutilities/feedsengine/group"/>
+     </component>
+     <component id="multipartparser" filter="s60" name="Multipart Parser">
+      <meta rel="config">
+       <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+      </meta>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+      <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+     </component>
+     <component id="schemehandler" filter="s60" name="Scheme Handler">
+      <unit bldFile="/mw/web/browserutilities/schemehandler/group"/>
+     </component>
+     <component id="webutils" filter="s60" name="Web Utils">
+      <unit bldFile="/mw/web/browserutilities/webutils/group"/>
+     </component>
+     <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
+      <unit bldFile="/mw/web/browserutilities/aiwbrowserprovider/group"/>
+     </component>
+     <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
+      <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+      <unit bldFile="/mw/web/browserutilities/group"/>
+     </component>
+    </collection>
+    <collection id="webengine" name="Web Engine" level="server">
+     <component id="osswebengine" filter="s60" name="OSS Web Engine">
+      <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
+      <unit bldFile="/mw/web/webengine/osswebengine/cache/group"/>
+      <unit bldFile="/mw/web/webengine/osswebengine/memorymanager/group"/>
+      <unit bldFile="/mw/web/webengine/osswebengine/npscript/group"/>
+      <unit bldFile="/mw/web/webengine/osswebengine/webkit/s60/group"/>
+      <unit bldFile="/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
+     </component>
+     <component id="webkitutils" filter="s60" name="WebKit Utils">
+      <unit bldFile="/mw/web/webengine/webkitutils/group"/>
+     </component>
+     <component id="pagescaler" filter="s60" name="Page Scaler">
+      <unit bldFile="/mw/web/webengine/pagescaler/group"/>
+     </component>
+     <component id="webwidgetinstaller" filter="s60" name="Widget Installer">
+      <unit bldFile="/mw/web/webengine/widgetinstaller/group"/>
+     </component>
+     <component id="widgetregistry" filter="s60" name="Widget Registry">
+      <unit bldFile="/mw/web/webengine/widgetregistry/group"/>
+     </component>
+     <component id="wmlengine" filter="s60" name="WML Engine">
+      <unit bldFile="/mw/web/webengine/wmlengine/group"/>
+     </component>
+     <component id="device" filter="s60" name="Device">
+      <!-- this needs a more meaningful name -->
+      <unit bldFile="/mw/web/webengine/device/group"/>
+     </component>
+     <component id="widgetengine" filter="s60" name="Widget Engine">
+      <unit bldFile="/mw/web/webengine/widgetengine/group"/>
+     </component>
+     <component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
+      <unit bldFile="/mw/web/webengine/memoryplugin/group"/>
+     </component>
+     <component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
+      <unit bldFile="/mw/web/webengine/widgetmemoryplugin/group"/>
+     </component>
+     <component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
+      <unit bldFile="/mw/web/webengine/widgetbackuprestore/group"/>
+     </component>
+     <component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
+      <unit bldFile="/mw/web/webengine/browserrecognizers/group"/>
+     </component>
+     <component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
+      <unit bldFile="/mw/web/webengine/wrtharvester/group"/>
+     </component>
+    </collection>
+    <collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
+     <component id="codeng" filter="s60" name="COD Engine">
+      <unit bldFile="/mw/web/codhandler/codeng/group"/>
+     </component>
+     <component id="codui" filter="s60" name="COD UI">
+      <unit bldFile="/mw/web/codhandler/codui/group"/>
+     </component>
+     <component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
+      <unit bldFile="/mw/web/codhandler/codrecog/group"/>
+     </component>
+     <component id="codviewer" filter="s60" name="COD Viewer">
+      <unit bldFile="/mw/web/codhandler/codviewer/group"/>
+     </component>
+     <component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
+      <unit bldFile="/mw/web/codhandler/ddrecog/group"/>
+     </component>
+     <component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
+      <unit bldFile="/mw/web/codhandler/ddviewer/group"/>
+     </component>
+     <component id="coddownload" filter="s60" name="COD Download">
+      <unit bldFile="/mw/web/codhandler/coddownload/group"/>
+     </component>
+     <component id="roapapp" filter="s60" name="ROAP Application">
+      <unit bldFile="/mw/web/codhandler/roapapp/group"/>
+     </component>
+     <component id="codhandler_build" filter="s60" name="COD Handler Build">
+      <!-- Exports need to go into another component or make this self-contained.
+      		#included .hrh file needs to be #included in each of the other components -->
+      <unit bldFile="/mw/web/codhandler/group"/>
+     </component>
+    </collection>
+    <collection id="widgets" name="Web Widget Framework" level="generic">
+     <meta rel="config">
+      <defined condition="RD_BROWSER_WIDGETS"/>
+     </meta>
+     <!-- the following units can be uncommented when configuration is put in place -->
+     <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
+      <meta rel="config">
+       <defined condition="__WEB_WIDGETS"/>
+      </meta>
+      <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+     </component>
+     <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+      <meta rel="config">
+       <defined condition="__WEB_WIDGETS"/>
+      </meta>
+      <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+     </component>
+     <component id="widgetlauncher" filter="s60" name="Widget Launcher">
+      <meta rel="config">
+       <defined condition="__WEB_WIDGETS"/>
+      </meta>
+      <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+     </component>
+     <component id="widgetapp" filter="s60" name="Widget UI">
+      <meta rel="config">
+       <defined condition="__WEB_WIDGETS"/>
+      </meta>
+      <!--<unit bldFile="widgets/widgetapp/group"/>-->
+     </component>
+     <component id="widgetsidchecker" filter="s60" name="Widget SID Checker" introduced="^3">
+      <meta rel="config">
+       <defined condition="APP_SID_CHECK_SUPPORT_FF"/>
+      </meta>
+      <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
+     </component>
+     <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+      <meta rel="config">
+       <defined condition="RD_WIDGET_PREINSTALLER"/>
+      </meta>
+      <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+     </component>
+     <component id="widgetstartup" filter="s60" name="Widget Startup">
+      <meta rel="config">
+       <defined condition="RD_WIDGET_PREINSTALLER"/>
+      </meta>
+      <!--<unit bldFile="widgets/widgetstartup/group"/>-->
+     </component>
+     <component id="widgets_build" filter="s60" name="Widgets Build">
+      <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+      		#included .hrh file needs to be #included in each of the other components -->
+      <unit bldFile="/mw/web/widgets/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="websrv" level="generic" tech-domain="rt" name="Web Services" levels="plugin framework server generic specific">
+    <collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
+     <component id="web_service_description_api" name="Web Service Description API" class="api" filter="s60">
+      <unit bldFile="/mw/websrv/websrv_pub/web_service_description_api/group"/>
+     </component>
+     <component id="web_service_connection_api" name="Web Service Connection API" class="api" filter="s60">
+      <unit bldFile="/mw/websrv/websrv_pub/web_service_connection_api/group"/>
+     </component>
+     <component id="web_service_manager_api" name="Web Service Manager API" class="api" filter="s60">
+      <unit bldFile="/mw/websrv/websrv_pub/web_service_manager_api/group"/>
+     </component>
+     <component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
+      <unit bldFile="/mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+     </component>
+     <component id="web_service_messaging_api" name="Web Service Messaging API" class="api" filter="s60">
+      <unit bldFile="/mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+     </component>
+     <component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
+      <unit bldFile="/mw/websrv/websrv_pub/xml_extensions_api/group"/>
+     </component>
+     <component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
+      <unit bldFile="/mw/websrv/websrv_pub/xml_fragment_api/group"/>
+     </component>
+    </collection>
+    <collection id="webservices" name="Web Services Framework" level="generic">
+     <!-- consider breaking this collection into more meaningful subsets -->
+     <component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
+      <unit bldFile="/mw/websrv/webservices/wsnotifierplugins/group"/>
+     </component>
+     <component id="wslogger" filter="s60" name="WS Logger">
+      <unit bldFile="/mw/websrv/webservices/wslogger/group"/>
+     </component>
+     <component id="wsxml" filter="s60" name="WS XML Extensions">
+      <unit bldFile="/mw/websrv/webservices/wsxml/group"/>
+     </component>
+     <component id="wsutils" filter="s60" name="WS Utils">
+      <unit bldFile="/mw/websrv/webservices/wsutils/group"/>
+     </component>
+     <component id="wsfragment" filter="s60" name="WS Fragment">
+      <unit bldFile="/mw/websrv/webservices/wsfragment/group"/>
+     </component>
+     <component id="wsdescription" filter="s60" name="WS Service Description">
+      <unit bldFile="/mw/websrv/webservices/wsdescription/group"/>
+     </component>
+     <component id="wsconnection" filter="s60" name="WS Service Connection">
+      <unit bldFile="/mw/websrv/webservices/wsconnection/group"/>
+     </component>
+     <component id="wsmessages" filter="s60" name="WS Messages">
+      <unit bldFile="/mw/websrv/webservices/wsmessages/group"/>
+     </component>
+     <component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
+      <unit bldFile="/mw/websrv/webservices/wscredentialmanager/group"/>
+     </component>
+     <component id="wsframework" filter="s60" name="WS Framework">
+      <unit bldFile="/mw/websrv/webservices/wsframework/group"/>
+     </component>
+     <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
+      <unit bldFile="/mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
+     </component>
+     <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
+      <unit bldFile="/mw/websrv/webservices/wsconnectionagent/group"/>
+     </component>
+     <component id="wsprovider" filter="s60" name="WS Provider">
+      <unit bldFile="/mw/websrv/webservices/wsprovider/group"/>
+     </component>
+     <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
+      <unit bldFile="/mw/websrv/webservices/wshostletconnection/group"/>
+     </component>
+     <component id="wsmanager" filter="s60" name="WS Service Manager">
+      <unit bldFile="/mw/websrv/webservices/wsmanager/group"/>
+     </component>
+     <component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
+      <unit bldFile="/mw/websrv/webservices/wsidentitymanager/group"/>
+     </component>
+     <component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
+      <unit bldFile="/mw/websrv/webservices/idwsfplugin/group"/>
+     </component>
+     <component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
+      <unit bldFile="/mw/websrv/webservices/wsibasicplugin/group"/>
+     </component>
+     <component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
+      <unit bldFile="/mw/websrv/webservices/wsrestplugin/group"/>
+     </component>
+     <component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
+      <unit bldFile="/mw/websrv/webservices/idwsfsecuritymechanism/group"/>
+     </component>
+     <component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
+      <unit bldFile="/mw/websrv/webservices/wspasswordtransforms/group"/>
+     </component>
+     <component id="wscore" filter="s60" name="WS Core Service Manager">
+      <unit bldFile="/mw/websrv/webservices/wscore/group"/>
+     </component>
+     <component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
+      <unit bldFile="/mw/websrv/webservices/wslocaltransportplugin/group"/>
+     </component>
+     <component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
+      <unit bldFile="/mw/websrv/webservices/wshostlettransportplugin/group"/>
+     </component>
+     <component id="wsstar" filter="s60" name="WS Star">
+      <!-- can only have one unit. Need to split into separate components or #include from a single bld.inf -->
+      <unit bldFile="/mw/websrv/webservices/wsstar/wsstarpolicy/group"/>
+      <unit bldFile="/mw/websrv/webservices/wsstar/wsstarplugin/group"/>
+      <unit bldFile="/mw/websrv/webservices/wsstar/wsstarmessagehandlers/group"/>
+     </component>
+     <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
+      <unit bldFile="/mw/websrv/webservices/wsoviplugin/group"/>
+     </component>
+     <component id="webservices_build" filter="s60" name="Web Services Build">
+      <!-- need to split into self-contained components -->
+      <unit bldFile="/mw/websrv/webservices/group"/>
+     </component>
+    </collection>
+    <collection id="websrv_info" name="Web Services Info" level="specific">
+     <component id="websrv_bld" filter="s60" name="Web Services Build">
+      <!-- need to include common .hrh in each unit -->
+      <unit bldFile="/mw/websrv/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="platformtools" level="generic" tech-domain="to" name="Platform Tools">
+    <collection id="gfxconversion" name="Graphics Conversion">
+     <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
+      <unit bldFile="/mw/platformtools/gfxconversion/bmconv_s60/group"/>
+     </component>
+     <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
+      <unit bldFile="/mw/platformtools/gfxconversion/mifconv/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="uitools" level="specific" tech-domain="to" name="UI Tools" levels="compile encode tool if">
+    <collection id="uitools_pub" name="UI Tools Public Interfaces" level="if">
+     <component id="third_party_bitmap_palette_api" name="Third Party Bitmap Palette API" class="api" filter="s60">
+      <unit bldFile="/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+     </component>
+    </collection>
+    <collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
+     <component id="cdl_api" name="CDL API" class="api" filter="s60">
+      <unit bldFile="/mw/uitools/uitools_plat/cdl_api/group"/>
+     </component>
+     <component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+      <unit bldFile="/mw/uitools/uitools_plat/layout_system_private_api/group"/>
+     </component>
+    </collection>
+    <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
+     <!-- collection is actually a component. Needs to be moved down a directory -->
+     <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
+      <unit bldFile="/mw/uitools/cdlcompilertoolkit/group"/>
+     </component>
+    </collection>
+    <collection id="cdlcompiler" name="CDL Compiler" level="compile">
+     <!-- collection is actually a component. Needs to be moved down a directory -->
+     <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
+      <unit bldFile="/mw/uitools/cdlcompiler/group"/>
+     </component>
+    </collection>
+    <collection id="gfxtools" name="Graphics Tools" level="tool">
+     <component id="gditools" filter="s60" name="GDI Tools" target="desktop">
+      <unit bldFile="/mw/uitools/gfxtools/gditools/group"/>
+     </component>
+     <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
+      <unit bldFile="/mw/uitools/gfxtools/color/group"/>
+     </component>
+    </collection>
+    <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
+     <!-- collection is actually a component. Needs to be moved down a directory -->
+     <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
+      <unit bldFile="/mw/uitools/aknlayoutcompiler/group"/>
+     </component>
+    </collection>
+    <collection id="skincompiler" name="Skin Compiler" level="compile">
+     <component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
+      <unit bldFile="/mw/uitools/skincompiler/AknSkinDescCompiler/group"/>
+     </component>
+    </collection>
+    <collection id="reszip" name="Resource Zip" level="encode">
+     <!-- collection is actually a component. Needs to be moved down a directory -->
+     <component id="reszip_build" filter="s60" name="Resource Zip Build">
+      <unit bldFile="/mw/uitools/reszip/group"/>
+     </component>
+    </collection>
+    <collection id="toollibraries" name="Tool Libraries" level="tool"/>
+    <collection id="svgtencoder" name="SVGT Encoder" level="encode">
+     <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
+      <unit bldFile="/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+     </component>
+    </collection>
+   </package>
+  </layer>
+  <layer id="app" name="Applications" levels="services apps">
+   <package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc apps">
+    <collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps">
+     <component id="location_centre_api" name="Location Centre API" introduced="^3" class="api" filter="s60">
+      <unit bldFile="/app/location/loc_plat/location_centre_api/group"/>
+     </component>
+    </collection>
+    <collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
+     <component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
+      <unit bldFile="/app/location/loc_pub/landmarks_ui_selector_api/group"/>
+     </component>
+     <component id="landmarks_ui_addedit_api" name="Landmarks UI Add/Edit API" class="api" filter="s60">
+      <unit bldFile="/app/location/loc_pub/landmarks_ui_addedit_api/group"/>
+     </component>
+    </collection>
+    <collection id="basiclocationinfodisplay" name="Basic Location Info Display" level="ui">
+     <component id="blid" filter="s60" name="Basic Location Info Display Build">
+      <unit bldFile="/app/location/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="/app/location/landmarksui/help/group"/>
+     </component>
+     <component id="landmarksui_engine" filter="s60" name="Landmarks UI Engine">
+      <unit bldFile="/app/location/landmarksui/engine/group"/>
+     </component>
+     <component id="uicontrols" filter="s60" name="Landmarks UI Controls">
+      <unit bldFile="/app/location/landmarksui/uicontrols/group"/>
+     </component>
+     <component id="landmarksui_commonui" filter="s60" name="Landmarks Common UI">
+      <unit bldFile="/app/location/landmarksui/commonui/group"/>
+     </component>
+     <component id="landmarksui_app" filter="s60" name="Landmarks Application">
+      <unit bldFile="/app/location/landmarksui/app/group"/>
+     </component>
+     <component id="msgviewer" filter="s60" name="Landmarks Message Viewer">
+      <unit bldFile="/app/location/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="/app/location/landmarksui/group"/>
+     </component>
+    </collection>
+    <collection id="eventsui" name="Location Events UI" level="events">
+     <component id="eventsui_help" filter="s60" name="Events Help">
+      <unit bldFile="/app/location/eventsui/help/group"/>
+     </component>
+     <component id="eventsutils" filter="s60" name="Events Utils">
+      <unit bldFile="/app/location/eventsui/eventsutils/group"/>
+     </component>
+     <component id="eventsengine" filter="s60" name="Events Engine">
+      <unit bldFile="/app/location/eventsui/eventsengine/group"/>
+     </component>
+     <component id="eventshandlerui" filter="s60" name="Events Handler UI">
+      <unit bldFile="/app/location/eventsui/eventshandlerui/group"/>
+     </component>
+     <component id="eventseditor" filter="s60" name="Events Editor">
+      <unit bldFile="/app/location/eventsui/eventseditor/group"/>
+     </component>
+     <component id="eventsmgmtui" filter="s60" name="Events Management UI">
+      <unit bldFile="/app/location/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="/app/location/eventsui/group"/>
+     </component>
+    </collection>
+    <collection id="locationlandmarksrefappfors60" name="Location Landmarks Reference App for S60" level="apps">
+     <!-- this is a component, needs to be moved down a directory -->
+     <component id="lmrefapp" filter="s60" name="Landmarks Reference Application">
+      <unit bldFile="/app/location/locationlandmarksrefappfors60/group"/>
+     </component>
+    </collection>
+    <collection id="locationlandmarksuirefapp" name="Location Landmarks UI Reference App" level="apps">
+     <!-- this is a component, needs to be moved down a directory -->
+     <component id="lmuirefapp" filter="s60" name="Landmarks UI Reference Application">
+      <unit bldFile="/app/location/locationlandmarksuirefapp/group"/>
+     </component>
+    </collection>
+    <collection id="locationsatviewrefapp" name="Location Satellite View Reference App" level="apps">
+     <!-- this is a component, needs to be moved down a directory -->
+     <component id="satellitereference" filter="s60" name="Satellite Info UI Reference Application">
+      <unit bldFile="/app/location/locationsatviewrefapp/group"/>
+     </component>
+    </collection>
+    <collection id="simpsyconfigurator" name="Simulation PSY Configurator" level="ui">
+     <!-- this is a component, needs to be moved down a directory -->
+     <component id="simpsyui" filter="s60" name="Simulation PSY UI">
+      <unit bldFile="/app/location/simpsyconfigurator/group"/>
+     </component>
+    </collection>
+    <collection id="mapnavproviderrefapp" name="Map and Navigation Provider Reference App" level="apps">
+     <!-- this is a component, needs to be moved down a directory -->
+     <component id="mapnavproviderrefapp_build" filter="s60" name="Map and Navigation Provider Reference Application">
+      <unit bldFile="/app/location/mapnavproviderrefapp/group"/>
+     </component>
+    </collection>
+    <collection id="locationcentre" name="Location Centre" level="loc">
+     <component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
+      <unit bldFile="/app/location/locationcentre/lcutils/group"/>
+     </component>
+     <component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
+      <unit bldFile="/app/location/locationcentre/lcservice/group"/>
+     </component>
+     <component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
+      <unit bldFile="/app/location/locationcentre/lcserver/group"/>
+     </component>
+     <component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
+      <unit bldFile="/app/location/locationcentre/lcapp/group"/>
+     </component>
+     <component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
+      <!-- consider distributing this into the other components or collapsing into a single component -->
+      <unit bldFile="/app/location/locationcentre/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="mmsharinguis" level="services" tech-domain="vc" name="Multimedia Sharing UIs" levels="base plugin if">
+    <collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
+     <component id="multimedia_sharing_settings_api" name="Multimedia Sharing Settings API" class="api" filter="s60">
+      <unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
+     </component>
+     <component id="multimedia_sharing_resource_api" name="Multimedia Sharing Resource API" class="api" filter="s60">
+      <unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
+     </component>
+     <component id="multimedia_sharing_manager_api" name="Multimedia Sharing Manager API" class="api" filter="s60">
+      <unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
+     </component>
+    </collection>
+    <collection id="mmsharing" name="Multimedia Sharing" level="base">
+     <component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
+      <unit bldFile="/app/mmsharinguis/mmsharing/mmshavailability/group"/>
+     </component>
+     <component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
+      <unit bldFile="/app/mmsharinguis/mmsharing/mmshindicator/group"/>
+     </component>
+     <!-- consider putting client and server in the same component -->
+     <component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
+      <unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
+      <unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group" filter="test,api_test"/>
+     </component>
+     <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
+      <unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
+     </component>
+     <component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
+      <unit bldFile="/app/mmsharinguis/mmsharing/mmshengine/group"/>
+     </component>
+     <component id="mmshui" filter="s60" name="Multimedia Sharing UI">
+      <!-- can only have one unit: need to #include one from the other if it's needed -->
+      <unit bldFile="/app/mmsharinguis/mmsharing/mmshui/group"/>
+      <unit bldFile="/app/mmsharinguis/mmsharing/mmshui/help/group"/>
+     </component>
+     <component id="mmsharing_build" filter="s60" name="MM Sharing Build">
+      <unit bldFile="/app/mmsharinguis/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="/app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
+     </component>
+     <component id="mmshaiwplugin" filter="s60" name="Multimedia Sharing AIW Plugin" class="plugin">
+      <unit bldFile="/app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
+     </component>
+     <component id="mmshsipcrplugin" filter="s60" name="Multimedia Sharing SIP Client Resolver Plugin" class="plugin">
+      <unit bldFile="/app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
+     </component>
+     <component id="mmshsettingsuiplugin" filter="s60" name="Multimedia Sharing Settings UI Plugin" class="plugin">
+      <unit bldFile="/app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
+     </component>
+     <component id="mmshwpadapterplugin" filter="s60" name="Multimedia Sharing WAP Provisioning Adapter" class="plugin">
+      <unit bldFile="/app/mmsharinguis/mmshplugins/mmshwpadapterplugin/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="/app/mmsharinguis/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="phone" level="apps" span="2" tech-domain="vc" name="Phone Apps" levels="engine plugin ui app">
+    <collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
+     <component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+     </component>
+     <component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_comms_information_api/group"/>
+     </component>
+     <component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_information_api/group"/>
+     </component>
+     <component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_device_mode_api/group"/>
+     </component>
+     <component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+     </component>
+     <component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+     </component>
+     <component id="telephony_configuration_api" name="Telephony Configuration API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_configuration_api/group"/>
+     </component>
+     <component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+     </component>
+     <component id="dialer_keypad_api" name="Dialer Keypad API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/dialer_keypad_api/group"/>
+     </component>
+     <component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_logging_extension_api/group"/>
+     </component>
+     <component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_matching_extension_api/group"/>
+     </component>
+     <component id="telephony_bubble_extension_api" name="Telephony Bubble Extension API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_bubble_extension_api/group"/>
+     </component>
+     <component id="telephony_menu_extension_api" name="Telephony Menu Extension API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_menu_extension_api/group"/>
+     </component>
+     <component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/phone_application_commands_api/group"/>
+     </component>
+     <component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+     </component>
+     <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/telephony_mediator_api/group"/>
+     </component>
+     <component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
+      <unit bldFile="/app/phone/phone_plat/video_telephony_mediator_api/group"/>
+     </component>
+    </collection>
+    <collection id="phoneapp" name="Phone Application" level="app">
+     <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
+      <unit bldFile="/app/phone/phoneapp/blacklist/group"/>
+     </component>
+     <component id="phoneui" filter="s60" name="Phone UI">
+      <unit bldFile="/app/phone/phoneapp/phoneui/group" filter="!test"/>
+      <unit bldFile="/app/phone/phoneapp/phoneui/tsrc/public/basic/group" filter="test,api_test"/>
+     </component>
+     <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
+      <unit bldFile="/app/phone/phoneapp/phoneuicontrol/group"/>
+     </component>
+     <component id="phoneuistates" filter="s60" name="Phone UI States">
+      <unit bldFile="/app/phone/phoneapp/phoneuistates/group"/>
+     </component>
+     <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
+      <unit bldFile="/app/phone/phoneapp/phoneuiutils/group"/>
+     </component>
+     <component id="phoneuiview" filter="s60" name="Phone UI View">
+      <unit bldFile="/app/phone/phoneapp/phoneuiview/group"/>
+     </component>
+     <component id="phoneuivoipextension" filter="s60" name="Phone UI VOIP Extension">
+      <unit bldFile="/app/phone/phoneapp/phoneuivoipextension/group"/>
+     </component>
+     <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
+      <unit bldFile="/app/phone/phoneapp/silenceactionplugin/group"/>
+     </component>
+     <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
+      <unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
+     </component>
+    </collection>
+    <collection id="phoneengine" name="Phone Engine" level="engine">
+     <component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
+      <unit bldFile="/app/phone/phoneengine/phonecntfinder/group"/>
+     </component>
+     <component id="audiohandling" filter="s60" name="Phone Audio Handling">
+      <unit bldFile="/app/phone/phoneengine/audiohandling/group"/>
+     </component>
+     <component id="callhandling" filter="s60" name="Call Handling">
+      <unit bldFile="/app/phone/phoneengine/callhandling/group"/>
+     </component>
+     <component id="contacthandling" filter="s60" name="Phone Contact Handling">
+      <unit bldFile="/app/phone/phoneengine/contacthandling/group"/>
+     </component>
+     <component id="loghandling" filter="s60" name="Phone Log Handling">
+      <unit bldFile="/app/phone/phoneengine/loghandling/group"/>
+     </component>
+     <component id="engineinfo" filter="s60" name="Phone Engine Info">
+      <unit bldFile="/app/phone/phoneengine/engineinfo/group"/>
+     </component>
+     <component id="phonemodel" filter="s60" name="Phone Model">
+      <unit bldFile="/app/phone/phoneengine/phonemodel/group"/>
+     </component>
+     <component id="servicehandling" filter="s60" name="Phone Service Handling">
+      <unit bldFile="/app/phone/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="/app/phone/phonesettings/aiwcallimageplugin/group"/>
+     </component>
+     <component id="pslncallimageplugin" filter="s60" name="Call Image Personalization Plugin" class="plugin">
+      <unit bldFile="/app/phone/phonesettings/pslncallimageplugin/group"/>
+     </component>
+    </collection>
+    <collection id="phoneuis" name="Phone UIs" level="ui">
+     <component id="dialer" filter="s60" name="Dialer">
+      <unit bldFile="/app/phone/phoneuis/dialer/group" filter="!test"/>
+      <unit bldFile="/app/phone/phoneuis/dialer/tsrc/public/basic/group" filter="test,api_test"/>
+     </component>
+     <component id="easydialing" filter="s60" name="Easy Dialing Plugin" class="plugin" introduced="^3">
+      <unit bldFile="/app/phone/phoneuis/easydialing/group"/>
+     </component>
+     <component id="bubblemanager" filter="s60" name="Phone Bubble Manager">
+      <unit bldFile="/app/phone/phoneuis/bubblemanager/group"/>
+     </component>
+     <component id="connectutil" filter="s60" name="Connection Utility" class="plugin">
+      <unit bldFile="/app/phone/phoneuis/connectutil/group"/>
+     </component>
+     <component id="ussd" filter="s60" name="Unstructured Supplementary Services Data">
+      <unit bldFile="/app/phone/phoneuis/ussd/group"/>
+     </component>
+     <component id="vmbx" filter="s60" name="Voice Mailbox">
+      <unit bldFile="/app/phone/phoneuis/vmbx/group"/>
+     </component>
+     <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
+      <unit bldFile="/app/phone/phoneuis/telephonydevicemode/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="/app/phone/phoneplugins/telbranding/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="videotelephony" level="apps" tech-domain="vc" name="Video Telephony Apps" levels="engine plugin prot ui">
+    <collection id="videotelephony_plat" name="VT Apps Platform Interfaces" level="ui">
+     <component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60">
+      <unit bldFile="/app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+     </component>
+     <component id="video_telephony_media_configuration_api" name="Video Telephony Media Configuration API" class="api" filter="s60">
+      <unit bldFile="/app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
+     </component>
+    </collection>
+    <collection id="vtengines" name="Video Telephony Engines" level="engine">
+     <component id="videoteleng" filter="s60" name="Video Telephony Engine">
+      <unit bldFile="/app/videotelephony/vtengines/videoteleng/Group"/>
+     </component>
+     <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
+      <unit bldFile="/app/videotelephony/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="/app/videotelephony/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="/app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
+     </component>
+     <component id="videosource" filter="s60" name="Video Source" introduced="^2">
+      <unit bldFile="/app/videotelephony/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="/app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
+     </component>
+    </collection>
+   </package>
+   <package id="iptelephony" level="apps" tech-domain="vc" name="IP Telephony" levels="eng plugin util ui">
+    <collection id="iptel_plat" name="IP Telephony Platform Interfaces" level="ui">
+     <component id="richcallsettingsengine_api" name="Rich Call Settings Engine API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
+     </component>
+     <component id="cch_client_api" name="CCH Client API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/iptelephony/iptel_plat/cch_client_api/group"/>
+     </component>
+     <component id="cch_server_api" name="CCH Server API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/iptelephony/iptel_plat/cch_server_api/group"/>
+     </component>
+     <component id="csc_settingsui_api" name="CSC Settings UI API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
+     </component>
+     <component id="vccpropertyhandler_api" name="VCC Property Handler API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+     </component>
+     <component id="vcc_api" name="VCC API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/iptelephony/iptel_plat/vcc_api/group"/>
+     </component>
+    </collection>
+    <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="/app/iptelephony/commsconfig/cscgsplugin/group"/>
+     </component>
+     <component id="cscsipvoipcleanupplugin" filter="s60" name="CSC SIP VoIP Cleanup Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
+     </component>
+     <component id="cscengine" filter="s60" name="Connection Service Configurator Engine" introduced="^2">
+      <unit bldFile="/app/iptelephony/commsconfig/cscengine/group"/>
+     </component>
+     <component id="cscsettingsui" filter="s60" name="CSC Settings UI" introduced="^2">
+      <unit bldFile="/app/iptelephony/commsconfig/cscsettingsui/group"/>
+     </component>
+     <component id="cscapplicationui" filter="s60" name="CSC Application UI" introduced="^2">
+      <unit bldFile="/app/iptelephony/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="/app/iptelephony/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="/app/iptelephony/convergedconnectionhandler/cchserver/group"/>
+     </component>
+     <component id="cchclient" filter="s60" name="CCH Client" introduced="^2">
+      <unit bldFile="/app/iptelephony/convergedconnectionhandler/cchclient/group"/>
+     </component>
+     <component id="cchclientapi" filter="s60" name="CCH Client API" introduced="^2">
+      <unit bldFile="/app/iptelephony/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="/app/iptelephony/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="/app/iptelephony/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="/app/iptelephony/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="/app/iptelephony/voipplugins/sipmxresolver/group"/>
+     </component>
+     <component id="sipconnectionprovider" filter="s60" name="SIP Connection Provider" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/voipplugins/sipconnectionprovider/group"/>
+      <!-- can only have one unit, can the next be #'included from the above? -->
+      <unit bldFile="/app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
+     </component>
+     <component id="ipapputils" filter="s60" name="IP App Utils" introduced="^2">
+      <unit bldFile="/app/iptelephony/voipplugins/ipapputils/group"/>
+     </component>
+     <component id="voipadapters" filter="s60" name="VoIP Adapters" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/voipplugins/voipadapters/group"/>
+     </component>
+     <component id="accountcreationplugin" filter="s60" name="Account Creation Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/voipplugins/accountcreationplugin/group"/>
+     </component>
+     <component id="dhcppositionprovider" filter="s60" name="DHCP Position Provider" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/voipplugins/dhcppositionprovider/group"/>
+     </component>
+     <component id="svtmatching" filter="s60" name="SIP VoIP Telephony Matching" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/voipplugins/svtmatching/group"/>
+     </component>
+     <component id="svtlogging" filter="s60" name="SVT Logging" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/voipplugins/svtlogging/group"/>
+     </component>
+     <component id="svtcallmenu" filter="s60" name="SVT Call Menu" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/voipplugins/svtcallmenu/group"/>
+     </component>
+     <component id="sipimresolver" filter="s60" name="SIP IM Resolver" class="plugin" introduced="^3">
+      <unit bldFile="/app/iptelephony/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="/app/iptelephony/callcontinuity/vccutils/group"/>
+     </component>
+     <component id="nsmldmvccadapter" filter="s60" name="SyncML DM VCC Adapter" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
+     </component>
+     <component id="vccclientprovisioningadapter" filter="s60" name="VCC Client Provisioning Adapter" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
+     </component>
+     <component id="vccpropertyhandler" filter="s60" name="VCC Property Handler" introduced="^2">
+      <unit bldFile="/app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
+     </component>
+     <component id="vcchotrigger" filter="s60" name="VCC HO Trigger" introduced="^2">
+      <unit bldFile="/app/iptelephony/callcontinuity/vcchotrigger/group"/>
+     </component>
+     <component id="vcc" filter="s60" name="VoIP Call Continuity" class="plugin" introduced="^2">
+      <unit bldFile="/app/iptelephony/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="/app/iptelephony/callcontinuity/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="settingsuis" level="services" tech-domain="dm" name="Settings UIs" levels="rsc ui">
+    <collection id="devmngt_plat" name="Settings UIs Platform Interfaces" level="ui">
+     <component id="default_app_client_api" name="Default App Client API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/app/settingsuis/devmngt_plat/default_app_client_api/group"/>
+     </component>
+     <component id="services_db_api" name="Services DB API" introduced="^1" class="api" filter="s60">
+      <unit bldFile="/app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
+      <unit bldFile="/app/settingsuis/devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group" filter="test,unit_test"/>
+     </component>
+    </collection>
+    <collection id="defaultapplicationsettings" name="Default Application Settings" level="rsc">
+     <component id="services_db" filter="s60" name="Services Database" introduced="^1">
+      <unit bldFile="/app/settingsuis/defaultapplicationsettings/services_db/group"/>
+     </component>
+     <component id="defaultapplicationsettings_server" filter="s60" name="Default Application Server" introduced="^1">
+      <unit bldFile="/app/settingsuis/defaultapplicationsettings/server/group"/>
+     </component>
+     <component id="service" filter="s60" name="Default Application Service" introduced="^1">
+      <unit bldFile="/app/settingsuis/defaultapplicationsettings/service/group"/>
+     </component>
+     <component id="dasgsplugin" filter="s60" name="Default Application Settings GS Plugin" class="plugin" introduced="^1">
+      <unit bldFile="/app/settingsuis/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="/app/settingsuis/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="/app/settingsuis/systemswuis/touchscreencalib/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="contentcontrol" level="services" tech-domain="dm" name="Content Control Daemons" levels="plugin app">
+    <collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+     <component id="oma_ds_presync_plugin_api" name="OMA DS PreSync Plugin API" class="api" filter="s60">
+      <unit bldFile="/app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+     </component>
+     <component id="ds_agenda_handler_plugin_api" name="DS Agenda Handler Plugin API" class="api" filter="s60">
+      <unit bldFile="/app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
+     </component>
+     <component id="ds_folder_util_api" name="DS Folder Util API" class="api" filter="s60">
+      <unit bldFile="/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
+     </component>
+     <component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60">
+      <unit bldFile="/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+     </component>
+     <component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60">
+      <unit bldFile="/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+     </component>
+    </collection>
+    <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="/app/contentcontrol/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="/app/contentcontrol/omads/omadsappui/group"/>
+     </component>
+     <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
+      <unit bldFile="/app/contentcontrol/omads/omadsextensions/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="devicecontrol" level="services" tech-domain="dm" 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="/app/devicecontrol/devicediagnostics/devdiagapp/group"/>
+     </component>
+     <component id="devdiaggsplugin" filter="s60" name="Device Diagnostics GS Plugin" class="plugin">
+      <unit bldFile="/app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
+     </component>
+     <component id="diagplugins" filter="s60" name="Diagnostics Plugins" class="plugin">
+      <unit bldFile="/app/devicecontrol/devicediagnostics/diagplugins/group"/>
+     </component>
+     <component id="diagsuites" filter="s60" name="Diagnostics Suites" class="plugin">
+      <unit bldFile="/app/devicecontrol/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="/app/devicecontrol/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="/app/devicecontrol/omadm/omadmappui/group"/>
+     </component>
+     <component id="omadmextensions" filter="s60" name="OMA DM Extensions" class="plugin">
+      <unit bldFile="/app/devicecontrol/omadm/omadmextensions/group"/>
+     </component>
+     <component id="dcmo" filter="s60" name="Device Capabilities Management Object" class="plugin" introduced="^3">
+      <unit bldFile="/app/devicecontrol/omadm/dcmo/group"/>
+     </component>
+    </collection>
+    <collection id="pnpmobileservices" name="PnP Mobile Services" level="mid">
+     <component id="pnpms" filter="s60" name="PnP MS">
+      <unit bldFile="/app/devicecontrol/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="/app/devicecontrol/applicationmanagement/options/group"/>
+     </component>
+     <component id="applicationmanagement_client" filter="s60" name="AM Client">
+      <unit bldFile="/app/devicecontrol/applicationmanagement/client/group"/>
+     </component>
+     <component id="applicationmanagement_server" filter="s60" name="AM Server">
+      <unit bldFile="/app/devicecontrol/applicationmanagement/server/group"/>
+     </component>
+     <component id="rfsplugin" filter="s60" name="AM RFS Plugin" class="plugin">
+      <unit bldFile="/app/devicecontrol/applicationmanagement/rfsplugin/group"/>
+     </component>
+     <component id="amadapter2" filter="s60" name="AM Adapter" class="plugin">
+      <unit bldFile="/app/devicecontrol/applicationmanagement/amadapter2/group"/>
+     </component>
+     <component id="omascomoadapter" filter="s60" name="OMA SCOMO Adapter" class="plugin" introduced="^3">
+      <unit bldFile="/app/devicecontrol/applicationmanagement/omascomoadapter/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="/app/devicecontrol/applicationmanagement/group"/>
+     </component>
+    </collection>
+    <collection id="customization" name="DM Customization Adapters" level="mid">
+     <component id="dmutils" name="DM Utils" filter="s60">
+      <unit bldFile="/app/devicecontrol/customization/dmutils/bld"/>
+     </component>
+     <component id="uisettingssrv" filter="s60" name="UI Settings Server">
+      <unit bldFile="/app/devicecontrol/customization/uisettingssrv/bld"/>
+     </component>
+     <component id="isadapter" filter="s60" name="Idle State Adapter" class="plugin">
+      <unit bldFile="/app/devicecontrol/customization/isadapter/bld"/>
+     </component>
+     <component id="supadapter" filter="s60" name="Startup Adapter" class="plugin">
+      <unit bldFile="/app/devicecontrol/customization/supadapter/bld"/>
+     </component>
+     <component id="wallpaperadapter" filter="s60" name="Wallpaper Adapter" class="plugin">
+      <unit bldFile="/app/devicecontrol/customization/wallpaperadapter/bld"/>
+     </component>
+     <component id="operatorlogoadapter" filter="s60" name="Operator Logo Adapter" class="plugin">
+      <unit bldFile="/app/devicecontrol/customization/operatorlogoadapter/bld"/>
+     </component>
+     <component id="screensaveradapter" filter="s60" name="Screen Saver Adapter" class="plugin">
+      <unit bldFile="/app/devicecontrol/customization/screensaveradapter/bld"/>
+     </component>
+     <component id="themesadapter" filter="s60" name="Themes Adapter" class="plugin">
+      <unit bldFile="/app/devicecontrol/customization/themesadapter/bld"/>
+     </component>
+     <component id="embeddedlinkadapter" filter="s60" name="Embedded Link Adapter" class="plugin">
+      <unit bldFile="/app/devicecontrol/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="/app/devicecontrol/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="/app/devicecontrol/omacp/omacpadapters/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="printing" level="services" tech-domain="de" name="Printing" levels="app">
+    <collection id="imageprint" name="ImagePrint" level="app">
+     <component id="clog" filter="s60" name="ImagePrint Logging" introduced="^2">
+      <unit bldFile="/app/printing/imageprint/clog/group"/>
+     </component>
+     <component id="imageprintengine" filter="s60" name="ImagePrint Engine" introduced="^2">
+      <unit bldFile="/app/printing/imageprint/imageprintengine/group"/>
+     </component>
+     <component id="imageprintui" filter="s60" name="ImagePrint UI" introduced="^2">
+      <unit bldFile="/app/printing/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, or remove #includes and make this a ROM component -->
+      <unit bldFile="/app/printing/imageprint/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="files" level="apps" tech-domain="pr" name="File Manager Apps" levels="support apps">
+    <collection id="files_plat" name="File Manager Apps Platform Interfaces" level="apps">
+     <component id="memory_scan_popup_ui_api" name="Memory Scan Popup UI API" class="api" filter="s60">
+      <unit bldFile="/app/files/files_plat/memory_scan_popup_ui_api/group"/>
+     </component>
+    </collection>
+    <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="/app/files/deviceencryption/devencnotifplugin/group"/>
+     </component>
+     <component id="devencui" filter="s60" name="Device Encryption UI" introduced="^3">
+      <unit bldFile="/app/files/deviceencryption/devencui/group"/>
+     </component>
+     <component id="devencdmadapter" filter="s60" name="Device Encryption DM Adapter" class="plugin" introduced="^3">
+      <unit bldFile="/app/files/deviceencryption/devencdmadapter/group"/>
+     </component>
+     <component id="devencgsplugin" filter="s60" name="Device Encryption GS Plugin" class="plugin" introduced="^3">
+      <unit bldFile="/app/files/deviceencryption/devencgsplugin/group"/>
+     </component>
+     <component id="deviceencryption_help" filter="s60" name="Device Encryption Help" introduced="^3">
+      <unit bldFile="/app/files/deviceencryption/help/group"/>
+     </component>
+     <component id="deviceencryption_build" filter="s60" name="Device Encryption Build" introduced="^3">
+      <unit bldFile="/app/files/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="/app/files/filemanager/group"/>
+     </component>
+    </collection>
+    <collection id="filesystemuis" name="File System UIs" level="support">
+     <component id="memscaneng" filter="s60" name="Memory Scan Server">
+      <unit bldFile="/app/files/filesystemuis/memscaneng/group"/>
+     </component>
+     <component id="memstatepopup" filter="s60" name="Memory State Popup">
+      <unit bldFile="/app/files/filesystemuis/memstatepopup/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="utils" level="apps" tech-domain="pr" name="Utility Apps" levels="app">
+    <collection id="extras" name="Extras" level="app">
+     <component id="about" filter="s60" name="About Application">
+      <unit bldFile="/app/utils/extras/about/group"/>
+     </component>
+     <component id="calcsoft" filter="s60" name="Calculator Application">
+      <unit bldFile="/app/utils/extras/calcsoft/group"/>
+     </component>
+     <component id="converter" filter="s60" name="Unit Converter">
+      <unit bldFile="/app/utils/extras/converter/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
+    <collection id="contacts_pub" name="Contacts Apps Public Interfaces" level="ui">
+     <component id="phonebook_fetch_ui_api" name="Phonebook Fetch UI API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
+     </component>
+     <component id="phonebook_data_management_api" name="Phonebook Data Management API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_pub/phonebook_data_management_api/group"/>
+     </component>
+     <component id="phonebook_vcard_importexport_api" name="Phonebook vCard Import/Export API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
+     </component>
+     <component id="phonebook_data_addedit_ui_api" name="Phonebook Data Add/Edit UI API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
+     </component>
+     <component id="phonebook_ui_utilities_api" name="Phonebook UI Utilities API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
+     </component>
+     <component id="phonebook_thumbnail_operation_api" name="Phonebook Thumbnail Operation API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
+     </component>
+     <component id="speed_dial_utility_control_api" name="Speed Dial Utility Control API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
+     </component>
+    </collection>
+    <collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
+     <component id="virtual_phonebook_store_api" name="Virtual Phonebook Store API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_store_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="virtual_phonebook_sim_services_api" name="Virtual Phonebook SIM Services API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="virtual_phonebook_configuration_api" name="Virtual Phonebook Configuration API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
+     </component>
+     <component id="virtual_phonebook_copy_policy_api" name="Virtual Phonebook Copy Policy API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
+     </component>
+     <component id="virtual_phonebook_policy_api" name="Virtual Phonebook Policy API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_policy_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="virtual_phonebook_engine_api" name="Virtual Phonebook Engine API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_engine_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_engine_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="virtual_phonebook_migration_support_api" name="Virtual Phonebook Migration Support API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
+     </component>
+     <component id="virtual_phonebook_view_definition_api" name="Virtual Phonebook View Definition API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="virtual_phonebook_vcard_api" name="Virtual Phonebook vCard API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_vcard_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="cms_contactor_api" name="CMS Contactor API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/cms_contactor_api/group"/>
+     </component>
+     <component id="contactpresence_api" name="Contact Presence API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/contactpresence_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/contactpresence_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="presence_cache_api" name="Presence Cache API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/presence_cache_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/presence_cache_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="phonebook_internal_common_api" name="Phonebook Internal Common API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
+     </component>
+     <component id="phonebook_internal_appfw_api" name="Phonebook Internal App Framework API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
+     </component>
+     <component id="phonebook_internal_data_management_api" name="Phonebook Internal Data Management API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
+     </component>
+     <component id="phonebook_2_xsp_extension_manager_api" name="Phonebook 2 xSP Extension Manager API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
+     </component>
+     <component id="phonebook_ui_controls_api" name="Phonebook UI Controls API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
+     </component>
+     <component id="phonebook_2_image_management_api" name="Phonebook 2 Image Management API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
+     </component>
+     <component id="phonebook_extension_api" name="Phonebook Extension API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_extension_api/group"/>
+     </component>
+     <component id="phonebook_public_constants_api" name="Phonebook Public Constants API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
+     </component>
+     <component id="phonebook_internal_ui_utilities_api" name="Phonebook Internal UI Utilities API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
+     </component>
+     <component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
+     </component>
+     <component id="phonebook_thumbnails_api" name="Phonebook Thumbnails API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
+     </component>
+     <component id="phonebook_2_icon_api" name="Phonebook 2 Icon API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
+     </component>
+     <component id="phonebook_engine_extension_api" name="Phonebook Engine Extension API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
+     </component>
+     <component id="phonebook_2_store_configuration_management_api" name="Phonebook 2 Store Configuration Management API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
+     </component>
+     <component id="logs_ui_command_line_api" name="Logs UI Command Line API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
+     </component>
+     <component id="speed_dial_dialogs_api" name="Speed Dial Dialogs API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
+     </component>
+     <component id="phonebook_2_xsp_view_activation_api" name="Phonebook 2 xSP View Activation API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
+     </component>
+     <component id="logs_timers_api" name="Logs Timers API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/logs_timers_api/group"/>
+     </component>
+     <component id="phonebook_2_ui_extension_definition_api" name="Phonebook 2 UI Extension Definition API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
+     </component>
+     <component id="phonebook_2_common_ui_api" name="Phonebook 2 Common UI API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
+     </component>
+     <component id="phonebook_2_ui_extension_api" name="Phonebook 2 UI Extension API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
+     </component>
+     <component id="phonebook_2_store_property_api" name="Phonebook 2 Store Property API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
+     </component>
+     <component id="phonebook_2_ui_extension_plugin_api" name="Phonebook 2 UI Extension Plug-In API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
+     </component>
+     <component id="phonebook_2_ui_controls_api" name="Phonebook 2 UI Controls API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
+     </component>
+     <component id="phonebook_2_thin_ui_extension_plugin_api" name="Phonebook 2 Thin UI Extension Plugin API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
+     </component>
+     <component id="phonebook_2_commands_api" name="Phonebook 2 Commands API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
+     </component>
+     <component id="phonebook_2_presentation_api" name="Phonebook 2 Presentation API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
+     </component>
+     <component id="phonebook_2_ui_utilities_api" name="Phonebook 2 UI Utilities API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
+     </component>
+     <component id="phonebook_2_contact_related_icon_customization_api" name="Phonebook 2 Contact Related Icon Customization API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_contact_related_icon_customization_api/group"/>
+     </component>
+     <component id="cca_launch_api" name="CCA Launch API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/cca_launch_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/cca_launch_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="cca_view_plugin_api" name="CCA View Plugin API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/cca_view_plugin_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="predictivesearch_client_api" name="Predictive Search Client API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/predictivesearch_client_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="predictivesearch_utils_api" name="Predictive Search Utils API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/predictivesearch_utils_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="predictivesearch_adapters_api" name="Predictive Search Adapters API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
+     </component>
+     <component id="predictivesearch_algorithm_api" name="Predictive Search Algorithm API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
+     </component>
+     <component id="phonebook_2_rcl_api" name="Phonebook 2 RCL API" class="api" filter="s60">
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_rcl_api/group" fitler="!test"/>
+      <unit bldFile="/app/contacts/contacts_plat/phonebook_2_rcl_api/tsrc/group" filter="test,api_test"/>
+     </component>
+    </collection>
+    <collection id="contactextensions" name="Contacts Extensions" level="services">
+     <component id="predefinedcontacts" filter="s60" name="Predefined Contacts">
+      <unit bldFile="/app/contacts/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="/app/contacts/logsui/group"/>
+     </component>
+    </collection>
+    <collection id="phonebookui" name="Phonebook UI" level="ui">
+     <component id="phonebook" filter="s60" name="Phonebook">
+      <unit bldFile="/app/contacts/phonebookui/phonebook/group"/>
+     </component>
+     <component id="speeddial" filter="s60" name="Speed Dial">
+      <unit bldFile="/app/contacts/phonebookui/speeddial/group"/>
+     </component>
+     <component id="phonebook2" filter="s60" name="Phone Book 2">
+      <unit bldFile="/app/contacts/phonebookui/phonebook2/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="/app/contacts/phonebookengines/cntfindplugin/group"/>
+     </component>
+     <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/contacts/phonebookengines/cntsortplugin/group"/>
+     </component>
+     <component id="virtualphonebook" filter="s60" name="Virtual Phonebook" introduced="^2">
+      <unit bldFile="/app/contacts/phonebookengines/virtualphonebook/group"/>
+     </component>
+     <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+      <unit version="2" bldFile="/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+     </component>
+    </collection>
+    <collection id="pimprotocols" name="PIM Protocols" level="services">
+     <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
+      <unit bldFile="/app/contacts/pimprotocols/phonebooksync/group" mrp="/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
+     </component>
+     <component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+      <unit bldFile="/app/contacts/pimprotocols/pbap/group" mrp="/app/contacts/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="/app/contacts/ccservices/cmsservices/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="/app/contacts/presencecache/group"/>
+     </component>
+    </collection>
+    <collection id="predictivesearch" name="Predictive Search" level="support">
+     <component id="pcsutils" filter="s60" name="PCS Utils" introduced="^2">
+      <unit bldFile="/app/contacts/predictivesearch/pcsutils/group"/>
+     </component>
+     <component id="pcsserverclientapi" filter="s60" name="PCS Server Client API" introduced="^2">
+      <unit bldFile="/app/contacts/predictivesearch/pcsserverclientapi/group"/>
+     </component>
+     <component id="pcsserver" filter="s60" name="PCS Server" introduced="^2">
+      <unit bldFile="/app/contacts/predictivesearch/pcsserver/group"/>
+     </component>
+     <component id="pcsadapters" filter="s60" name="PCS Adapters" class="plugin" introduced="^2">
+      <unit bldFile="/app/contacts/predictivesearch/adapters/contacts/group"/>
+     </component>
+     <component id="pcsalgorithm" filter="s60" name="PCS Algorithm" class="plugin" introduced="^2">
+      <unit bldFile="/app/contacts/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="/app/contacts/predictivesearch/group"/>
+     </component>
+    </collection>
+    <collection id="contacts_info" name="Contacts Apps Info" level="ui">
+     <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="organizer" level="apps" span="2" tech-domain="pr" name="Organizer Application Suite" levels="support services engine ui app">
+    <collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
+     <component id="meeting_request_mailbox_utilities_api" name="Meeting Request Mailbox Utilities API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
+     </component>
+     <component id="meeting_request_uids_api" name="Meeting Request UIDs API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/meeting_request_uids_api/group"/>
+     </component>
+     <component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/calendar_exporter_api/group"/>
+     </component>
+     <component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/agenda_versit_2_api/group"/>
+     </component>
+     <component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/calendar_importer_api/group"/>
+     </component>
+     <component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/calendar_launcher_api/group"/>
+     </component>
+     <component id="calendar_common_utils_api" name="Calendar Common Utils API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/calendar_common_utils_api/group"/>
+     </component>
+     <component id="searchfw_launcher_api" name="Search Framework Launcher API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/searchfw_launcher_api/group"/>
+     </component>
+     <component id="alarm_const_api" name="Alarm Const API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/alarm_const_api/group"/>
+     </component>
+     <component id="alarm_ui_external_control_api" name="Alarm UI External Control API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
+     </component>
+     <component id="calendar_settings_keys_api" name="Calendar Settings Keys API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
+     </component>
+     <component id="calendar_tones_settings_keys_api" name="Calendar Tones Settings Keys API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
+     </component>
+     <component id="clock_settings_api" name="Clock Settings API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/clock_settings_api/group"/>
+     </component>
+     <component id="common_alarm_editor_api" name="Common Alarm Editor API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/common_alarm_editor_api/group"/>
+     </component>
+     <component id="alarm_ui_secondary_display_api" name="Alarm UI Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
+     </component>
+     <component id="searchui_launcher_api" name="Search UI Launcher API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/searchui_launcher_api/group"/>
+     </component>
+     <component id="agenda_entry_ui_api" name="Agenda Entry UI API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
+     </component>
+     <component id="meeting_request_utillities_api" name="Meeting Request Utillities API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
+     </component>
+     <component id="meeting_request_viewer_api" name="Meeting Request Viewer API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
+     </component>
+     <component id="calendar_custamization_api" name="Calendar Customization API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_plat/calendar_custamization_api/group"/>
+     </component>
+    </collection>
+    <collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
+     <component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
+     </component>
+     <component id="notepad_library_api" name="Notepad Library API" class="api" filter="s60">
+      <unit bldFile="/app/organizer/organizer_pub/notepad_library_api/group"/>
+     </component>
+    </collection>
+    <collection id="alarmengines" name="Alarm Engines" level="engine">
+     <component id="missedalarmstore" filter="s60" name="Missed Alarm Store">
+      <unit bldFile="/app/organizer/alarmengines/missedalarmstore/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="/app/organizer/calendarengines/versit2/group"/>
+     </component>
+     <component id="agnversit2" filter="s60" name="Versit 2 Agenda Interface" class="plugin" introduced="9.2">
+      <unit bldFile="/app/organizer/calendarengines/agnversit2/group"/>
+     </component>
+     <component id="caleninterimutils" filter="s60" name="Calendar Interim Utils" introduced="9.1">
+      <unit bldFile="/app/organizer/calendarengines/caleninterimutils/group"/>
+     </component>
+     <component id="calenimp" filter="s60" name="Calendar Import Wrapper" introduced="7.0s">
+      <unit bldFile="/app/organizer/calendarengines/calenimp/group"/>
+     </component>
+     <component id="calenlauncher" filter="s60" name="Calendar Launcher">
+      <unit bldFile="/app/organizer/calendarengines/calenlauncher/group"/>
+     </component>
+     <component id="caldavsrv" filter="sf_build" name="CalDAV Server" introduced="^3">
+      <unit bldFile="/app/organizer/calendarengines/caldav/group"/>
+     </component>
+    </collection>
+    <collection id="meetingrequestengines" name="Meeting Request Engines" level="engine">
+     <component id="mrmailbox" filter="s60" name="Meeting Request Mailbox">
+      <unit bldFile="/app/organizer/meetingrequestengines/mrmailbox/group"/>
+     </component>
+     <component id="mrmailboxutils" filter="s60" name="Meeting Request Mailbox Utils" class="plugin">
+      <unit bldFile="/app/organizer/meetingrequestengines/mrmailboxutils/group"/>
+     </component>
+    </collection>
+    <collection id="searchfw" name="Search Framework" level="services">
+     <meta rel="config">
+      <defined condition="RD_GENERAL_SEARCH"/>
+     </meta>
+     <!-- Uncomment all units when configuration is in place. All currently #included from searchfw_build, which should be removed at the same time. -->
+     <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>
+     <component id="searchfw_build" filter="s60" name="Search Framework Build" introduced="^1">
+      <unit bldFile="/app/organizer/searchfw/group"/>
+     </component>
+    </collection>
+    <collection id="alarmui" name="Alarm UI" level="app">
+     <!-- collection is really a component, should move down a directory -->
+     <component id="alarmui_build" filter="s60" name="Alarm UI Build">
+      <unit bldFile="/app/organizer/alarmui/group"/>
+     </component>
+    </collection>
+    <collection id="calendarui" name="Calendar UI" level="ui">
+     <component id="calendarui_help" filter="s60" name="Calendar UI Help">
+      <unit bldFile="/app/organizer/calendarui/help/group"/>
+     </component>
+     <component id="commonutils" filter="s60" name="Calendar Common Utils">
+      <unit bldFile="/app/organizer/calendarui/commonutils/group"/>
+     </component>
+     <component id="globaldata" filter="s60" name="Calendar Global Data">
+      <unit bldFile="/app/organizer/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="/app/organizer/calendarui/settings/gsplugin/group"/>
+      <unit bldFile="/app/organizer/calendarui/settings/settingsui/group"/>
+     </component>
+     <component id="customisation" filter="s60" name="Calendar Customisation">
+      <unit bldFile="/app/organizer/calendarui/customisation/group"/>
+     </component>
+     <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
+      <unit bldFile="/app/organizer/calendarui/customisationmanager/group"/>
+     </component>
+     <component id="multicaluidialog" filter="s60" name="Multi-Calendar UI Dialog" introduced="^3">
+      <unit bldFile="/app/organizer/calendarui/multicaluidialog/group"/>
+     </component>
+     <component id="views" filter="s60" name="Calendar Views">
+      <unit bldFile="/app/organizer/calendarui/views/group"/>
+     </component>
+     <component id="calendarui_controller" filter="s60" name="Calendar Controller">
+      <unit bldFile="/app/organizer/calendarui/controller/group"/>
+     </component>
+     <component id="calendarui_editors" filter="s60" name="Calendar Editors">
+      <unit bldFile="/app/organizer/calendarui/editors/group"/>
+     </component>
+     <component id="calendarui_application" filter="s60" name="Calendar Application">
+      <unit bldFile="/app/organizer/calendarui/application/group"/>
+     </component>
+     <component id="missedalarmindicatorplugin" filter="s60" name="Missed Alarm Indicator Plugin" class="plugin">
+      <unit bldFile="/app/organizer/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="/app/organizer/calendarui/server/calensvr/group"/>
+      <unit bldFile="/app/organizer/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="/app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
+      <unit bldFile="/app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
+      <unit bldFile="/app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
+      <unit bldFile="/app/organizer/calendarui/regionalplugins/thai/group"/>
+     </component>
+     <component id="calenaiwprovider" filter="s60" name="Calendar AIW Proivder" class="plugin" introduced="^3">
+      <unit bldFile="/app/organizer/calendarui/calenaiwprovider/group"/>
+     </component>
+     <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
+      <unit bldFile="/app/organizer/calendarui/caldav/group"/>
+     </component>
+     <component id="calendarui_build" filter="s60" name="Calendar UI Build">
+      <!-- split contents into separate components -->
+      <unit bldFile="/app/organizer/calendarui/group"/>
+     </component>
+    </collection>
+    <collection id="meetingui" name="Meeting UI" level="ui">
+     <component id="attendeeview" filter="s60" name="Attendee View">
+      <unit bldFile="/app/organizer/meetingui/attendeeview/group"/>
+     </component>
+     <component id="agnentryui" filter="s60" name="Agenda Entry UI" class="plugin">
+      <unit bldFile="/app/organizer/meetingui/agnentryui/group"/>
+     </component>
+     <component id="meetingrequestutils" filter="s60" name="Meeting Request Utils">
+      <unit bldFile="/app/organizer/meetingui/meetingrequestutils/group"/>
+     </component>
+     <component id="meetingrequestviewers" filter="s60" name="Meeting Request Viewers" class="plugin">
+      <unit bldFile="/app/organizer/meetingui/meetingrequestviewers/group"/>
+     </component>
+     <component id="meetingui_build" filter="s60" name="Meeting UI Build">
+      <!-- split contents into separate components -->
+      <unit bldFile="/app/organizer/meetingui/group"/>
+     </component>
+    </collection>
+    <collection id="clock2" name="Clock" level="app">
+     <component id="clockengines" filter="s60" name="Clock Engines">
+      <unit bldFile="/app/organizer/clock2/clockengines/group"/>
+     </component>
+     <component id="clockui" filter="s60" name="Clock UI">
+      <unit bldFile="/app/organizer/clock2/clockui/group"/>
+     </component>
+     <component id="clock2_help" filter="s60" name="Clock Help">
+      <unit bldFile="/app/organizer/clock2/help/group"/>
+     </component>
+     <component id="clock2_build" filter="s60" name="Clock Build">
+      <!-- split contents into separate components, or just make this one component -->
+      <unit bldFile="/app/organizer/clock2/group"/>
+     </component>
+    </collection>
+    <collection id="notepad" name="Notepad" level="ui">
+     <component id="notepad_help" filter="s60" name="Notepad Help">
+      <unit bldFile="/app/organizer/notepad/help/group"/>
+     </component>
+     <component id="notepad1" filter="s60" name="Notepad Application 1">
+      <unit bldFile="/app/organizer/notepad/notepad1/group"/>
+     </component>
+     <component id="txtrecog" filter="s60" name="Text Recognizer" class="plugin">
+      <unit bldFile="/app/organizer/notepad/txtrecog/group"/>
+     </component>
+    </collection>
+    <collection id="searchui" name="Search UI" level="app">
+     <!-- consider making this a single component -->
+     <meta rel="config">
+      <defined condition="RD_GENERAL_SEARCH"/>
+     </meta>
+     <!-- Uncomment all units when configuration is in place. All currently #included from searchui_build, which should be removed at the same time. -->
+     <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"/>-->
+     </component>
+     <component id="searchui_build" filter="s60" name="Search UI Build">
+      <unit bldFile="/app/organizer/searchui/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="/app/organizer/pimappservices/calendar/group" mrp="/app/organizer/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="/app/organizer/pimappservices/calendarvcalplugin/group" mrp="/app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp"/>
+     </component>
+     <component id="appenginesdocs" name="Application Engines Documentation" purpose="development" class="doc">
+      <unit mrp="/app/organizer/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="/app/organizer/pimappsupport/vcardandvcal/group" mrp="/app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
+     </component>
+     <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
+      <unit bldFile="/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
+     </component>
+    </collection>
+    <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
+     <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="messaging" level="apps" span="2" tech-domain="pr" name="Messaging Apps" levels="mail eng base ui">
+    <collection id="msg_pub" name="Messaging Apps Public APIs" level="ui">
+     <component id="messaging_integration_api" name="Messaging Integration API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_pub/messaging_integration_api/group"/>
+     </component>
+     <component id="plugin_bio_control_api" name="Plug-in Bio Control API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_pub/plugin_bio_control_api/group"/>
+     </component>
+     <component id="mms_client_mtm_api" name="MMS Client MTM API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_pub/mms_client_mtm_api/group"/>
+     </component>
+     <component id="open_new_message_notification_api" name="Open New Message Notification API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_pub/open_new_message_notification_api/group"/>
+     </component>
+     <component id="messaging_editor_constants_api" name="Messaging Editor Constants API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_pub/messaging_editor_constants_api/group"/>
+     </component>
+    </collection>
+    <collection id="msg_plat" name="Messaging Apps Platform APIs" level="ui">
+     <component id="smil_player_launch_api" name="SMIL Player Launch API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/smil_player_launch_api/group"/>
+     </component>
+     <component id="messaging_media_resolver_api" name="Messaging Media Resolver API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/messaging_media_resolver_api/group"/>
+     </component>
+     <component id="smil_engine_api" name="SMIL Engine API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/smil_engine_api/group"/>
+     </component>
+     <component id="mms_server_settings_api" name="MMS Server Settings API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/mms_server_settings_api/group"/>
+     </component>
+     <component id="new_contacts_note_secondary_display_api" name="New Contacts Note Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
+     </component>
+     <component id="messaging_center_ui_utilities_api" name="Messaging Center UI Utilities API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
+     </component>
+     <component id="internet_mail_mtm_ui_api" name="Internet Mail MTM UI API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
+     </component>
+     <component id="messaging_editor_api" name="Messaging Editor API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/messaging_editor_api/group"/>
+     </component>
+     <component id="email_domain_utilities_api" name="Email Domain Utilities API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/email_domain_utilities_api/group"/>
+     </component>
+     <component id="smil_transition_api" name="SMIL Transition API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/smil_transition_api/group"/>
+     </component>
+     <component id="new_contacts_note_status_api" name="New Contacts Note Status API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/new_contacts_note_status_api/group"/>
+     </component>
+     <component id="unified_editor_video_conversion_api" name="Unified Editor Video Conversion API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
+     </component>
+     <component id="mms_conformance_api" name="MMS Conformance API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/mms_conformance_api/group"/>
+     </component>
+     <component id="new_contacts_note_variables_api" name="New Contacts Note Variables API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
+     </component>
+     <component id="new_message_notification_api" name="New Message Notification API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/new_message_notification_api/group"/>
+     </component>
+     <component id="mms_application_api" name="MMS Application API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/mms_application_api/group"/>
+     </component>
+     <component id="mms_engine_settings_api" name="MMS Engine Settings API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/mms_engine_settings_api/group"/>
+     </component>
+     <component id="mms_codec_client_api" name="MMS Codec Client API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/mms_codec_client_api/group"/>
+     </component>
+     <component id="send_ui_meeting_request_api" name="Send UI Meeting Request API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
+     </component>
+     <component id="new_contact_notes_extended_api" name="New Contact Notes Extended API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
+     </component>
+     <component id="mail_ui_constants_api" name="Mail UI Constants API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/mail_ui_constants_api/group"/>
+     </component>
+     <component id="sim_dialog_launch_api" name="SIM Dialog Launch API" class="api" filter="s60">
+      <unit bldFile="/app/messaging/msg_plat/sim_dialog_launch_api/group"/>
+     </component>
+    </collection>
+    <collection id="mobilemessaging" name="Mobile Messaging" level="ui">
+     <component id="audiomsg" filter="s60" name="Audio Message">
+      <unit bldFile="/app/messaging/mobilemessaging/audiomsg/group"/>
+     </component>
+     <component id="msgmedia" filter="s60" name="Message Media">
+      <unit bldFile="/app/messaging/mobilemessaging/msgmedia/group"/>
+     </component>
+     <component id="unieditor" filter="s60" name="Unified Editor">
+      <unit bldFile="/app/messaging/mobilemessaging/unieditor/group"/>
+     </component>
+     <component id="mmsui" filter="s60" name="MMS UI">
+      <unit bldFile="/app/messaging/mobilemessaging/mmsui/group"/>
+     </component>
+     <component id="postcard" filter="s60" name="Postcard">
+      <unit bldFile="/app/messaging/mobilemessaging/postcard/group"/>
+     </component>
+     <component id="smilui" filter="s60" name="SMIL UI">
+      <unit bldFile="/app/messaging/mobilemessaging/smilui/group"/>
+     </component>
+     <component id="smum" filter="s60" name="SMS UI MTM and UI Data MTM" class="plugin">
+      <unit bldFile="/app/messaging/mobilemessaging/smum/group"/>
+     </component>
+     <component id="smsui" filter="s60" name="SMS UI">
+      <unit bldFile="/app/messaging/mobilemessaging/smsui/group"/>
+     </component>
+     <component id="smsmtm" name="SMS MTM" purpose="optional" class="plugin">
+      <unit bldFile="/app/messaging/mobilemessaging/smsmtm/group" mrp="/app/messaging/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="/app/messaging/mmsengine/mmssettings/group" mrp="/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
+     </component>
+     <component id="mmsconf" name="MMS Configuration" purpose="optional">
+      <unit bldFile="/app/messaging/mmsengine/mmsconf" mrp="/app/messaging/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="/app/messaging/mmsengine/group"/>
+     </component>
+    </collection>
+    <collection id="messagingappbase" name="Messaging App Base" level="base">
+     <component id="msgavkon" filter="s60" name="Messaging Avkon UI">
+      <unit bldFile="/app/messaging/messagingappbase/msgavkon/group"/>
+     </component>
+     <component id="mce" filter="s60" name="Message Center Application">
+      <unit bldFile="/app/messaging/messagingappbase/mce/group"/>
+     </component>
+     <component id="mceextraitems" filter="s60" name="Message Center Extra Items">
+      <unit bldFile="/app/messaging/messagingappbase/mceextraitems/group"/>
+     </component>
+     <component id="mcesettings" filter="s60" name="Message Center Settings">
+      <unit bldFile="/app/messaging/messagingappbase/mcesettings/group"/>
+     </component>
+     <component id="msgerrorwatcher" filter="s60" name="Messaging Error Watcher" class="plugin">
+      <unit bldFile="/app/messaging/messagingappbase/msgerrorwatcher/group"/>
+     </component>
+     <component id="ncnlist" filter="s60" name="New Contacts Note List">
+      <unit bldFile="/app/messaging/messagingappbase/ncnlist/group"/>
+     </component>
+     <component id="schemeplugin" filter="s60" name="Scheme Handler Plugin" class="plugin">
+      <unit bldFile="/app/messaging/messagingappbase/schemeplugin/group"/>
+     </component>
+     <component id="sendui" filter="s60" name="Send UI" class="plugin">
+      <unit bldFile="/app/messaging/messagingappbase/sendui/group"/>
+     </component>
+     <component id="smilengine" filter="s60" name="SMIL Engine">
+      <unit bldFile="/app/messaging/messagingappbase/smilengine/group"/>
+     </component>
+     <component id="bium" filter="s60" name="BIO UI MTM" class="plugin">
+      <unit bldFile="/app/messaging/messagingappbase/bium/group"/>
+     </component>
+     <component id="smartmessaging" filter="s60" name="Smart Messaging">
+      <unit bldFile="/app/messaging/messagingappbase/smartmessaging/group"/>
+     </component>
+     <component id="msgeditor" filter="s60" name="Messaging Editor">
+      <unit bldFile="/app/messaging/messagingappbase/msgeditor/group"/>
+     </component>
+     <component id="smilparser" name="SMIL Parser" introduced="7.0s" purpose="optional">
+      <unit bldFile="/app/messaging/messagingappbase/smilparser/GROUP" mrp="/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
+     </component>
+     <component id="obexmtms" name="OBEX MTMs" introduced="7.0s" purpose="optional" class="plugin">
+      <unit bldFile="/app/messaging/messagingappbase/obexmtms/Group" mrp="/app/messaging/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="/app/messaging/email/alwaysonlineemailplugin/group"/>
+     </component>
+     <component id="emailnotificationhandler" filter="s60" name="Email Notification Handler" class="plugin" deprecated="^3">
+      <unit bldFile="/app/messaging/email/emailnotificationhandler/group"/>
+     </component>
+     <component id="imum" filter="s60" name="Internet Mail UI MTM" class="plugin" deprecated="^3">
+      <unit bldFile="/app/messaging/email/imum/group"/>
+     </component>
+     <component id="mail" filter="s60" name="Mail Application" deprecated="^3">
+      <unit bldFile="/app/messaging/email/mail/group"/>
+     </component>
+     <component id="pop3andsmtpmtm" name="POP3 and SMTP MTM" purpose="optional" class="plugin" deprecated="^3">
+      <unit bldFile="/app/messaging/email/pop3andsmtpmtm/group" mrp="/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
+     </component>
+     <component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
+      <unit bldFile="/app/messaging/email/imap4mtm/group" mrp="/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
+     </component>
+    </collection>
+    <collection id="messaging_info" name="Messaging Apps Info" level="ui">
+     <component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <unit mrp="/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="commonemail" level="apps" span="2" tech-domain="pr" name="Email Apps" levels="service support ui app">
+    <collection id="email_pub" name="Email Apps Public Interfaces" level="app">
+     <component id="email_widget_api" name="Email Widget API" class="api" filter="s60">
+      <unit bldFile="/app/commonemail/email_pub/email_widget_api/group"/>
+     </component>
+    </collection>
+    <collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
+     <component id="email_client_api" name="Email Client API" class="api" filter="s60">
+      <unit bldFile="/app/commonemail/email_plat/email_client_api/group"/>
+     </component>
+     <component id="email_setup_plugin_api" name="Email Setup Plugin API" class="api" filter="s60">
+      <unit bldFile="/app/commonemail/email_plat/email_setup_plugin_api/group"/>
+     </component>
+     <component id="email_crkeys_api" name="Email CenRep Keys API" class="api" filter="s60">
+      <unit bldFile="/app/commonemail/email_plat/email_crkeys_api/group"/>
+     </component>
+    </collection>
+    <collection id="emailservices" name="Email Services" level="service">
+     <component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
+      <unit bldFile="/app/commonemail/emailservices/emailframework/group"/>
+     </component>
+     <component id="emailclientapi" filter="s60" name="Email Client API" introduced="^2">
+      <unit bldFile="/app/commonemail/emailservices/emailclientapi/group"/>
+     </component>
+     <component id="emailserver" filter="s60" name="Email Server" introduced="^2">
+      <unit bldFile="/app/commonemail/emailservices/emailserver/group"/>
+     </component>
+     <component id="emailservermonitor" filter="s60" name="Email Server Monitor" introduced="^2">
+      <unit bldFile="/app/commonemail/emailservices/emailservermonitor/group"/>
+     </component>
+     <component id="psmruadapter" filter="s60" name="Predictive Search Most Recent Used Adapter" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/emailservices/psmruadapter/group"/>
+     </component>
+     <component id="emailstore" filter="s60" name="Email Store" introduced="^2">
+      <unit bldFile="/app/commonemail/emailservices/emailstore/group"/>
+     </component>
+     <component id="emaildebug" filter="s60" name="Email Debug" class="api" introduced="^2">
+      <unit bldFile="/app/commonemail/emailservices/emaildebug/group"/>
+     </component>
+     <component id="emailinstallationinitiator" filter="s60" name="Email Installation Initiator" introduced="^2">
+      <unit bldFile="/app/commonemail/emailservices/emailinstallationinitiator/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="/app/commonemail/ipsservices/ipssossettings/group"/>
+     </component>
+     <component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/ipsservices/ipssosplugin/group"/>
+     </component>
+     <component id="ipssosaoplugin" filter="s60" name="IPS SOS Always Online Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/ipsservices/ipssosaoplugin/group"/>
+     </component>
+     <component id="ipsservices_build" filter="s60" name="IPS Services Build" introduced="^2">
+      <unit bldFile="/app/commonemail/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="/app/commonemail/emailcontacts/contactactionservice/group"/>
+     </component>
+     <component id="contactactionmenu" filter="s60" name="Contact Action Menu" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/emailcontacts/contactactionmenu/group"/>
+     </component>
+     <component id="remotecontactlookup" filter="s60" name="Remote Contact Lookup" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/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="/app/commonemail/meetingrequest/mrcommon/group"/>
+     </component>
+     <component id="mrdb" filter="s60" name="MR Database" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrdb/group"/>
+     </component>
+     <component id="mrpolicy" filter="s60" name="MR Policy" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrpolicy/group"/>
+     </component>
+     <component id="mrservices" filter="s60" name="MR Services" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrservices/group"/>
+     </component>
+     <component id="mrgui" filter="s60" name="MR GUI" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrgui/group"/>
+     </component>
+     <component id="mrentry" filter="s60" name="MR Entry" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrentry/group"/>
+     </component>
+     <component id="mrtasks" filter="s60" name="MR Tasks" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrtasks/group"/>
+     </component>
+     <component id="mrutils" filter="s60" name="MR Utils" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrutils/group"/>
+     </component>
+     <component id="mrutilscalplugin" filter="s60" name="MR Utils Calendar Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrutilscalplugin/group"/>
+     </component>
+     <component id="mrviewer" filter="s60" name="MR Viewer" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrviewer/group"/>
+     </component>
+     <component id="mrviewercalplugin" filter="s60" name="MR Viewer Calendar Plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrviewercalplugin/group"/>
+     </component>
+     <component id="mricalviewer" filter="s60" name="MR iCal Viewer" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mricalviewer/group"/>
+     </component>
+     <component id="mrversit2" filter="s60" name="MR Versit2" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrversit2/group"/>
+     </component>
+     <component id="mragnversit2" filter="s60" name="MR Agenda Versit2" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mragnversit2/group"/>
+     </component>
+     <component id="mrcasplugin" filter="s60" name="MR Contact Action Service Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/meetingrequest/mrcasplugin/group"/>
+     </component>
+     <component id="mrurlparserplugin" filter="s60" name="MR URL Parser Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/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="/app/commonemail/meetingrequest/group"/>
+     </component>
+    </collection>
+    <collection id="emailuis" name="Email UIs" level="app">
+     <component id="emailui" filter="s60" name="Email UI" introduced="^2">
+      <unit bldFile="/app/commonemail/emailuis/emailui/group"/>
+     </component>
+     <component id="gsemailsettings" filter="s60" name="Email GS Settings" class="plugin" introduced="^2">
+      <unit bldFile="/app/commonemail/emailuis/gsemailsettings/group"/>
+     </component>
+     <component id="uicomponents" filter="s60" name="Email UI Components" introduced="^2">
+      <unit bldFile="/app/commonemail/emailuis/uicomponents/group"/>
+     </component>
+     <component id="widget" filter="s60" name="Email Widget" introduced="^2">
+      <meta rel="config">
+       <not-defined condition="FF_CMAIL_INTEGRATION"/>
+      </meta>
+      <!-- Uncomment unit when configuration is in place. Currently #included from emailuis_build, which should be removed at the same time. -->
+      <!--<unit bldFile="emailuis/widget/group"/>-->
+     </component>
+     <component id="emailuis_build" filter="s60" name="Email UIs Build" introduced="^2">
+      <unit bldFile="/app/commonemail/emailuis/group"/>
+     </component>
+    </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>
+    </collection>
+   </package>
+   <package id="conversations" level="apps" tech-domain="pr" name="Conversation Apps" levels="settings utils plugin ui">
+    <collection id="conversations_plat" name="Conversation Apps Platform Interfaces" level="ui">
+     <component id="im_cv_launcher_api" name="IM CV Launcher API" class="api" filter="s60">
+      <unit bldFile="/app/conversations/conversations_plat/im_cv_launcher_api/group"/>
+     </component>
+     <component id="im_connection_api" name="IM Connection API" class="api" filter="s60">
+      <unit bldFile="/app/conversations/conversations_plat/im_connection_api/group"/>
+     </component>
+     <component id="im_cv_appui_api" name="IM CV App UI API" class="api" filter="s60">
+      <unit bldFile="/app/conversations/conversations_plat/im_cv_appui_api/group"/>
+     </component>
+    </collection>
+    <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="/app/conversations/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="/app/conversations/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="/app/conversations/imstutils/help/group"/>
+     </component>
+     <component id="imconnectionprovider" filter="s60" name="IM Connection Provider" class="plugin">
+      <unit bldFile="/app/conversations/imstutils/imconnectionprovider/group"/>
+     </component>
+     <component id="xmppadapter" filter="s60" name="XMPP Settings Adapter" class="plugin">
+      <unit bldFile="/app/conversations/imstutils/xmppadapter/group"/>
+     </component>
+     <component id="imconversationview" filter="s60" name="IM Conversation View">
+      <unit bldFile="/app/conversations/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="/app/conversations/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="/app/conversations/uiservicetab/vimpstutils/group"/>
+     </component>
+     <component id="vimpststorage" filter="s60" name="VIMP Service Tab Storage">
+      <unit bldFile="/app/conversations/uiservicetab/vimpststorage/group"/>
+     </component>
+     <component id="vimpstengine" filter="s60" name="VIMP Service Tab Engine">
+      <unit bldFile="/app/conversations/uiservicetab/vimpstengine/group"/>
+     </component>
+     <component id="vimpstcmdprocess" filter="s60" name="VIMP Service Tab Command Process">
+      <unit bldFile="/app/conversations/uiservicetab/vimpstcmdprocess/group"/>
+     </component>
+     <component id="vimpstui" filter="s60" name="VIMP Service Tab UI">
+      <unit bldFile="/app/conversations/uiservicetab/vimpstui/group"/>
+     </component>
+     <component id="vimpstdetailsviewplugin" filter="s60" name="VIMP ST Details View Plugin" class="plugin">
+      <unit bldFile="/app/conversations/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="/app/conversations/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="/app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
+     </component>
+     <component id="themes" filter="s60" name="Service Widget Themes" class="config">
+      <!-- does this really need to have that number in the directory name? -->
+      <unit bldFile="/app/conversations/servicewidget/themes/install-themes/install/servicewidget_20021383/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="/app/conversations/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="/app/conversations/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="/app/conversations/imstatuspaneindicatorplugin/group"/>
+     </component>
+    </collection>
+    <collection id="conversations_info" name="Conversation Apps Info" level="ui">
+     <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="/app/conversations/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="im" level="apps" tech-domain="pr" name="Instant Messaging Apps" levels="support prot engine apps">
+    <collection id="im_plat" name="Instant Messaging Apps Platform Interfaces" level="apps">
+     <component id="wv_sap_settings_api" name="WV SAP Settings API" class="api" filter="s60">
+      <unit bldFile="/app/im/im_plat/wv_sap_settings_api/group"/>
+     </component>
+    </collection>
+    <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="/app/im/wvsettings20/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="dictionary" level="services" tech-domain="pr" name="Dictionary" levels="utils ui">
+    <collection id="dictionary_plat" name="Dictionary Platform Interfaces" level="ui">
+     <component id="menu_suites_macros_api" name="Menu Suites Macros API" class="api" filter="s60">
+      <unit bldFile="/app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+     </component>
+    </collection>
+    <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="/app/dictionary/userdict/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="camera" level="apps" tech-domain="ma" name="Camera Apps">
+    <collection id="camera_plat" name="Camera Apps Platform Interfaces">
+     <component id="camcorder_ui_constants_api" name="Camcorder UI Constants API" class="api" filter="s60">
+      <unit bldFile="/app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+     </component>
+     <component id="active_palette_2_api" name="Active Palette 2 API" class="api" filter="s60">
+      <unit bldFile="/app/camera/camera_plat/active_palette_2_api/group"/>
+     </component>
+    </collection>
+    <collection id="camerauis" name="Camera UIs">
+     <component id="activepalette" filter="s60" name="Active Palette">
+      <unit bldFile="/app/camera/camerauis/activepalette/group"/>
+     </component>
+     <component id="cameraapp" filter="s60" name="Camera Application">
+      <unit bldFile="/app/camera/camerauis/cameraapp/group"/>
+      <unit bldFile="/app/camera/camerauis/cameraapp/help/group"/>
+     </component>
+    </collection>
+    <collection id="camera_info" name="Camera Apps Info">
+     <component id="camera_plat_test" filter="s60,test,api_test" name="Camera Apps Platform API Tests" purpose="development">
+      <!-- can only have one unit. #include from a single bld.inf? -->
+      <unit bldFile="/app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/>
+      <unit bldFile="/app/camera/camera_plat/active_palette_2_api/tsrc/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor Apps" levels="engine ui">
+    <collection id="imgeditor_plat" name="Image Editor Apps Platform Interfaces" level="ui">
+     <component id="image_editor_debug_utilities_api" name="Image Editor Debug Utilities API" class="api" filter="s60">
+      <unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
+     </component>
+     <component id="image_editor_utilities_api" name="Image Editor Utilities API" class="api" filter="s60">
+      <unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
+     </component>
+     <component id="image_editor_definitions_api" name="Image Editor Definitions API" class="api" filter="s60">
+      <unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
+     </component>
+     <component id="image_editor_system_parameters_api" name="Image Editor System Parameters API" class="api" filter="s60">
+      <unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
+     </component>
+     <component id="image_processing_engine_api" name="Image Processing Engine API" class="api" filter="s60">
+      <unit bldFile="/app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
+     </component>
+    </collection>
+    <collection id="imageeditor" name="Image Editor UI" level="ui">
+     <component id="pb" filter="s60" name="Plugin Base">
+      <unit bldFile="/app/imgeditor/imageeditor/pb/group"/>
+     </component>
+     <component id="iepb" filter="s60" name="Image Editor Plugin Base">
+      <unit bldFile="/app/imgeditor/imageeditor/iepb/group"/>
+     </component>
+     <component id="imageeditorui" filter="s60" name="Image Editor UI">
+      <unit bldFile="/app/imgeditor/imageeditor/imageeditorui/group"/>
+     </component>
+     <component id="imageeditormanager" filter="s60" name="Image Editor Manager">
+      <unit bldFile="/app/imgeditor/imageeditor/imageeditormanager/group"/>
+     </component>
+     <component id="imageeditorapp" filter="s60" name="Image Editor Application">
+      <unit bldFile="/app/imgeditor/imageeditor/imageeditorapp/group"/>
+     </component>
+     <component id="imageeditor_plugins" filter="s60" name="Image Editor Plugins" class="plugin">
+      <!-- can only have one unit. Need to include all from a single bld.inf -->
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/cropplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/drawplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/frameplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
+      <unit bldFile="/app/imgeditor/imageeditor/plugins/textplugin/group"/>
+      <!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+         -->
+     </component>
+     <component id="editorprovider" filter="s60" name="Image Editor Provider">
+      <unit bldFile="/app/imgeditor/imageeditor/editorprovider/group"/>
+     </component>
+     <component id="imageeditor_build" filter="s60" name="Image Editor Build">
+      <!-- should distribute this to the other components -->
+      <unit bldFile="/app/imgeditor/imageeditor/group"/>
+     </component>
+    </collection>
+    <collection id="imageeditorengine" name="Image Editor Engine" level="engine">
+     <component id="filters" filter="s60" name="Image Editor Filters">
+      <!-- can only have one unit. Need to include all from a single bld.inf -->
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterframe/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filternegate/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filterscale/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
+      <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
+      <!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+         -->
+     </component>
+     <component id="imageeditorutils" filter="s60" name="Image Editor Utilities">
+      <unit bldFile="/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
+     </component>
+     <component id="systemparameters" filter="s60" name="System Parameters">
+      <unit bldFile="/app/imgeditor/imageeditorengine/systemparameters/group"/>
+     </component>
+     <component id="enginewrapper" filter="s60" name="Image Editor Engine Wrapper">
+      <unit bldFile="/app/imgeditor/imageeditorengine/enginewrapper/group"/>
+     </component>
+     <component id="imageeditorengine_build" filter="s60" name="Image Editor Engine Build">
+      <!-- should distribute this to the other components -->
+      <unit bldFile="/app/imgeditor/imageeditorengine/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor Apps" levels="engine ui">
+    <collection id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" level="ui">
+     <component id="video_editor_engine_api" name="Video Editor Engine API" class="api" introduced="^2">
+      <unit bldFile="/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
+     </component>
+    </collection>
+    <collection id="videditor" name="Video Editor" level="ui">
+     <component id="videoeditorcommon" filter="s60" name="Video Editor Common" introduced="^2">
+      <unit bldFile="/app/videoeditor/videditor/videoeditorcommon/group"/>
+     </component>
+     <component id="videoeditoruicomponents" filter="s60" name="Video Editor UI Components" introduced="^2">
+      <unit bldFile="/app/videoeditor/videditor/videoeditoruicomponents/group"/>
+     </component>
+     <component id="simplevideoeditor" filter="s60" name="Simple Video Editor" introduced="^2">
+      <unit bldFile="/app/videoeditor/videditor/simplevideoeditor/group"/>
+     </component>
+     <component id="simplecutvideo" filter="s60" name="Simple Cut Video" introduced="^2">
+      <unit bldFile="/app/videoeditor/videditor/simplecutvideo/group"/>
+     </component>
+     <component id="videoprovider" filter="s60" name="Video Provider" introduced="^2">
+      <unit bldFile="/app/videoeditor/videditor/videoprovider/group"/>
+     </component>
+     <component id="manualvideoeditor" filter="s60" name="Manual Video Editor" introduced="^2">
+      <!--  uncomment when supported
+      	<meta rel="config">
+      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
+      	</meta>
+        <unit bldFile="videditor/manualvideoeditor/group"/> -->
+     </component>
+     <component id="videditor_build" filter="s60" name="Video Editor Build" introduced="^2">
+      <!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
+      <unit bldFile="/app/videoeditor/videditor/group"/>
+     </component>
+    </collection>
+    <collection id="videoeditorengine" name="Video Editor Engine" level="engine">
+     <component id="audioeditorengine" filter="s60" name="Audio Editor Engine" introduced="^2">
+      <unit bldFile="/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
+     </component>
+     <component id="avcedit" filter="s60" name="AVC Editing" introduced="^2">
+      <unit bldFile="/app/videoeditor/videoeditorengine/avcedit/group"/>
+     </component>
+     <component id="h263decoder" filter="s60" name="H.263 Decoder" introduced="^2">
+      <unit bldFile="/app/videoeditor/videoeditorengine/h263decoder/group"/>
+     </component>
+     <component id="mp3aacmaniplib" filter="s60" name="MP3 and AAC Manipulation Library" introduced="^2">
+      <unit bldFile="/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
+     </component>
+     <component id="vedtranscoder" filter="s60" name="Video Editor Transcoder" introduced="^2">
+      <unit bldFile="/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
+     </component>
+     <component id="vedengine" filter="s60" name="Video Editor Engine" introduced="^2">
+      <unit bldFile="/app/videoeditor/videoeditorengine/vedengine/group"/>
+     </component>
+     <component id="videoeditorengine_build" filter="s60" name="Video Editor Engine Build" introduced="^2">
+      <!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
+      <unit bldFile="/app/videoeditor/videoeditorengine/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
+    <collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
+     <component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
+      <unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+      <unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="video_player_file_details_dialog_api" name="Media Player File Details Dialog API" class="api" filter="s60">
+      <unit bldFile="/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+      <unit bldFile="/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/tsrc/group" filter="test,api_test"/>
+     </component>
+     <component id="videocollection_api" name="Video Collection API" class="api" filter="s60">
+      <unit bldFile="/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+     </component>
+    </collection>
+    <collection id="videofeeds" name="Video Feeds" level="util">
+     <component id="iptv_utils" filter="s60" name="IPTV Util" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/utils/group"/>
+     </component>
+     <component id="viewmessageutility" filter="s60" name="View Message Utility" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/viewmessageutility/group"/>
+     </component>
+     <component id="vcxnotifier" filter="s60" name="Video Connection Notifier" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videofeeds/vcxnotifier/group"/>
+     </component>
+     <component id="vccommon" filter="s60" name="Video Connection Common" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/vccommon/group"/>
+     </component>
+     <component id="clientapi" name="Server Client" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/clientapi/group"/>
+     </component>
+     <component id="provisioningprocessor" name="Provisioning Processor" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/provisioningprocessor/group"/>
+     </component>
+     <component id="mrssplugin" name="RSS plugin" filter="s60" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videofeeds/mrssplugin/group"/>
+     </component>
+     <component id="videofeeds_server" name="Server" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/server/group"/>
+     </component>
+     <component id="videofeeds_server_tsrc" name="Video Feeds Server Tests" introduced="^3" filter="s60,test,unit_test">
+      <!--  can only have one unit. Can these be #included from videofeeds_server or a common bld.inf?-->
+      <unit bldFile="/app/videoplayer/videofeeds/server/tsrc/IptvTestUtility/group"/>
+      <unit bldFile="/app/videoplayer/videofeeds/server/tsrc/VCXProvisioningTest/group"/>
+      <unit bldFile="/app/videoplayer/videofeeds/server/tsrc/VCXServiceManagementApiTest/group"/>
+      <unit bldFile="/app/videoplayer/videofeeds/server/tsrc/VCXVodContentApiTest/group"/>
+     </component>
+     <component id="livetvutils" name="LiveTV Utils" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/livetvutils/group"/>
+     </component>
+     <component id="iptvprovisioningrecognizer" name="IP TV Provisioning Recognizer" filter="s60" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videofeeds/provisioningrecognizer/group"/>
+     </component>
+     <component id="iptvprovisioningappui" name="IP TV Provisioning App UI" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/provisioningappui/group"/>
+     </component>
+     <component id="iptvomaprovisioning" name="IP TV OMA Provisioning" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/omaprovisioning/group"/>
+     </component>
+     <component id="vcnsuiengine" name="VoD UI Engine" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/vcnsuiengine/group"/>
+     </component>
+     <component id="hgvodui" name="Ganes UX2.0 VoD UI" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/hgvodui/group"/>
+     </component>
+     <component id="hgvodplugin" name="Ganes UX2.0 VoD UI Plugin" filter="s60" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videofeeds/hgvodplugin/group"/>
+     </component>
+     <component id="vcnsscheduleview" name="Scheduled Download Settings View" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/vcnsscheduleview/group"/>
+     </component>
+     <component id="vcnsscheduleplugin" name="Scheduled Download Settings Plugin" filter="s60" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videofeeds/vcnsscheduleplugin/group"/>
+     </component>
+     <component id="scheduleddlplugin" name="Scheduled download plugin" filter="s60" introduced="^3">
+      <unit bldFile="/app/videoplayer/videofeeds/scheduleddlplugin/group"/>
+     </component>
+     <component id="videofeeds_tsrc" name="Video Feeds Tests" introduced="^3" filter="s60,test,unit_test">
+      <!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
+      <unit bldFile="/app/videoplayer/tsrc/VCXTestCommon/group"/>
+      <unit bldFile="/app/videoplayer/tsrc/VCXTestUtilModule/group"/>
+      <unit bldFile="/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
+     </component>
+    </collection>
+    <collection id="videocollection" name="Video Collection" level="util">
+     <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
+      <unit bldFile="/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
+     </component>
+     <component id="mpxmyvideoscollection_test" filter="s60,test,unit_test" name="MPX My Videos Collection Tests" introduced="^3" purpose="development">
+      <unit bldFile="/app/videoplayer/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group"/>
+     </component>
+     <component id="myvideosindicatorplugin" filter="s60" name="My Videos Indicator Plugin" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videocollection/myvideosindicatorplugin/group"/>
+     </component>
+     <component id="hgmyvideos" filter="s60" name="Huriganes My Videos" introduced="^3">
+      <unit bldFile="/app/videoplayer/videocollection/hgmyvideos/group"/>
+     </component>
+     <component id="hgmyvideosplugin" filter="s60" name="Huriganes My VideosPlugin" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videocollection/hgmyvideosplugin/group"/>
+     </component>
+     <component id="mpxmyvideoscollection_tsrc" name="MPX My Videos Collection Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
+      <!--  can only have one unit. Can thes be #included from any of the above or a common bld.inf?-->
+      <unit bldFile="/app/videoplayer/tsrc/VCXTestCommon/group"/>
+      <unit bldFile="/app/videoplayer/tsrc/VCXTestUtilModule/group"/>
+      <unit bldFile="/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
+     </component>
+    </collection>
+    <collection id="videoplayer_homescreenplugins" name="Videoplayer Homescreen Plugins" level="plugin">
+     <component id="videosuiteconf" filter="s60" name="Video Suite Configuration" class="plugin" introduced="^3">
+      <unit bldFile="/app/videoplayer/homescreenplugins/videosuiteconf/group"/>
+     </component>
+     <component id="videoahlplugin" filter="s60" name="Video Player Action Handler" class="plugin" introduced="^3">
+      <unit bldFile="/app/videoplayer/homescreenplugins/videoahlplugin/group"/>
+     </component>
+     <component id="videochplugin" filter="s60" name="Video Player Content Harvester " class="plugin" introduced="^3">
+      <unit bldFile="/app/videoplayer/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="/app/videoplayer/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="/app/videoplayer/tsrc/VCXTestCommon/group"/>
+      <unit bldFile="/app/videoplayer/tsrc/VCXTestUtilModule/group"/>
+      <unit bldFile="/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
+      <unit bldFile="/app/videoplayer/mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/group"/>
+      <unit bldFile="/app/videoplayer/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="/app/videoplayer/filedetails/filedetailsplugin/group"/>
+     </component>
+     <component id="filedetailsdialog" filter="s60" name="File Details Dialog" introduced="^3">
+      <unit bldFile="/app/videoplayer/filedetails/filedetailsdialog/group"/>
+     </component>
+    </collection>
+    <collection id="videoplayerapp" name="Video Player App" level="apps">
+     <component id="lwplayer" name="Lightweight Player" filter="s60">
+      <unit bldFile="/app/videoplayer/videoplayerapp/lwplayer/group"/>
+     </component>
+     <component id="mpxvideoplayer" filter="s60" name="MPX Video Player" class="plugin">
+      <unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
+      <unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group" filter="test,unit_test"/>
+     </component>
+     <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
+      <unit bldFile="/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
+     </component>
+    </collection>
+    <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
+     <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
+      <unit bldFile="/app/videoplayer/videoplayback/videohelix/tsrc/ut_videohelixtest/group" filter="test,unit_test"/>
+     </component>
+     <component id="videopdlplaybackviewplugin" filter="s60" name="Video PDL Playback View Plugin" class="plugin" introduced="^3">
+      <unit bldFile="/app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
+     </component>
+     <component id="videoplaybackcontrols" filter="s60" name="Video Playback Controls" introduced="^3" class="plugin">
+      <unit bldFile="/app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
+      <unit bldFile="/app/videoplayer/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group" filter="test,unit_test"/>
+     </component>
+     <component id="videoplaybackviewplugin" filter="s60" name="Video Playback View Plugin" class="plugin" introduced="^3">
+      <unit bldFile="/app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
+     </component>
+     <component id="videoplaybackviews" filter="s60" name="Video Playback Views" class="plugin" introduced="^3">
+      <unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
+      <unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group" filter="test,unit_test"/>
+     </component>
+    </collection>
+   </package>
+   <package id="photos" level="apps" tech-domain="ma" name="Photos" levels="support fw ui app">
+    <collection id="photos_plat" name="Photos Platform Interfaces" level="app">
+     <component id="collection_plugins_api" name="Collection Plugins API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/photos/photos_plat/collection_plugins_api/group"/>
+     </component>
+     <component id="controllers_collection_api" name="Controllers Collection API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/photos/photos_plat/controllers_collection_api/group"/>
+     </component>
+     <component id="gallery_utilities_api" name="Gallery Utilities API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/photos/photos_plat/gallery_utilities_api/group"/>
+     </component>
+     <component id="slideshow_ui_constants_api" name="Slideshow Ui Constants API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/photos/photos_plat/slideshow_ui_constants_api/group"/>
+     </component>
+     <component id="views_metadatadialog_api" name="Views Metadata Dialog API" introduced="^2" class="api" filter="s60">
+      <unit bldFile="/app/photos/photos_plat/views_metadatadialog_api/group"/>
+     </component>
+    </collection>
+    <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="/app/photos/photosgallery/help/group"/>
+     </component>
+     <component id="logging" filter="s60" name="Photos Logging" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/logging/group"/>
+     </component>
+     <component id="photosgallery_common" filter="s60" name="Photos Common" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/common/group"/>
+     </component>
+     <component id="photosgallery_commonui" filter="s60" name="Photos Common UI" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/commonui/group"/>
+     </component>
+     <component id="photosgalleryollectionfw" filter="s60" name="Photos Collection Framework" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/collectionframework/group"/>
+     </component>
+     <component id="galleryicons" filter="s60" name="Photos Icons" class="config" introduced="^2">
+      <unit bldFile="/app/photos/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="/app/photos/photosgallery/controllers/imageviewer/group"/>
+     </component>
+     <component id="photosgalleryviewfw" filter="s60" name="View Framework" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/viewframework/group"/>
+     </component>
+     <component id="controllers" filter="s60" name="Photos Controllers" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/controllers/group"/>
+     </component>
+     <component id="photogallery" filter="s60" name="Media Gallery" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/gallery/group"/>
+     </component>
+     <component id="slideshow" filter="s60" name="Slideshow" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/slideshow/group"/>
+     </component>
+     <component id="contentharvesterplugin" filter="s60" name="Gallery Content Harvester Plugin" class="plugin" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/contentharvesterplugin/group"/>
+     </component>
+     <component id="photossuite" filter="s60" name="Photos Suite" class="config" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/photossuite/group"/>
+     </component>
+     <component id="memoryplugin" name="Memory Plugin" class="plugin" filter="s60" introduced="^2">
+      <unit bldFile="/app/photos/photosgallery/memoryplugin/group"/>
+     </component>
+     <component id="imgvwr" filter="s60" name="Photos Image Viewer" introduced="^3">
+      <unit bldFile="/app/photos/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="/app/photos/photosgallery/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
+    <collection id="musicplayer_plat" name="Music Player Apps Platform Interfaces" level="app">
+     <component id="mpx_music_player_app_api" name="MPX Music Player App API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
+     </component>
+     <component id="mpx_music_player_commonui_api" name="MPX Music Player Common UI API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
+     </component>
+     <component id="mpx_music_player_media_key_handler_api" name="MPX Music Player Media Key Handler API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
+     </component>
+     <component id="mpx_music_player_remote_control_api" name="MPX Music Player Remote Control API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
+     </component>
+     <component id="mpx_music_shop_ui_api" name="MPX Music Shop UI API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
+     </component>
+     <component id="mpx_music_wap_adapter_cenrep_api" name="MPX Music Wap Adapter CenRep API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
+     </component>
+     <component id="mpx_music_store_api" name="MPX Music Store Find API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
+     </component>
+     <component id="audio_application_features_api" name="Audio Application Features API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
+     </component>
+     <component id="music_content_publisher_plugin_api" name="Music Content Publisher Plugin API" class="api" filter="s60">
+      <unit bldFile="/app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
+     </component>
+    </collection>
+    <collection id="mpxmusicplayer" name="MPX Music Player" level="app">
+     <component id="mpxmusicplayer_help" filter="s60" name="Help">
+      <unit bldFile="/app/musicplayer/mpxmusicplayer/help/group"/>
+     </component>
+     <component id="mpxmusicplayer_commonui" filter="s60" name="MPX Common UI">
+      <unit bldFile="/app/musicplayer/mpxmusicplayer/commonui/group"/>
+     </component>
+     <component id="mpx_metadatahandler" filter="s60" name="MPX Metadata Handler">
+      <unit bldFile="/app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
+     </component>
+     <component id="mediakeyhandler" filter="s60" name="MPX Media Key Handler">
+      <unit bldFile="/app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
+     </component>
+     <component id="mpxmusicplayer_app" filter="s60" name="MPX Application">
+      <unit bldFile="/app/musicplayer/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="/app/musicplayer/mpxmusicplayer/group"/>
+     </component>
+    </collection>
+    <collection id="musichomescreen_multiview" name="Music Home Screen Multiview" level="hs">
+     <meta rel="config">
+      <defined condition="IAD_INCLUDE_ENHANCED_HOMESCREEN"/>
+     </meta>
+     <!-- Uncomment all units when configuration is in place. All currently #included from musichomescreen_build -->
+     <component id="mpxcollectionpublisher" filter="s60" name="MPX Collection Publisher" introduced="^2">
+      <!--<unit bldFile="musichomescreen_multiview/mpxcollectionpublisher/group"/>-->
+     </component>
+     <component id="musiccontentpublisher" filter="s60" name="Music Content Publisher" introduced="^2">
+      <!--<unit bldFile="musichomescreen_multiview/musiccontentpublisher/group"/>-->
+     </component>
+     <component id="mcpmusicplayer" filter="s60" name="Music Player MCP Plugin" class="plugin" introduced="^2">
+      <!--<unit bldFile="musichomescreen_multiview/mcpmusicplayer/group"/>-->
+     </component>
+     <component id="musicplayeractionhandlerplugin" filter="s60" name="Music Player Action Handler Plugin" class="plugin" introduced="^2">
+      <!--<unit bldFile="musichomescreen_multiview/musicplayeractionhandlerplugin/group"/>-->
+     </component>
+     <component id="mpx_data" filter="s60" name="MPX Data" introduced="^2">
+      <!-- does this make sense to be a component? should it just be #include from musichomescreen_multiview/group? -->
+      <!--<unit bldFile="musichomescreen_multiview/data/themes/default/group"/>-->
+     </component>
+     <component id="musichomescreen_build" filter="s60" name="Music Homescreen Multiview Build" introduced="^2">
+      <unit bldFile="/app/musicplayer/musichomescreen_multiview/group"/>
+     </component>
+    </collection>
+    <collection id="mpxplugins" name="MPX Plugins" level="plugins">
+     <component id="serviceplugins" filter="s60" name="MPX Service Plugins" class="plugin">
+      <unit bldFile="/app/musicplayer/mpxplugins/serviceplugins/group"/>
+     </component>
+     <component id="viewplugins" filter="s60" name="MPX View Plugins" class="plugin">
+      <unit bldFile="/app/musicplayer/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="/app/musicplayer/mpxplugins/group"/>
+     </component>
+    </collection>
+    <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
+     <component id="musicplayer_build" filter="s60" name="Music Player Build">
+      <!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
+      <unit bldFile="/app/musicplayer/group"/>
+     </component>
+     <component id="musicplayer_test" filter="s60,test,pref_test,api_test" purpose="development" name="Music Player Apps Test">
+      <unit bldFile="/app/musicplayer/tsrc/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="radio" level="apps" tech-domain="ma" 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="/app/radio/fmradio/activeidleengine/group"/>
+     </component>
+     <component id="fmradioengine" filter="s60" name="FM Radio Engine">
+      <unit bldFile="/app/radio/fmradio/fmradioengine/group"/>
+     </component>
+     <component id="fmradioactionhandler" filter="s60" name="FM Radio Action Handler" class="plugin">
+      <unit bldFile="/app/radio/fmradio/fmradioactionhandler/group"/>
+     </component>
+     <component id="fmradiomcpplugin" filter="s60" name="FM Radio Content Publisher Plugin" class="plugin">
+      <unit bldFile="/app/radio/fmradio/fmradiomcpplugin/group"/>
+     </component>
+     <component id="fmradio_build" filter="s60" name="FM Radio Build">
+      <unit bldFile="/app/radio/fmradio/fmradio/group"/>
+     </component>
+     <component id="fmradio_help" filter="s60" name="FM Radio Help">
+      <unit bldFile="/app/radio/fmradio/help/group"/>
+     </component>
+     <component id="fmradio_build" filter="s60" name="FM Radio ROM">
+      <!--  remove above #included bld.infs -->
+      <unit bldFile="/app/radio/fmradio/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
+   <package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
+   <package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
+    <!-- custom filter pref_test-->
+    <collection id="voicerec_plat" name="Voice Recorder Apps Platform Interfaces">
+     <component id="new_file_service_api" name="New File Service API" class="api" filter="s60">
+      <unit bldFile="/app/voicerec/voicerec_plat/new_file_service_api/group"/>
+     </component>
+     <component id="voicerecorder_public_constants_api" name="Voice Recorder Public Constants API" class="api" filter="s60">
+      <unit bldFile="/app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+     </component>
+    </collection>
+    <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="/app/voicerec/voicerecorder/group"/>
+     </component>
+    </collection>
+    <collection id="voicerec_info" name="Voice Recorder Apps Info">
+     <component id="voicerec_api_test" filter="s60,test,api_test,pref_test" purpose="development" name="Voice Recorder Apps Test">
+      <unit bldFile="/app/voicerec/tsrc/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="screensaver" level="apps" tech-domain="ui" name="Screen Saver Apps" levels="plugin ui">
+    <!-- is this a user-facing application or a daemon? -->
+    <!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
+    <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="/app/screensaver/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="homescreen" level="apps" tech-domain="ui" name="Home Screen Apps" levels="fw support apps">
+    <collection id="homescreen_plat" name="Home Screen Apps Platform Interfaces" level="apps">
+     <component id="menu_settings_api" name="Menu Settings API" class="api" filter="s60">
+      <unit bldFile="/app/homescreen/homescreen_plat/menu_settings_api/group"/>
+     </component>
+     <component id="hs_content_control_ui" name="HS Content Control Ui" class="api" filter="s60">
+      <unit bldFile="/app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
+     </component>
+     <component id="hs_renderingplugin_api" name="HS Rendering Plugin API" class="api" filter="s60">
+      <unit bldFile="/app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
+     </component>
+    </collection>
+    <collection id="idlehomescreen" name="Idle Home Screen" level="apps">
+     <component id="nativeuicontroller" filter="s60" name="Native UI Controller">
+      <unit bldFile="/app/homescreen/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="/app/homescreen/idlehomescreen/exths/group"/>
+     </component>
+     <component id="hscontentcontrol" filter="s60" name="Home Screen Content Control" introduced="^3">
+      <unit bldFile="/app/homescreen/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="/app/homescreen/idlehomescreen/sapiwrapper/cpswrapper/group"/>
+      <unit bldFile="/app/homescreen/idlehomescreen/sapiwrapper/hspswrapper/group"/>
+     </component>
+     <component id="xmluirendering" filter="s60" name="XML UI Rendering" introduced="^3">
+      <unit bldFile="/app/homescreen/idlehomescreen/xmluirendering/group"/>
+     </component>
+     <component id="xmluicontroller" filter="s60" name="XML UI Controller" introduced="^3">
+      <unit bldFile="/app/homescreen/idlehomescreen/xmluicontroller/group"/>
+     </component>
+     <component id="widgetmanager" filter="s60" name="Widget Manager" introduced="^3">
+      <unit bldFile="/app/homescreen/idlehomescreen/widgetmanager/group"/>
+     </component>
+     <component id="idlehomescreen_help" filter="s60" name="Idle Home Screen Help">
+      <unit bldFile="/app/homescreen/idlehomescreen/help/group"/>
+     </component>
+     <component id="idlehomescreen_data" filter="s60" name="Idle Home Screen Data">
+      <meta rel="config">
+       <defined condition="FF_HOMESCREEN_COMMON_IDLEFW"/>
+       <!-- currently always on, so safe to define here for now -->
+      </meta>
+      <unit bldFile="/app/homescreen/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? -->
+      <unit bldFile="/app/homescreen/idlehomescreen/group"/>
+     </component>
+     <component id="homescreen_test" filter="s60,test,unit_test" purpose="development" name="Home Screen Apps Test">
+      <unit bldFile="/app/homescreen/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="/app/homescreen/menufw/hierarchynavigator/group"/>
+     </component>
+     <component id="menufwui" filter="s60" name="Menu Framework UI">
+      <unit bldFile="/app/homescreen/menufw/menufwui/group"/>
+     </component>
+     <component id="menusuites" filter="s60" name="Menu Suites">
+      <unit bldFile="/app/homescreen/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="/app/homescreen/menufw/group"/>
+     </component>
+    </collection>
+    <collection id="taskswitcher" name="Task Switcher" level="support">
+     <component id="contextengine" filter="s60" name="Context Engine" introduced="^3">
+      <unit bldFile="/app/homescreen/taskswitcher/contextengine/group"/>
+     </component>
+     <component id="taskswitcherui" filter="s60" name="Task Switcher UI" introduced="^3">
+      <unit bldFile="/app/homescreen/taskswitcher/taskswitcherui/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="graphicsuis" level="services" tech-domain="ui" name="Graphics UIs" levels="util ui">
+    <collection id="graphicsuis_plat" name="Graphics UIs Platform Interfaces" level="ui">
+     <component id="svgt_viewer_ui_api" name="SVG-T Viewer UI API" class="api" filter="s60">
+      <unit bldFile="/app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+     </component>
+     <component id="svg_application_observer_utility_api" name="SVG Application Observer Utility API" class="api" filter="s60">
+      <unit bldFile="/app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
+     </component>
+     <component id="svgt_file_view_details_dialog_api" name="SVG-T File View Details Dialog API" class="api" filter="s60">
+      <unit bldFile="/app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
+     </component>
+    </collection>
+    <collection id="svgtviewer" name="SVG-T Viewer" level="ui">
+     <component id="svgtviewerplugin" filter="s60" name="SVG-T Viewer Plugin">
+      <unit bldFile="/app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="profile" level="apps" tech-domain="ui" name="Profiles" levels="app">
+    <collection id="profile_plat" name="Profiles Platform Interfaces" level="app">
+     <component id="profiles_settings_view_api" name="Profiles Settings View API" class="api" filter="s60">
+      <unit bldFile="/app/profile/profile_plat/profiles_settings_view_api/group"/>
+     </component>
+    </collection>
+    <collection id="profilesapplication" name="Profiles Application" level="app">
+     <component id="profiles" filter="s60" name="Profiles">
+      <unit bldFile="/app/profile/profilesapplication/profiles/group"/>
+     </component>
+     <component id="profilesapplication_test" filter="s60,test,api_test" purpose="development" name="Profiles Application Test">
+      <unit bldFile="/app/profile/profilesapplication/tsrc/public/basic/group"/>
+     </component>
+    </collection>
+    <collection id="profile_info" name="Profiles Info" level="app">
+     <component id="profile_help" filter="s60" name="Profiles Help">
+      <unit bldFile="/app/profile/help/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="speechsrv" level="services" tech-domain="ui" name="Speech Recognition UIs" levels="engine framework ui">
+    <collection id="speechsrv_plat" name="Speech Recognition UIs Platform Interfaces" level="ui">
+     <component id="vas_api" name="VAS API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/vas_api/group"/>
+     </component>
+     <component id="nss_devasr_api" name="NSS DevASR API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
+     </component>
+     <component id="tts_hw_device_api" name="TTS HW Device API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
+     </component>
+     <component id="voice_commands_resource_header_api" name="Voice Commands Resource Header API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
+     </component>
+     <component id="nss_mmf_tts_custom_commands_api" name="NSS MMF TTS Custom Commands API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
+     </component>
+     <component id="srsf_cenrep_settings_api" name="SRSF CenRep Settings API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
+     </component>
+     <component id="voice_ui_plugin_api" name="Voice UI Plug-in API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
+     </component>
+     <component id="nss_tts_utility_api" name="NSS TTS Utility API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
+     </component>
+     <component id="nss_srs_custom_commands_api" name="NSS SRS Custom Commands API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
+     </component>
+     <component id="srsf_secondarydisplay_api" name="SRSF Secondary Display API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
+     </component>
+     <component id="asrs_hw_device_api" name="ASRS Hardware Device API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
+     </component>
+     <component id="vas_vcommand_api" name="VAS Voice Command API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
+     </component>
+     <component id="adaptation_hw_device_api" name="Adaptation Hardware Device API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+     </component>
+     <component id="nss_devtts_api" name="NSS DevTTS API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
+     </component>
+     <component id="nss_srs_utility_api" name="NSS SRS Utility API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
+     </component>
+     <component id="recognition_hw_device_api" name="Recognition Hardware Device API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
+     </component>
+     <component id="vas_contact_handler_api" name="VAS Contact Handler API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
+     </component>
+     <component id="nlp_hw_device" name="NLP Hardware Device" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
+     </component>
+     <component id="nss_si_speech_recognition_data_api" name="NSS SI Speech Recognition Data API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
+     </component>
+     <component id="nss_tts_common_api" name="NSS TTS Common API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
+     </component>
+     <component id="grcompiler_hw_device_api" name="Grammar Compiler Hardware Device API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
+     </component>
+     <component id="ttp_hw_device_api" name="TTP Hardware Device API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
+     </component>
+     <component id="vocman_hw_device_api" name="VocMan Hardware Device API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
+     </component>
+     <component id="speech_synthesis_clientserver_api" name="Speech Synthesis Client-Server API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
+     </component>
+     <component id="voice_ui_accessory_button_handling_api" name="Voice UI Accessory Button Handling API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
+     </component>
+     <component id="ui_voice_recognition_api" name="UI Voice Recognition API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
+     </component>
+     <component id="vcommand_settings_cenrep_api" name="Voice Command Settings CenRep API" class="api" filter="s60">
+      <unit bldFile="/app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
+     </component>
+    </collection>
+    <collection id="voiceui" name="Voice UI" level="ui">
+     <component id="vcommand" filter="s60" name="Voice Commands UI" introduced="^1">
+      <unit bldFile="/app/speechsrv/voiceui/vcommand/group"/>
+     </component>
+     <component id="voiceuivoicerecognition" filter="s60" name="Voice UI Recognition" introduced="^1">
+      <unit bldFile="/app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
+     </component>
+     <component id="pbkinfoviewimpl" filter="s60" name="Phonebook Info View Implementation" introduced="^1">
+      <unit bldFile="/app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
+     </component>
+     <component id="aiwpbkinfoviewprovider" filter="s60" name="AIW Phonebook Info View Provider" class="plugin" introduced="^1">
+      <unit bldFile="/app/speechsrv/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>
+      <!-- component is commented out until configuration is in place. Currently #included from voiceui_build -->
+      <!--<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="/app/speechsrv/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="/app/speechsrv/srsf/sispeechrecognitiondata/group"/>
+     </component>
+     <component id="ttscommon" filter="s60" name="TTS Common">
+      <unit bldFile="/app/speechsrv/srsf/ttscommon/group"/>
+     </component>
+     <component id="devtts" filter="s60" name="Text to Speech">
+      <unit bldFile="/app/speechsrv/srsf/devtts/group"/>
+     </component>
+     <component id="ttscustomcommands" filter="s60" name="TTS Custom Commands">
+      <unit bldFile="/app/speechsrv/srsf/ttscustomcommands/group"/>
+     </component>
+     <component id="ttscontrollerplugin" filter="s60" name="TTS Controller Plugin" class="plugin">
+      <unit bldFile="/app/speechsrv/srsf/ttscontrollerplugin/group"/>
+     </component>
+     <component id="ttsutility" filter="s60" name="TTS Utility">
+      <unit bldFile="/app/speechsrv/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="/app/speechsrv/srsf/speechsynthesis/client/group"/>
+      <unit bldFile="/app/speechsrv/srsf/speechsynthesis/server/group"/>
+     </component>
+     <component id="devasr" filter="s60" name="Audio Recording and Speech Recognition">
+      <unit bldFile="/app/speechsrv/srsf/devasr/group"/>
+     </component>
+     <component id="sicc" filter="s60" name="Speaker Independent Custom Commands">
+      <unit bldFile="/app/speechsrv/srsf/sicc/group"/>
+     </component>
+     <component id="sisrscontrollerplugin" filter="s60" name="SI SRS Controller Plugin" class="plugin">
+      <unit bldFile="/app/speechsrv/srsf/sisrscontrollerplugin/group"/>
+     </component>
+     <component id="siutility" filter="s60" name="Speaker Independent Utility">
+      <unit bldFile="/app/speechsrv/srsf/siutility/group"/>
+     </component>
+     <component id="nssvasapi" filter="s60" name="NSS VAS API">
+      <unit bldFile="/app/speechsrv/srsf/nssvasapi/group"/>
+     </component>
+     <component id="nssvascontacthdlr" filter="s60" name="NSS VAS Contact Handler">
+      <unit bldFile="/app/speechsrv/srsf/nssvascontacthdlr/group"/>
+     </component>
+     <component id="vcommandhandler" filter="s60" name="Voice Command Handler">
+      <unit bldFile="/app/speechsrv/srsf/vcommandhandler/group"/>
+     </component>
+     <component id="vuiphandler" filter="s60" name="Voice UI Plugin Handler">
+      <unit bldFile="/app/speechsrv/srsf/vuiphandler/group"/>
+     </component>
+     <component id="vcommandexecutor" filter="s60" name="Voice Command Executor">
+      <unit bldFile="/app/speechsrv/srsf/vcommandexecutor/group"/>
+     </component>
+     <component id="vcommandexecutorbearer" filter="s60" name="Voice Command Executor Bearer">
+      <unit bldFile="/app/speechsrv/srsf/vcommandexecutorbearer/group"/>
+     </component>
+     <component id="vcommandmanager" filter="s60" name="Voice Command Manager">
+      <unit bldFile="/app/speechsrv/srsf/vcommandmanager/group"/>
+     </component>
+     <component id="vcexecutorapp" filter="s60" name="Voice Command Executor Application">
+      <unit bldFile="/app/speechsrv/srsf/vcexecutorapp/group"/>
+     </component>
+     <component id="profileobserverplugin" filter="s60" name="Profile Observer Plugin" class="plugin">
+      <unit bldFile="/app/speechsrv/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="/app/speechsrv/srsf/group"/>
+     </component>
+    </collection>
+    <collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
+     <component id="speechsrv_test" filter="s60,test,unit_test" purpose="development" name="Speech Recognition UIs Test">
+      <unit bldFile="/app/speechsrv/tsrc/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="homescreentools" level="services" tech-domain="ui" 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="/app/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="/app/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="/app/homescreentools/widgettools/hspluginspreinstaller/group"/>
+     </component>
+     <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
+      <unit bldFile="/app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="webuis" level="services" tech-domain="rt" name="Web UIs" levels="plugin app">
+    <collection id="browserui" name="Browser UI" level="app">
+     <component id="browser" filter="s60" name="Browser">
+      <unit bldFile="/app/webuis/browserui/browser/group"/>
+     </component>
+     <component id="operatormenu" filter="s60" name="Browser Operator Menu">
+      <unit bldFile="/app/webuis/browserui/operatormenu/group"/>
+     </component>
+     <component id="videoservices" filter="s60" name="Browser Video Services">
+      <unit bldFile="/app/webuis/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>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+      <!-- <unit bldFile="browserplugins/browsersysteminfoplugin/group"/>-->
+     </component>
+     <component id="browsergpsplugin" filter="s60" name="Browser GPS Plugin" class="plugin">
+      <meta rel="config">
+       <defined condition="__WEB_WIDGETS"/>
+      </meta>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from browserplugins_build -->
+      <!-- <unit bldFile="browserplugins/browsergpsplugin/group"/>-->
+     </component>
+     <component id="browseraudiovideoplugin" filter="s60" name="Browser Audio Video Plugin" class="plugin">
+      <unit bldFile="/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
+     </component>
+     <component id="browserplugins_build" filter="s60" name="Browser Plugins Build">
+      <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+      <unit bldFile="/app/webuis/browserplugins/group"/>
+     </component>
+    </collection>
+    <collection id="pushmtm" name="Push MTM" level="plugin">
+     <component id="pushmtm_help" filter="s60" name="Push MTM Help">
+      <unit bldFile="/app/webuis/pushmtm/help/group"/>
+     </component>
+     <component id="plugins" filter="s60" name="Push MTM Plugins" class="plugin">
+      <unit bldFile="/app/webuis/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="/app/webuis/pushmtm/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="jrt" level="services" tech-domain="rt" name="Java Runtime" levels="util generic rt ui">
+    <collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
+     <component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+      <unit bldFile="/app/jrt/jrt_plat/java_registry_api/build"/>
+     </component>
+     <component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+      <unit bldFile="/app/jrt/jrt_plat/java_env_info_api/build"/>
+     </component>
+     <component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+      <unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
+     </component>
+    </collection>
+    <collection id="java_stubs" name="Java Stubs" level="util">
+     <meta rel="config">
+      <defined condition="__JAVA_STUBS"/>
+     </meta>
+     <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
+     <component id="javadrmutils" name="Java DRM Utils" filter="s60,sf_build">
+      <!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
+     </component>
+     <component id="javaenvinfo" name="Java Environment Info" filter="s60,sf_build">
+      <!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
+     </component>
+     <component id="javaregistry" filter="s60,sf_build" name="Java Registry">
+      <!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
+     </component>
+     <component id="java_stubs_build" filter="s60,sf_build" name="Java Stubs ROM">
+      <!-- Remove the #includes and rename JRT ROM-->
+      <!--<unit bldFile="java_stubs/group"/>-->
+     </component>
+    </collection>
+    <collection id="jrt_info" name="JRT Info" level="rt">
+     <component id="jrt_build" filter="s60" name="JRT Build">
+      <!--  needed for __JAVA_STUBS condition -->
+      <unit bldFile="/app/jrt/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="conntools" level="services" tech-domain="dc" 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="/app/conntools/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="/app/conntools/emulatorlan/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="rndtools" level="services" tech-domain="to" name="R&amp;D tools" levels="support generic test util">
+    <collection id="creator" name="Creator" level="support">
+     <!-- collection is really a component. Should move down a directory -->
+     <component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
+      <unit bldFile="/app/rndtools/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">
+      <meta rel="config">
+       <not-defined condition="FILEBROWSER_LITE"/>
+      </meta>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+      <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
+     </component>
+     <component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
+      <meta rel="config">
+       <not-defined condition="FILEBROWSER_LITE"/>
+      </meta>
+      <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+      <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
+     </component>
+     <component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
+      <!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
+      <unit bldFile="/app/rndtools/filebrowser/group"/>
+     </component>
+    </collection>
+    <collection id="launcher" name="Launcher" level="util">
+     <!-- collection is really a component. Should move down a directory -->
+     <component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
+      <unit bldFile="/app/rndtools/launcher/group"/>
+     </component>
+    </collection>
+    <collection id="loadgen" name="Load Generator" level="test">
+     <!-- collection is really a component. Should move down a directory -->
+     <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
+      <unit bldFile="/app/rndtools/loadgen/group"/>
+     </component>
+    </collection>
+    <collection id="perfmon" name="Performance Monitor" level="test">
+     <!-- collection is really a component. Should move down a directory -->
+     <component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
+      <unit bldFile="/app/rndtools/perfmon/group"/>
+     </component>
+    </collection>
+    <collection id="screengrabber" name="Screen Grabber" level="util">
+     <!-- collection is really a component. Should move down a directory -->
+     <component id="screengrabber_build" filter="s60" name="ScreenGrabber" purpose="development" target="device" class="tool">
+      <unit bldFile="/app/rndtools/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="/app/rndtools/stifui/stifui/group"/>
+     </component>
+     <component id="uitestserverstarter" filter="s60" name="UI Test Server Starter" purpose="development" target="device">
+      <unit bldFile="/app/rndtools/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 or made a ROM component? -->
+      <unit bldFile="/app/rndtools/stifui/group"/>
+     </component>
+    </collection>
+    <collection id="memspyui" name="Memspy UI" level="generic">
+     <!-- collection is really a component. Should move down a directory -->
+     <component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
+      <unit bldFile="/app/rndtools/memspyui/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="/app/rndtools/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="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+      <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+      <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+      <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+      <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+      <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+      <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+      <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+     </component>
+     <component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
+      <unit bldFile="/app/rndtools/htiui/htidevicereboot/group"/>
+     </component>
+     <component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
+      <unit bldFile="/app/rndtools/htiui/htistartupwait/group"/>
+     </component>
+     <component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
+      <unit bldFile="/app/rndtools/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 or made a ROM component? -->
+      <unit bldFile="/app/rndtools/htiui/group"/>
+     </component>
+    </collection>
+   </package>
+   <package id="helps" level="apps" span="2" tech-domain="ui" 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="/app/helps/csxhelp/group"/>
+     </component>
+    </collection>
+    <collection id="symhelp" name="Symbian Help" level="eng">
+     <component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
+      <unit bldFile="/app/helps/symhelp/helpmodel/group" mrp="/app/helps/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="/app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+   <package id="techview" level="apps" span="2" tech-domain="ui" 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="/app/techview/buildverification/autosmoketest/Group" mrp="/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
+     </component>
+     <component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
+      <unit bldFile="/app/techview/buildverification/smoketest/Group" mrp="/app/techview/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="/app/techview/techviewplat/techviewuiklaf/GROUP" mrp="/app/techview/techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
+     </component>
+     <component id="eikstdtv" name="EIKSTD" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/techviewplat/eikstd/group" mrp="/app/techview/techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
+     </component>
+     <component id="feps" name="FEPS" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/techviewplat/feps/group" mrp="/app/techview/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="/app/techview/techviewui/techviewextras/group" mrp="/app/techview/techviewui/techviewextras/group/techview_extras.mrp"/>
+     </component>
+     <component id="statuspane" name="Status Pane" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/techviewui/statuspane/group" mrp="/app/techview/techviewui/statuspane/group/techview_statuspane.mrp"/>
+     </component>
+     <component id="shell" name="Shell" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/techviewui/shell/group" mrp="/app/techview/techviewui/shell/group/techview_shell.mrp"/>
+     </component>
+     <component id="startuptv" name="Techview Startup" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/techviewui/startup/group" mrp="/app/techview/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="/app/techview/controlpanel/fepsetup/group" mrp="/app/techview/controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
+     </component>
+     <component id="cctlcolscheme" name="Colour Scheme Control" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/controlpanel/cctlcolscheme/group" mrp="/app/techview/controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
+     </component>
+     <component id="soundsetup" name="Sound Setup" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/controlpanel/soundsetup/group" mrp="/app/techview/controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
+     </component>
+     <component id="keyclickref" name="Key Click Ref" filter="techview" purpose="development" class="plugin">
+      <unit bldFile="/app/techview/controlpanel/keyclickref/Group" mrp="/app/techview/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="/app/techview/pimapps/contacui/group" mrp="/app/techview/pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
+     </component>
+     <component id="agenda" name="Agenda UI" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/pimapps/agenda/group" mrp="/app/techview/pimapps/agenda/group/techview_agenda.mrp"/>
+     </component>
+     <component id="contactstechview" name="Contacts" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/pimapps/contactstechview/group" mrp="/app/techview/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="/app/techview/securityapps/secui/group" mrp="/app/techview/securityapps/secui/group/techview_secui.mrp"/>
+     </component>
+     <component id="securityupstechview" name="Security UPS Techview" filter="techview" purpose="development" introduced="^3">
+      <unit bldFile="/app/techview/securityapps/securityupstechview/group" mrp="/app/techview/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="/app/techview/utilityapps/helptechview/group" mrp="/app/techview/utilityapps/helptechview/group/techview_help.mrp"/>
+     </component>
+     <component id="timew" name="World Time" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/utilityapps/timew/group" mrp="/app/techview/utilityapps/timew/group/techview_timew.mrp"/>
+     </component>
+     <component id="cpumonitor" name="CPU Monitor" filter="techview" purpose="development" introduced="^3">
+      <unit bldFile="/app/techview/utilityapps/cpumonitor/group" mrp="/app/techview/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="/app/techview/installationapps/installapp/group" mrp="/app/techview/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="/app/techview/messagingapps/messagingui/Group" mrp="/app/techview/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="/app/techview/telephonyapps/techviewphoneui/group" mrp="/app/techview/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="/app/techview/networkingapps/iapstatusapp/group" mrp="/app/techview/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="/app/techview/networkingapps/networkingagentnotifier/group" mrp="/app/techview/networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
+     </component>
+     <component id="techviewvpnui" name="VPN UI" filter="techview" introduced="7.0" purpose="development">
+      <unit bldFile="/app/techview/networkingapps/techviewvpnui/group" mrp="/app/techview/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="/app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp" bldFile="/app/techview/networkingutils/ipadministrationtool/group"/>
+     </component>
+     <component id="nameresolverutility" name="Name Resolver Utility" introduced="7.0s" purpose="development" filter="test">
+      <unit mrp="/app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp" bldFile="/app/techview/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="/app/techview/shortlinkapps/techviewusbui/group" mrp="/app/techview/shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
+     </component>
+     <component id="bluetoothui" name="Bluetooth UI" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/shortlinkapps/bluetoothui/group" mrp="/app/techview/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="/app/techview/shortlinkapps/reftsp/group" mrp="/app/techview/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="/app/techview/testapps/simpleapp/group" mrp="/app/techview/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="/app/techview/testapps/rschandler/TVResourceHandler/group" mrp="/app/techview/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="/app/techview/testapps/graphicstestutils/group" mrp="/app/techview/testapps/graphicstestutils/group/graphics_testutils.mrp"/>
+     </component>
+     <component id="rschandler" name="Resource Handler" deprecated="^3" purpose="development" filter="test">
+      <unit mrp="/app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp" bldFile="/app/techview/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="/app/techview/avapps/techviewaudio/Group" mrp="/app/techview/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="/app/techview/toolkit/romkit/group" mrp="/app/techview/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="/app/techview/toolkit/configfiles/techview_epoc_ini.mrp"/>
+     </component>
+     <component id="cdborphans" name="CDB Orphan File Handler" filter="techview" purpose="development">
+      <unit bldFile="/app/techview/toolkit/cdborphans/group" mrp="/app/techview/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="/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
+     </component>
+    </collection>
+   </package>
+  </layer>
+ </systemModel>
+</SystemDefinition>