# HG changeset patch
# User ThomasE
# Date 1248452456 -3600
# Node ID 2be41f6d21e73daa4043729c9978fd371f595ce3
# Parent  40c430068ab444036f30a8fdaad6f1746bdbd2d5
Updated sources_fcl.txt according to clean project.
Updated models to merge API components (reduced model)

diff -r 40c430068ab4 -r 2be41f6d21e7 foundation/sources_fcl.csv
--- a/foundation/sources_fcl.csv	Wed Jul 22 16:40:55 2009 +0100
+++ b/foundation/sources_fcl.csv	Fri Jul 24 17:20:56 2009 +0100
@@ -1,116 +1,116 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,changeset,0b7ce35db0c8,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,changeset,f44a011bd38c,layers.sysdef.xml
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,changeset,eebeffa5c3ff,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,e086c7f635d5,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,changeset,6c80afd78613,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,192e20a38cc5,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conntools/,/sf/app/conntools,changeset,7f534f38abee,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/contacts/,/sf/app/contacts,changeset,03127c666729,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,00b8127ba519,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/conversations/,/sf/app/conversations,changeset,7a960a59aa00,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,c3fc3fe3ef9a,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,changeset,6e19ede44c47,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/files/,/sf/app/files,changeset,4f197e8fb8b9,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/gallery/,/sf/app/gallery,changeset,9cd2b28b1bb2,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,changeset,511a37964b1f,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/helps/,/sf/app/helps,changeset,94651d7c38e8,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/homescreen/,/sf/app/homescreen,changeset,e1096ec65dc7,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/im/,/sf/app/im,changeset,7e5ee5a012da,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,changeset,86a88f39b644,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,changeset,e9efb3f40c6d,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,changeset,c8627c142709,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/java/,/sf/app/java,changeset,5169493e151e,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/location/,/sf/app/location,changeset,56432fb97313,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/messaging/,/sf/app/messaging,changeset,6063eca9f633,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,3d8c816a9281,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,47b4c49e34a3,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/organizer/,/sf/app/organizer,changeset,30d36d5fb1f4,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/phone/,/sf/app/phone,changeset,28cb898e6d95,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/photos/,/sf/app/photos,changeset,c57816c9899b,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/poc/,/sf/app/poc,changeset,2af56024e7b6,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/printing/,/sf/app/printing,changeset,c20a57eb2a8e,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/profile/,/sf/app/profile,changeset,fa42fe7e0937,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/radio/,/sf/app/radio,changeset,50484d846447,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/screensaver/,/sf/app/screensaver,changeset,37f2ee1728e1,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,73756f6eb1d2,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/speechsrv/,/sf/app/speechsrv,changeset,108cf1a8ecda,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/techview/,/sf/app/techview,changeset,be1fac91dbbf,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/utils/,/sf/app/utils,changeset,feeeb3a4f70a,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videocenter/,/sf/app/videocenter,changeset,48471381a46a,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videoeditor/,/sf/app/videoeditor,changeset,993c05fc3895,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,6238773d3988,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,702d0bf21b81,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/voicerec/,/sf/app/voicerec,changeset,32519063563c,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/webuis/,/sf/app/webuis,changeset,3d957c30fcd9,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,0dfaf4f0a512,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,6d0e8cd14c38,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,b122e645082b,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,c914c0f65d81,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/classicui/,/sf/mw/classicui,changeset,8d8626a5e3b9,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,a84fe18afd1d,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/drm/,/sf/mw/drm,changeset,926af791a7ad,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,abb83b484082,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,f0d22ae8066a,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,c36c3942b172,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,52f56e79559c,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,d42b1567470a,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,7478671f7b91,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,5cd9ce268158,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,ffbd1e5a2b04,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,f50a737b0a81,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,8e38718efd01,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mds/,/sf/mw/mds,changeset,8acfbe90bf5f,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,3c35449a7361,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,1de5f44e0e2e,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,88da77d8762e,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,1706db3e45ac,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,changeset,0f2e667ee3cf,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,afd1f873cfa5,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,changeset,394a770aa4cc,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,changeset,8b3860646a34,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,c8a68b0d0b71,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,0a0b2e164e24,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,9fd10e53e7f9,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,changeset,9a3ac71c5144,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,28f9790617f3,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,b8fe8fbd2782,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,08dbe5e1ffb8,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,18640d455ad3,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/svgt/,/sf/mw/svgt,changeset,39f3f110122e,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,00e28a3100ac,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,a4da961835a7,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,changeset,e34d38d69879,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,1b3295580697,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,3306d0d0dea9,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/web/,/sf/mw/web,changeset,e965153d51e7,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,changeset,ce4c48640ce3,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,7e787845ce66,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,108770c3ca5f,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,b2a9d1b0856e,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,4a2500933567,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,a53a4813bb1b,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,6716c23f27e6,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,2d5edc3a4614,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/graphics/,/sf/os/graphics,changeset,b989a967866b,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,changeset,c358a99b4647,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,90a2e74ef6a1,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,changeset,b443ae3b2a93,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/mm/,/sf/os/mm,changeset,ef392f79dca7,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,353a5d393fb0,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,b6a481cec1c7,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,2649dfd3ca0f,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,changeset,1c92dfe68cf2,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,changeset,64e71406057d,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,changeset,d7d7c9fcb638,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,changeset,93041dbd666d,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,changeset,f37176cbc509,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,d28b515e08a9,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,changeset,4a2e53eea592,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,changeset,0f3764b0af6b,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,5920dac4877c,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,changeset,ea2532171a25,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,changeset,b20c55b2a821,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/platformtools/,/sf/tools/platformtools,changeset,8ea486560175,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,changeset,7362d90a7a0b,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,changeset,473f8eb21406,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/gallery/,/sf/app/gallery,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/java/,/sf/app/java,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/poc/,/sf/app/poc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videocenter/,/sf/app/videocenter,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/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/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/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/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/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/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
diff -r 40c430068ab4 -r 2be41f6d21e7 foundation/sysdefs/system_model.xml
--- a/foundation/sysdefs/system_model.xml	Wed Jul 22 16:40:55 2009 +0100
+++ b/foundation/sysdefs/system_model.xml	Fri Jul 24 17:20:56 2009 +0100
@@ -1,129 +1,129 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation">
    <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
     <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-     <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" origin-model="Foundation">
+     <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
       <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
       <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
       <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
      </component>
-     <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" origin-model="Foundation">
+     <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" origin-model="foundation">
       <unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
      </component>
     </collection>
     <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-     <component name="drm_stubs compo" long-name="DRM Stubs Component" origin-model="Foundation">
+     <component name="drm_stubs_build" long-name="DRM Stubs Component" origin-model="foundation">
       <unit bldFile="adaptation/stubs/drm_stubs/group"/>
      </component>
     </collection>
     <collection name="ptit9core_stub" long-name="PTI T9 Core Stub" level="plugin">
-     <component name="ptit9core_stub compo" long-name="PTI T9 Core Stub Component" origin-model="Foundation"/>
+     <component name="ptit9core_stub_build" long-name="PTI T9 Core Stub Component" origin-model="foundation"/>
     </collection>
     <collection name="btaudioadaptation_stub" long-name="BT Audio Adaptation Stub" level="adaptation">
-     <component name="btaudioadaptation_stub.dll=binary" origin-model="Foundation">
+     <component name="btaudioadaptation_stub_build" origin-model="foundation">
       <unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
      </component>
     </collection>
     <collection name="posmsgpluginreferenceimpl" long-name="Pos Msg Plugin Reference Implementation" level="plugin">
-     <component name="eposomasuplposrefapp.dll=binary" origin-model="Foundation">
+     <component name="eposomasuplposrefapp" origin-model="foundation">
       <unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
      </component>
     </collection>
     <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-     <component name="AsnImplementation.dll=binary" long-name="ASN Imple­ment­ation" origin-model="Foundation">
+     <component name="asnimplementation" long-name="ASN Imple­ment­ation" origin-model="foundation">
       <unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
      </component>
     </collection>
     <collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-     <component name="power_save_display_mode_stub.dll=binary" origin-model="Foundation">
+     <component name="power_save_display_mode_stub_build" origin-model="foundation">
       <unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
      </component>
     </collection>
     <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-     <component name="adaptationhwdevice" long-name="Adaptation Hardware Device" origin-model="Foundation">
+     <component name="adaptationhwdevice" long-name="Adaptation Hardware Device" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/srsfenginestub/adaptationhwdevice/group"/> -->
      </component>
-     <component name="grcompilerhwdevice" long-name="GR Compiler Hardware Device" origin-model="Foundation">
+     <component name="grcompilerhwdevice" long-name="GR Compiler Hardware Device" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
      </component>
-     <component name="ttphwdevice" long-name="TTP Hardware Device" origin-model="Foundation">
+     <component name="ttphwdevice" long-name="TTP Hardware Device" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttphwdevice/group"/> -->
      </component>
-     <component name="recognitionhwdevice" long-name="Recognition Hardware Device" origin-model="Foundation">
+     <component name="recognitionhwdevice" long-name="Recognition Hardware Device" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
      </component>
-     <component name="vocmanhwdevice" long-name="Voc Man Hardware Device" origin-model="Foundation">
+     <component name="vocmanhwdevice" long-name="Voc Man Hardware Device" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
      </component>
-     <component name="ttshwdevice" long-name="TTS Hardware Device" origin-model="Foundation">
+     <component name="ttshwdevice" long-name="TTS Hardware Device" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttshwdevice/group"/> -->
      </component>
-     <component name="nlphwdevice" long-name="NLP Hardware Device" origin-model="Foundation">
+     <component name="nlphwdevice" long-name="NLP Hardware Device" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/srsfenginestub/nlphwdevice/group"/> -->
      </component>
-     <component unofficial="yes" name="srsfenginestub_build" long-name="SRSF Engine Stub Build" origin-model="Foundation">
+     <component unofficial="yes" name="srsfenginestub_build" long-name="SRSF Engine Stub Build" origin-model="foundation">
       <unit bldFile="adaptation/stubs/srsfenginestub/group"/>
      </component>
     </collection>
     <collection name="systemswstubs" long-name="System SW Stubs" level="adaptation">
-     <component name="accessorypolicyreference" long-name="Accessory Policy Reference" origin-model="Foundation">
+     <component name="accessorypolicyreference" long-name="Accessory Policy Reference" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group"/>
      </component>
-     <component name="asyreference" long-name="ASY Reference" origin-model="Foundation">
+     <component name="asyreference" long-name="ASY Reference" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/asyreference/group"/>
      </component>
-     <component name="examplecommonisc" long-name="Example Common ISC" origin-model="Foundation">
+     <component name="examplecommonisc" long-name="Example Common ISC" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group"/>
      </component>
-     <component name="exampledsy" long-name="Example DSY" origin-model="Foundation">
+     <component name="exampledsy" long-name="Example DSY" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group"/>
      </component>
-     <component name="featuremanagerstub" long-name="Feature Manager Stub" origin-model="Foundation">
+     <component name="featuremanagerstub" long-name="Feature Manager Stub" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group"/>
      </component>
-     <component name="TVOutConfig" long-name="TVOut Config" origin-model="Foundation">
+     <component name="tvoutconfig" long-name="TVOut Config" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/tvoutconfig/group"/>
      </component>
-     <component name="hwrmstubplugins" long-name="HWRM Stub Plugins" origin-model="Foundation">
+     <component name="hwrmstubplugins" long-name="HWRM Stub Plugins" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group"/>
      </component>
-     <component name="hwrmhapticsstubplugin" long-name="HWRM Haptics Stub Plugin" origin-model="Foundation">
+     <component name="hwrmhapticsstubplugin" long-name="HWRM Haptics Stub Plugin" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
      </component>
-     <component name="sensorchannelsreference" long-name="Sensor Channels Reference" origin-model="Foundation">
+     <component name="sensorchannelsreference" long-name="Sensor Channels Reference" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group"/>
      </component>
-     <component name="ssyreference" long-name="SSY Rreference" origin-model="Foundation">
+     <component name="ssyreference" long-name="SSY Rreference" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group"/>
      </component>
-     <component name="startupadaptationstub" long-name="Startup Adaptation Stub" origin-model="Foundation">
+     <component name="startupadaptationstub" long-name="Startup Adaptation Stub" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group"/>
      </component>
-     <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" origin-model="Foundation">
+     <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group"/>
      </component>
-     <component name="wiredbearerreference" long-name="Wired Bearer Teference" origin-model="Foundation">
+     <component name="wiredbearerreference" long-name="Wired Bearer Teference" origin-model="foundation">
       <unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group"/>
      </component>
-     <component unofficial="yes" name="systemswstubs_build" long-name="System SW Stubs Build" origin-model="Foundation">
+     <component unofficial="yes" name="systemswstubs_build" long-name="System SW Stubs Build" origin-model="foundation">
       <!-- <unit bldFile="adaptation/stubs/systemswstubs/group"/> -->
      </component>
     </collection>
     <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-     <component name="tactileclickplugin.dll=binary" origin-model="Foundation">
+     <component name="tactileclickplugin_build" origin-model="foundation">
       <unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
      </component>
     </collection>
     <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-     <component name="wlanhwinit.dll=binary" origin-model="Foundation">
+     <component name="wlanhwinit" origin-model="foundation">
       <unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
      </component>
     </collection>
     <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-     <component name="ocrsrv.dll=binary" origin-model="Foundation">
+     <component name="ocrsrv" origin-model="foundation">
       <unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
      </component>
     </collection>
@@ -180,92 +180,89 @@
    </block>
    <block name="ossrv" long-name="Generic OS Services" tech_domain="hb" level="services" levels="physical-abstraction app-libs encoding translation data-services utilities">
     <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-     <component name="libutils" long-name="Utility Library" origin-model="Foundation">
+     <component name="libutils" long-name="Utility Library" origin-model="foundation">
       <unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
       <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/group"/>
       <!-- <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/nft/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
      </component>
     </collection>
     <collection name="ofdbus" long-name="OF Dbus" level="utilities">
-     <component name="dbus" long-name="Dbus" origin-model="Foundation">
+     <component name="dbus" long-name="Dbus" origin-model="foundation">
       <unit bldFile="os/ossrv/ofdbus/dbus/group"/>
       <unit bldFile="os/ossrv/ofdbus/dbus/tsrc/group"/>
-      <unit bldFile="os/ossrv/ossrv_pub/dbus/group"/>
-     </component>
-     <component name="dbus-glib" long-name="Dbus glib" origin-model="Foundation">
+     </component>
+     <component name="dbus-glib" long-name="Dbus glib" origin-model="foundation">
       <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
       <unit bldFile="os/ossrv/ofdbus/dbus-glib/tsrc/group"/>
-      <unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
-     </component>
-     <component unofficial="yes" name="ofdbus_build" long-name="OF Dbus Build" origin-model="Foundation">
+     </component>
+     <component unofficial="yes" name="ofdbus_build" long-name="OF Dbus Build" origin-model="foundation">
       <unit bldFile="os/ossrv/ofdbus/group"/>
      </component>
-     <component unofficial="yes" name="ofdbus_test" long-name="OF Dbus Test" origin-model="Foundation">
+     <component unofficial="yes" name="ofdbus_test" long-name="OF Dbus Test" origin-model="foundation">
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_file_send/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages1/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/file_transfer_time/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages1/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
      </component>
     </collection>
     <collection name="glib" long-name="Glib" level="utilities">
-     <component name="glibbackend" long-name="Glib Backend" origin-model="Foundation">
+     <component name="glibbackend" long-name="Glib Backend" origin-model="foundation">
       <unit bldFile="os/ossrv/glib/glibbackend/group"/>
      </component>
-     <component name="libglib" long-name="Libglib" origin-model="Foundation">
+     <component name="libglib" long-name="Libglib" origin-model="foundation">
       <unit bldFile="os/ossrv/glib/libglib/group"/>
      </component>
-     <component name="libgthread" long-name="Libg Thread" origin-model="Foundation">
+     <component name="libgthread" long-name="Libg Thread" origin-model="foundation">
       <unit bldFile="os/ossrv/glib/libgthread/group"/>
      </component>
-     <component name="libgmodule" long-name="Libg Module" origin-model="Foundation">
+     <component name="libgmodule" long-name="Libg Module" origin-model="foundation">
       <unit bldFile="os/ossrv/glib/libgmodule/group"/>
      </component>
-     <component name="libgobject" long-name="Libg Object" origin-model="Foundation">
+     <component name="libgobject" long-name="Libg Object" origin-model="foundation">
       <unit bldFile="os/ossrv/glib/libgobject/group"/>
      </component>
-     <component unofficial="yes" name="glib_test" long-name="Glib Test" origin-model="Foundation">
+     <component unofficial="yes" name="glib_test" long-name="Glib Test" origin-model="foundation">
       <!-- <unit bldFile="os/ossrv/glib/tsrc/bc/group"/> -->
       <unit bldFile="os/ossrv/glib/tsrc/group"/>
      </component>
     </collection>
     <collection name="ssl" long-name="SSL" level="data-services">
-     <component name="libcrypto" long-name="Libcrypto" origin-model="Foundation">
+     <component name="libcrypto" long-name="Libcrypto" origin-model="foundation">
       <unit bldFile="os/ossrv/ssl/libcrypto/group"/>
      </component>
-     <component name="libssl" long-name="Libssl" origin-model="Foundation">
+     <component name="libssl" long-name="Libssl" origin-model="foundation">
       <unit bldFile="os/ossrv/ssl/libssl/group"/>
      </component>
-     <component unofficial="yes" name="ssl_test" long-name="SSL Test" origin-model="Foundation">
+     <component unofficial="yes" name="ssl_test" long-name="SSL Test" origin-model="foundation">
       <unit bldFile="os/ossrv/ssl/tsrc/group"/>
       <!-- <unit bldFile="os/ossrv/ssl/tsrc/bc/group"/> -->
      </component>
     </collection>
     <collection name="stdcpp" long-name="Stdcpp" level="translation">
-     <component unofficial="yes" name="stdcpp_build" long-name="Stdcpp Build" origin-model="Foundation">
+     <component unofficial="yes" name="stdcpp_build" long-name="Stdcpp Build" origin-model="foundation">
       <unit bldFile="os/ossrv/stdcpp/group"/>
      </component>
-     <component unofficial="yes" name="stdcpp_test" long-name="Stdcpp Test" origin-model="Foundation">
+     <component unofficial="yes" name="stdcpp_test" long-name="Stdcpp Test" origin-model="foundation">
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/bc/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/graph/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
       <unit bldFile="os/ossrv/stdcpp/tsrc/group"/>
      </component>
     </collection>
     <collection name="stdlibs" long-name="Stdlibs" level="translation">
-     <component name="libz" long-name="Libz" origin-model="Foundation">
+     <component name="libz" long-name="Libz" origin-model="foundation">
       <unit bldFile="os/ossrv/stdlibs/libz/group"/>
      </component>
-     <component name="libcrypt" long-name="Libcrypt" origin-model="Foundation">
+     <component name="libcrypt" long-name="Libcrypt" origin-model="foundation">
       <unit bldFile="os/ossrv/stdlibs/libcrypt/group"/>
      </component>
     </collection>
@@ -319,283 +316,26 @@
      </component>
     </collection>
     <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-     <component unofficial="yes" name="ossrv_test" long-name="Generic OS Services Test" origin-model="Foundation">
+     <component unofficial="yes" name="ossrv_test" long-name="Generic OS Services Test" origin-model="foundation">
       <!-- <unit bldFile="os/ossrv/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="ossrv_build" long-name="Generic OS Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+     </component>
+     <component unofficial="yes" name="ossrv_build" long-name="Generic OS Services Build" origin-model="foundation">
       <unit bldFile="os/ossrv/group"/>
      </component>
+     <component unofficial="yes" name="ossrv_pub" long-name="Generic OS Services Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
+      <unit bldFile="os/ossrv/ossrv_pub/group"/>
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
+     </component>
     <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-     <component unofficial="yes" name="standard_compressiondecompression_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_memory_allocation" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-     </component>
-     <component unofficial="yes" name="glib_io_channels" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-     </component>
-     <component unofficial="yes" name="cryptogaphy_related_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_automatic_string_completion" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-     </component>
-     <component unofficial="yes" name="glib_strings" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-     </component>
-     <component unofficial="yes" name="glib_string_utility_functions" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_message_logging" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-     </component>
-     <component unofficial="yes" name="localization_function_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-     </component>
-     <component unofficial="yes" name="gparamspec" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-     </component>
-     <component unofficial="yes" name="wide_character_classapis" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_balanced_binary_trees" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-     </component>
-     <component unofficial="yes" name="glib_hook_functions" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_generic_values" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-     </component>
-     <component unofficial="yes" name="glib_varargs_value_collection" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-     </component>
-     <component unofficial="yes" name="glib_caches" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-     </component>
-     <component unofficial="yes" name="no_namespace_headers" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-     </component>
-     <component unofficial="yes" name="glib_error_reporting" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-     </component>
-     <component unofficial="yes" name="glib_keyvalue_file_parser" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-     </component>
-     <component unofficial="yes" name="glib_internationalization" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-     </component>
-     <component unofficial="yes" name="utility_apis" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_signals" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-     </component>
-     <component unofficial="yes" name="glib_miscellaneous_utility_functions" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_unicode_manipulation" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-     </component>
-     <component unofficial="yes" name="glib_memory_slices" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-     </component>
-     <component unofficial="yes" name="glib_nary_trees" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-     </component>
-     <component unofficial="yes" name="exceptions" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_date_and_time_functions" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-     </component>
-     <component unofficial="yes" name="debug" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_inputoutput_and_data_encoding_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_atomic_operations" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-     </component>
-     <component unofficial="yes" name="glib_asynchronous_queues" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-     </component>
-     <component unofficial="yes" name="glib_random_numbers" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-     </component>
-     <component unofficial="yes" name="gtype" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-     </component>
-     <component unofficial="yes" name="ossrv_pub_configuration" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-     </component>
-     <component unofficial="yes" name="ssl_protocol_methods_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-     </component>
-     <component unofficial="yes" name="ssl_general_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_quarks" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-     </component>
-     <component unofficial="yes" name="gboxed" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-     </component>
-     <component unofficial="yes" name="memory" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_certificates_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-     </component>
-     <component unofficial="yes" name="gobject" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-     </component>
-     <component unofficial="yes" name="glib_doublylinked_lists" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-     </component>
-     <component unofficial="yes" name="glib_datasets" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-     </component>
-     <component unofficial="yes" name="glib_character_set_conversion" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-     </component>
-     <component unofficial="yes" name="glib_singlylinked_lists" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-     </component>
-     <component unofficial="yes" name="glib_relations_and_tuples" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-     </component>
-     <component unofficial="yes" name="glib_timers" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-     </component>
-     <component unofficial="yes" name="gtypemodule" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-     </component>
-     <component unofficial="yes" name="glib_file_utilities" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-     </component>
-     <component unofficial="yes" name="glib_standard_macros" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_utility_functions_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="compiler_specific_runtime_support" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-     </component>
-     <component unofficial="yes" name="glib_simple_xml_subset_parser" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-     </component>
-     <component unofficial="yes" name="glib_enums_and_flags" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-     </component>
-     <component unofficial="yes" name="character_type_apis" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_parameters_and_values" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-     </component>
-     <component unofficial="yes" name="glib_lexical_scanner" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-     </component>
-     <component unofficial="yes" name="glib_spawning_processes" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-     </component>
-     <component unofficial="yes" name="glib_closures" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-     </component>
-     <component unofficial="yes" name="glib_arrays" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="crypto_symmetric_ciphers_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-     </component>
-     <component unofficial="yes" name="stl" origin-model="Foundation">
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-     </component>
-     <component unofficial="yes" name="math_operations_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-     </component>
-     <component unofficial="yes" name="io_stream_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-     </component>
-     <component unofficial="yes" name="gtypeplugin" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-     </component>
-     <component unofficial="yes" name="boost_apis" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="crypto_auxillary_functions_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="cpp_wrappers" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-     </component>
-     <component unofficial="yes" name="thread_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_doubleended_queues" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-     </component>
-     <component unofficial="yes" name="type_attributes" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-     </component>
-     <component unofficial="yes" name="glib_main_event_loop" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-     </component>
-     <component unofficial="yes" name="glib_threads" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-     </component>
-     <component unofficial="yes" name="typeinfo" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-     </component>
-     <component unofficial="yes" name="glib_globstyle_pattern_matching" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-     </component>
-     <component unofficial="yes" name="glib_dynamic_loading_of_modules" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-     </component>
-     <component unofficial="yes" name="openc_wrappers" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-     </component>
-     <component unofficial="yes" name="glib_hash_tables" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-     </component>
-     <component unofficial="yes" name="glib_thread_pools" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-     </component>
-     <component unofficial="yes" name="glib_shellrelated_utilities" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-     </component>
-     <component unofficial="yes" name="openc_headers" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_public_key_cryptography_and_key_agreement_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_commandline_option_parser" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_authentication_codes_and_hash_functions_api" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_basic_types" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-     </component>
-     <component unofficial="yes" name="glib_value_arrays" origin-model="Foundation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-     </component>
-    </collection>
    </block>
    <block name="security" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
     <collection name="contentmgmt" long-name="Content Management" level="utilities">
@@ -658,12 +398,15 @@
    </block>
    <block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="featuremgmt" long-name="Feature Management" level="framework">
-     <component name="featuremanager" long-name="Feature Manager" origin-model="Foundation">
+     <component name="featuremanager" long-name="Feature Manager" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/clientdll/group"/> -->
       <unit bldFile="os/devicesrv/featuremgmt/featuremanager/group"/>
       <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/serverexe/group"/> -->
       <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/tsrc/public/basic/group"/> -->
      </component>
+     <component unofficial="yes" name="featuremgmt_build" long-name="Feature Management Build" origin-model="foundation">
+      <unit bldFile="os/devicesrv/featuremgmt/group"/>
+     </component>
     <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
      </component>
@@ -712,7 +455,7 @@
    </block>
    <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="accessoryservices" long-name="Accessory Services" level="framework">
-     <component name="accessorymonitor" long-name="Accessory Monitor" origin-model="Foundation">
+     <component name="accessorymonitor" long-name="Accessory Monitor" origin-model="foundation">
       <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
@@ -723,7 +466,7 @@
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
      </component>
-     <component name="accessoryremotecontrol" long-name="Accessory Remote Control" origin-model="Foundation">
+     <component name="accessoryremotecontrol" long-name="Accessory Remote Control" origin-model="foundation">
       <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
@@ -735,7 +478,7 @@
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
      </component>
-     <component name="accessoryserver" long-name="Accessory Server" origin-model="Foundation">
+     <component name="accessoryserver" long-name="Accessory Server" origin-model="foundation">
       <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/group"/>
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
@@ -748,11 +491,11 @@
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
       <!-- <unit bldFile="os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
      </component>
-     <component name="headsetstatusapi" long-name="Headset Status Api" origin-model="Foundation">
+     <component name="headsetstatusapi" long-name="Headset Status Api" origin-model="foundation">
       <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/group"/>
       <!-- <unit bldFile="os/devicesrv/accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
      </component>
-     <component name="tspclientmapper" long-name="TSP Client Mapper" origin-model="Foundation">
+     <component name="tspclientmapper" long-name="TSP Client Mapper" origin-model="foundation">
       <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
       <!-- <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
      </component>
@@ -767,8 +510,8 @@
        <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/test"/>
        <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
      </component>-->
-     <component name="reftsp" origin-model="Foundation"/>
-     <component unofficial="yes" name="accessoryservices_build" long-name="Accessory Services Build" origin-model="Foundation">
+     <component name="reftsp" origin-model="foundation"/>
+     <component unofficial="yes" name="accessoryservices_build" long-name="Accessory Services Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/accessoryservices/group"/>
      </component>
     <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
@@ -776,95 +519,95 @@
      </component>
     </collection>
     <collection name="commonservices" long-name="Common Services" level="app-if">
-     <component name="commonengine" long-name="Common Engine" origin-model="Foundation">
+     <component name="commonengine" long-name="Common Engine" origin-model="foundation">
       <unit bldFile="os/devicesrv/commonservices/commonengine/group"/>
       <!-- <unit bldFile="os/devicesrv/commonservices/commonengine/tsrc/public/basic/group"/> -->
      </component>
-     <component name="commonengineresources" long-name="Common Engine Resources" origin-model="Foundation">
+     <component name="commonengineresources" long-name="Common Engine Resources" origin-model="foundation">
       <unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
      </component>
-     <component name="PlatformEnv" long-name="Platform Env" origin-model="Foundation">
+     <component name="platformenv" long-name="Platform Env" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
       <unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
       <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/platformver/group"/> -->
       <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/sysversioninfo/group"/> -->
       <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/tsrc/public/basic/group"/> -->
      </component>
-     <component name="sysutil" long-name="Sysutil" origin-model="Foundation">
+     <component name="sysutil" long-name="Sysutil" origin-model="foundation">
       <unit bldFile="os/devicesrv/commonservices/sysutil/group"/>
       <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/tsrc/public/basic/group"/> -->
       <!-- <unit bldFile="os/devicesrv/commonservices/sysutil/tsrc/public/basic/sysutiltests/group"/> -->
      </component>
-     <component name="activitymanager" long-name="Activity Manager" origin-model="Foundation">
+     <component name="activitymanager" long-name="Activity Manager" origin-model="foundation">
       <unit bldFile="os/devicesrv/commonservices/activitymanager/group"/>
       <unit bldFile="os/devicesrv/commonservices/activitymanager/tsrc/public/basic/group"/>
      </component>
-     <component unofficial="yes" name="commonservices_build" long-name="Common Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="commonservices_build" long-name="Common Services Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/commonservices/group"/>
      </component>
     </collection>
     <collection name="dosservices" long-name="Dos Services" level="hw-if">
-     <component name="commondsy" long-name="Common DSY" origin-model="Foundation">
+     <component name="commondsy" long-name="Common DSY" origin-model="foundation">
       <unit bldFile="os/devicesrv/dosservices/commondsy/group"/>
      </component>
-     <component name="dosserver" long-name="Dos Server" origin-model="Foundation">
+     <component name="dosserver" long-name="Dos Server" origin-model="foundation">
       <unit bldFile="os/devicesrv/dosservices/dosserver/group"/>
      </component>
-     <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test" origin-model="Foundation">
+     <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
      </component>
-     <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/dosservices/group"/>
      </component>
     </collection>
     <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <component name="ServerExe" long-name="Server Exe" origin-model="Foundation">
+     <component name="serverexe" long-name="Server Exe" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/serverexe/group"/> -->
      </component>
-     <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin" origin-model="Foundation">
+     <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
      </component>
-     <component name="ClientDll" long-name="Client DLL" origin-model="Foundation">
+     <component name="clientdll" long-name="Client DLL" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/clientdll/group"/> -->
      </component>
-     <component name="CommonDll" long-name="Common DLL" origin-model="Foundation">
+     <component name="commondll" long-name="Common DLL" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/commondll/group"/> -->
      </component>
-     <component name="VibraClientDll" long-name="Vibra Client DLL" origin-model="Foundation">
+     <component name="vibraclientdll" long-name="Vibra Client DLL" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
      </component>
-     <component name="ExtendedLightClientDll" long-name="Extended Light Client DLL" origin-model="Foundation">
+     <component name="extendedlightclientdll" long-name="Extended Light Client DLL" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
      </component>
-     <component name="LightClientDll" long-name="Light Client DLL" origin-model="Foundation">
+     <component name="lightclientdll" long-name="Light Client DLL" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
      </component>
-     <component name="FmTxClientDll" long-name="FM TX Client DLL" origin-model="Foundation">
+     <component name="fmtxclientdll" long-name="FM TX Client DLL" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
      </component>
-     <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin" origin-model="Foundation">
+     <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
      </component>
-     <component name="vibractrl" long-name="Vibra Control" origin-model="Foundation">
+     <component name="vibractrl" long-name="Vibra Control" origin-model="foundation">
       <unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
      </component>
-     <component name="hwresourcesmgr" origin-model="Foundation">
+     <component name="hwresourcesmgr" origin-model="foundation">
       <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/test/group"/>
       <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group"/>
      </component>
      <!--Component manually removed as empty and name conflicts with an OS component-->
      <!--<component name="powerandmemorynotificationservice"/>-->
-     <component unofficial="yes" name="resourcemgmt_build" long-name="Resource Management Build" origin-model="Foundation">
+     <component unofficial="yes" name="resourcemgmt_build" long-name="Resource Management Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/resourcemgmt/group"/>
      </component>
-     <component unofficial="yes" name="resourcemgmt_test" long-name="Resource Management Test" origin-model="Foundation">
+     <component unofficial="yes" name="resourcemgmt_test" long-name="Resource Management Test" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/tsrc/public/basic/group"/> -->
      </component>
     <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
@@ -872,48 +615,48 @@
      </component>
     </collection>
     <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-     <component name="hapticseffectdatagetterfw" long-name="Haptics Effect Data Getter Framework" origin-model="Foundation">
+     <component name="hapticseffectdatagetterfw" long-name="Haptics Effect Data Getter Framework" origin-model="foundation">
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
      </component>
-     <component name="hapticspluginservice" long-name="Haptics Plugin Service" origin-model="Foundation">
+     <component name="hapticspluginservice" long-name="Haptics Plugin Service" origin-model="foundation">
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
      </component>
-     <component name="hapticspacketizer" long-name="Haptics Packetizer" origin-model="Foundation">
+     <component name="hapticspacketizer" long-name="Haptics Packetizer" origin-model="foundation">
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
      </component>
-     <component name="hapticspluginmanager" long-name="Haptics Plugin Manager" origin-model="Foundation">
+     <component name="hapticspluginmanager" long-name="Haptics Plugin Manager" origin-model="foundation">
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
      </component>
-     <component name="hapticsserver" long-name="Haptics Server" origin-model="Foundation">
+     <component name="hapticsserver" long-name="Haptics Server" origin-model="foundation">
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticsserver/group"/>
      </component>
-     <component name="hapticsclient" long-name="Haptics Client" origin-model="Foundation">
+     <component name="hapticsclient" long-name="Haptics Client" origin-model="foundation">
       <unit bldFile="os/devicesrv/hwrmhaptics/hapticsclient/group"/>
      </component>
-     <component unofficial="yes" name="hwrmhaptics_build" long-name="HWRM Haptics Build" origin-model="Foundation">
+     <component unofficial="yes" name="hwrmhaptics_build" long-name="HWRM Haptics Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/hwrmhaptics/group"/>
      </component>
     </collection>
     <collection name="mediator" long-name="Mediator" level="app-if">
-     <component unofficial="yes" name="mediator_test" long-name="Mediator Test" origin-model="Foundation">
-      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
+     <component unofficial="yes" name="mediator_test" long-name="Mediator Test" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="mediator_build" long-name="Mediator Build" origin-model="Foundation">
+      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
+     </component>
+     <component unofficial="yes" name="mediator_build" long-name="Mediator Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/mediator/group"/>
      </component>
     </collection>
     <collection name="psmservices" long-name="PSM Services" level="app-if">
-     <component name="psmserver" long-name="PSM Server" origin-model="Foundation">
+     <component name="psmserver" long-name="PSM Server" origin-model="foundation">
       <unit bldFile="os/devicesrv/psmservices/psmserver/group"/>
       <!-- <unit bldFile="os/devicesrv/psmservices/psmserver/tsrc/public/basic/group"/> -->
      </component>
-     <component unofficial="yes" name="psmservices_build" long-name="PSM Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="psmservices_build" long-name="PSM Services Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/psmservices/group"/>
      </component>
     </collection>
     <collection name="sensorservices" long-name="Sensor Services" level="framework">
-     <component name="sensorserver" long-name="Sensor Server" origin-model="Foundation">
+     <component name="sensorserver" long-name="Sensor Server" origin-model="foundation">
       <unit bldFile="os/devicesrv/sensorservices/sensorserver/group"/>
       <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/group"/> -->
       <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
@@ -922,23 +665,23 @@
       <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
       <!-- <unit bldFile="os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
      </component>
-     <component name="orientationssy" long-name="Orientation SSY" origin-model="Foundation">
+     <component name="orientationssy" long-name="Orientation SSY" origin-model="foundation">
       <unit bldFile="os/devicesrv/sensorservices/orientationssy/group"/>
      </component>
-     <component name="tiltcompensationssy" long-name="Tilt Compensation SSY" origin-model="Foundation">
+     <component name="tiltcompensationssy" long-name="Tilt Compensation SSY" origin-model="foundation">
       <unit bldFile="os/devicesrv/sensorservices/tiltcompensationssy/group"/>
      </component>
-     <component name="sensordatacompensator" long-name="Sensor Data Compensator" origin-model="Foundation">
+     <component name="sensordatacompensator" long-name="Sensor Data Compensator" origin-model="foundation">
       <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/group"/>
       <!-- <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
       <!-- <unit bldFile="os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
      </component>
-     <component unofficial="yes" name="sensorservices_build" long-name="Sensor Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="sensorservices_build" long-name="Sensor Services Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/sensorservices/group"/>
      </component>
     </collection>
     <collection name="sysstatemgmt" long-name="System State Management" level="server">
-     <component name="starter" long-name="Starter" origin-model="Foundation">
+     <component name="starter" long-name="Starter" origin-model="foundation">
       <unit bldFile="os/devicesrv/sysstatemgmt/starter/group"/>
       <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/> -->
       <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/> -->
@@ -962,342 +705,66 @@
        <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
        <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
      </component>-->
-     <component unofficial="yes" name="sysstatemgmt_build" long-name="System State Management Build" origin-model="Foundation">
+     <component unofficial="yes" name="sysstatemgmt_build" long-name="System State Management Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/sysstatemgmt/group"/>
      </component>
-     <component unofficial="yes" name="sysstatemgmt_test" long-name="System State Management Test" origin-model="Foundation">
+     <component unofficial="yes" name="sysstatemgmt_test" long-name="System State Management Test" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
      </component>
     <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
      </component>
     </collection>
-    <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-     <component unofficial="yes" name="vibra_settings_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/vibra_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_channel_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-     </component>
-     <component unofficial="yes" name="platform_environment_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
-     </component>
-     <component unofficial="yes" name="phone_parser_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
-     </component>
-     <component unofficial="yes" name="sensor_data_compensator_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-     </component>
-     <component unofficial="yes" name="version_info_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
-     </component>
-     <component unofficial="yes" name="sysutil_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="string_loader_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/string_loader_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_platform_security_definitions_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="platform_path_definitions_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="cone_resource_loader_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/cone_resource_loader_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-     </component>
-     <component unofficial="yes" name="vibra_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_definitions_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="find_item_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
-     </component>
-     <component unofficial="yes" name="hwrm_power_state_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="light_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/light_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
-     </component>
-     <component unofficial="yes" name="text_resolver_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_discovery_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
-     </component>
-     <component unofficial="yes" name="accessory_monitoring_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
+    <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
+     <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+	<unit mrp="devicesrvapitest/accessorieshaitest/gropup/accessorieshai.mrp"/>
+	-->
+     </component>
+     <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- PLACEHOLDER="DS.1645"
+	<unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhai.mrp"/>
+	-->
      </component>
     </collection>
     <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-     <component unofficial="yes" name="featuremgmt" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/featuremgmt/group"/>
-     </component>
-     <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="devicesrv_pub" long-name="Device Services Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
+      <unit bldFile="os/devicesrv/devicesrv_pub/group"/>
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
+     </component>
+     <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build" origin-model="foundation">
       <unit bldFile="os/devicesrv/group"/>
      </component>
+     <component unofficial="yes" name="devicesrv_plat" long-name="Device Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
+      <unit bldFile="os/devicesrv/devicesrv_plat/group"/>
+     </component>
     <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="string_resource_reader_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/string_resource_reader_api/group"/>
-     </component>
-     <component unofficial="yes" name="sae_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-     </component>
-     <component unofficial="yes" name="tv_out_config_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_effect_data_getter_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="configuration_file_parser_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_version_info_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_api/group"/>
-     </component>
-     <component unofficial="yes" name="power_state_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/power_state_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_audio_control_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="lights_commands_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/lights_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_adaptation_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_notification_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_settings_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_static_registration_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_definitions_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_event_consumer_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_manager_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_reason_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_reason_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_extension_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="security_notification_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/security_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_data_compensator_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="isc_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/isc_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_key_event_handling_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-     </component>
-     <component unofficial="yes" name="tiltcompensation_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_packetizer_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="dos_extension_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_startup_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_startup_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_resource_blocking_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_resource_blocking_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_command_initiator_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-     </component>
-     <component unofficial="yes" name="disk_and_memory_level_keys_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_status_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="remote_control_extension_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_state_control_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_state_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="vibra_commands_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/vibra_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_event_provider_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_dsy_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_policy_utility_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_state_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_resource_manager_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_resource_manager_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_settings_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="tspclientmapper_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-     </component>
-     <component unofficial="yes" name="shared_data_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_control_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_policy_definitions_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_domain_definitions_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-     </component>
-     <component unofficial="yes" name="target_modifier_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/target_modifier_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_bluetooth_control_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="light_settings_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/light_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_settings_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="wakeup_alarm_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-     </component>
-     <component unofficial="yes" name="activity_manager_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_control_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="sim_utils_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sim_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="dos_extension_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_audio_policy_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_audio_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="headset_status_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="display_language_definition_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_info_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_info_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="fm_tx_commands_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/fm_tx_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_content_policy_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/common_content_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_command_responder_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_light_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_light_api/group"/>
-     </component>
-     <component unofficial="yes" name="disk_notification_handler_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="syslangutil_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_channel_filter_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_version_info_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_startup_control_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_startup_extension_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
-    <collection name="Data Source Modules" long-name="Generic Positioning Plugins" level="data-acquisition">
-     <component name="locationnpppsy" long-name="Location NPP PSY" origin-model="Foundation">
+    <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+     <component name="locationnpppsy" long-name="Location NPP PSY" origin-model="foundation">
       <unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
      </component>
-     <component name="locationsuplpsy" long-name="Location SUPL PSY" origin-model="Foundation">
+     <component name="locationsuplpsy" long-name="Location SUPL PSY" origin-model="foundation">
       <unit bldFile="mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
      </component>
-    </collection>
-    <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-     <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+    <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
      </component>
      <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
@@ -1361,7 +828,7 @@
      </component>
     </collection>
     <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-     <component unofficial="yes" name="lbs_build" long-name="Locating Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="lbs_build" long-name="Locating Services Build" origin-model="foundation">
       <unit bldFile="os/lbs/group"/>
      </component>
     <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
@@ -1383,7 +850,7 @@
       <unit mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
      </component>
     </collection>
-	<!-- Collection manually added from OS after auto-merge -->
+	<!-- Collection manually added due to faulty merge XSLT -->
 	<collection name="commsconfig" long-name="Comms Config" level="process">
 	 <component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
 	  <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
@@ -1459,10 +926,12 @@
      </component>
     </collection>
     <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-<!-- <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-     </component>
-      <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
+     <!-- Removing GT commdb
+<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
+<unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+</component>
+-->
+     <!-- <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
 <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
 </component> -->
      <component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
@@ -1472,10 +941,10 @@
    </block>
    <block name="networkingsrv" long-name="Networking Services" tech_domain="dc" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="commsdb" long-name="Comms DB" level="server">
-     <component name="s60_commsdb" long-name="S60 Commsdb" origin-model="Foundation">
+     <component name="s60_commsdb" long-name="S60 Commsdb" origin-model="foundation">
       <unit bldFile="os/networkingsrv/commsdb/s60_commsdb/group"/>
      </component>
-     <component unofficial="yes" name="commsdb_build" long-name="Comms DB Build" origin-model="Foundation">
+     <component unofficial="yes" name="commsdb_build" long-name="Comms DB Build" origin-model="foundation">
       <unit bldFile="os/networkingsrv/commsdb/group"/>
      </component>
     </collection>
@@ -1608,7 +1077,7 @@
      </component>
     </collection>
     <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
-     <component unofficial="yes" name="networkingsrv_build" long-name="Networking Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="networkingsrv_build" long-name="Networking Services Build" origin-model="foundation">
       <unit bldFile="os/networkingsrv/group"/>
      </component>
     <component name="networkingrom" long-name="Networking ROM" purpose="mandatory" plugin="N" origin-model="Symbian">
@@ -1630,36 +1099,31 @@
    </block>
    <block name="wlan" long-name="WLAN" tech_domain="dc" level="services" levels="hw low mid high tools test">
     <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-     <component name="wlanpsmplugin" long-name="WLAN PSM Plugin" origin-model="Foundation">
+     <component name="wlanpsmplugin" long-name="WLAN PSM Plugin" origin-model="foundation">
       <unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
      </component>
-     <component name="wlanagent" long-name="WLAN Agent" origin-model="Foundation">
+     <component name="wlanagent" long-name="WLAN Agent" origin-model="foundation">
       <unit bldFile="os/wlan/wlan_bearer/wlanagent/group"/>
      </component>
-     <component name="wlandbif_cd" long-name="WLAN CommsDat interface" origin-model="Foundation">
+     <component name="wlandbif_cd" long-name="WLAN CommsDat interface" origin-model="foundation">
       <unit bldFile="os/wlan/wlan_bearer/wlandbif_cd/group"/>
      </component>
-     <component name="wlanengine" long-name="WLAN Engine" origin-model="Foundation">
+     <component name="wlanengine" long-name="WLAN Engine" origin-model="foundation">
       <unit bldFile="os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
      </component>
-     <component name="wlanldd" long-name="WLAN LDD" origin-model="Foundation">
+     <component name="wlanldd" long-name="WLAN LDD" origin-model="foundation">
       <unit bldFile="os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
      </component>
-     <component name="wlannwif" long-name="WLAN Network Interface" origin-model="Foundation">
+     <component name="wlannwif" long-name="WLAN Network Interface" origin-model="foundation">
       <unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
      </component>
-     <component unofficial="yes" name="wlan_bearer_build" origin-model="Foundation">
+     <component unofficial="yes" name="wlan_bearer_build" origin-model="foundation">
       <unit bldFile="os/wlan/wlan_bearer/group"/>
      </component>
     </collection>
     <collection name="wlantools" long-name="WLAN Tools" level="tools">
-     <component name="dut" long-name="Dut" origin-model="Foundation"/>
-     <component name="ping" long-name="Ping" origin-model="Foundation"/>
-    </collection>
-    <collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-     <component unofficial="yes" name="wlan_sdk_info_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-     </component>
+     <component name="dut" long-name="Dut" origin-model="foundation"/>
+     <component name="ping" long-name="Ping" origin-model="foundation"/>
     </collection>
     <collection name="wlanapitest" long-name="WLAN API Tests" level="test">
      <component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
@@ -1669,57 +1133,19 @@
      </component>
     </collection>
     <collection name="wlan_info" long-name="WLAN Info" level="test">
-     <component unofficial="yes" name="wlan_build" long-name="WLAN Build" origin-model="Foundation">
+     <component unofficial="yes" name="wlan_pub" long-name="WLAN Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_pub/group"/>
+     </component>
+     <component unofficial="yes" name="wlan_build" long-name="WLAN Build" origin-model="foundation">
       <unit bldFile="os/wlan/group"/>
      </component>
+     <component unofficial="yes" name="wlan_plat" long-name="WLAN Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/wlan/wlan_plat/group"/>
+     </component>
     <component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-     <component unofficial="yes" name="wlan_agent_hotspot_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hal_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_management_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_control_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_info_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hpa_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_eapol_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_osa_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_device_settings_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hw_initialization_data_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_dbif_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_power_save_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_spia_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_generic_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
@@ -1821,31 +1247,19 @@
       <unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
      </component>
     </collection>
-	<!-- Collection manually added from OS after auto-merge -->
-	<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-	 <component name="dial" long-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 name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-	  <unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-	 </component>
-	 <component name="etel3rdpartyapi" long-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 name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
-     <component name="gennif" long-name="Generic NIF" origin-model="Foundation">
+     <component name="gennif" long-name="Generic NIF" origin-model="foundation">
       <unit bldFile="os/cellularsrv/commonnetworkinterface/gennif/group"/>
      </component>
-     <component name="gprsumtsagent" long-name="GPRS UMTS Agent" origin-model="Foundation">
+     <component name="gprsumtsagent" long-name="GPRS UMTS Agent" origin-model="foundation">
       <unit bldFile="os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/>
      </component>
-     <component unofficial="yes" name="commonnetworkinterface_build" long-name="Common Network Interface Build" origin-model="Foundation">
+     <component unofficial="yes" name="commonnetworkinterface_build" long-name="Common Network Interface Build" origin-model="foundation">
       <unit bldFile="os/cellularsrv/commonnetworkinterface/group"/>
      </component>
     </collection>
     <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-     <component name="isc_if" long-name="ISC Interface" origin-model="Foundation">
+     <component name="isc_if" long-name="ISC Interface" origin-model="foundation">
       <unit bldFile="os/cellularsrv/basebandabstraction/isc_if/group"/>
      </component>
      <!--Component manually removed and merged to OS, unit originately commented out by Bob's script-->
@@ -1861,10 +1275,25 @@
       <unit bldFile="os/cellularsrv/basebandabstraction/intersystemcomm/group" mrp="os/cellularsrv/basebandabstraction/intersystemcomm/group/networking_isc.mrp"/>
      </component>
     </collection>
+	<!-- Collection manually added due to faulty merge XSLT -->
+	<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
+	 <component name="dial" long-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 name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
+	  <unit bldFile="os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
+	 </component>
+	 <component name="etel3rdpartyapi" long-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 name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-     <component unofficial="yes" name="cellularsrv_build" long-name="Cellular Baseband Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="cellularsrv_build" long-name="Cellular Baseband Services Build" origin-model="foundation">
       <unit bldFile="os/cellularsrv/group"/>
      </component>
+     <component unofficial="yes" name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/cellularsrv/cellularsrv_plat/group"/>
+     </component>
     <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
       <unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
      </component>
@@ -1875,11 +1304,6 @@
       <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="primary_pdp_context_qos_parameter_setting_api" origin-model="Foundation">
-      <unit bldFile="os/cellularsrv/cellularsrv_plat/primary_pdp_context_qos_parameter_setting_api/group"/>
-     </component>
-    </collection>
    <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
      <component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
       <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
@@ -1905,76 +1329,76 @@
    </block>
    <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
     <collection name="audio" long-name="Audio Codecs" level="middleware">
-     <component name="ARM_CMMF_codecs" long-name="ARM CMMF Codecs" origin-model="Foundation">
+     <component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs" origin-model="foundation">
       <unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
      </component>
-     <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build" origin-model="Foundation">
+     <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build" origin-model="foundation">
       <unit bldFile="os/mm/audio/group"/>
      </component>
     </collection>
     <collection name="video" long-name="Video Codecs" level="middleware">
-     <component name="ARM_MDF_Decoders" long-name="ARM MDF Decoders" origin-model="Foundation">
+     <component name="arm_mdf_decoders" long-name="ARM MDF Decoders" origin-model="foundation">
       <unit bldFile="os/mm/video/group"/>
      </component>
     </collection>
     <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-     <component name="drmaudioplayer" long-name="DRM Audio Player" origin-model="Foundation">
+     <component name="drmaudioplayer" long-name="DRM Audio Player" origin-model="foundation">
       <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
       <!-- <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
       <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
      </component>
-     <component name="mmextfw" long-name="MM Ext Framework" origin-model="Foundation">
+     <component name="mmextfw" long-name="MM Ext Framework" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/mmextfw/group"/>
      </component>
-     <component name="audiorouting" long-name="Audio Routing" origin-model="Foundation">
+     <component name="audiorouting" long-name="Audio Routing" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/audiorouting/group"/>
      </component>
-     <component name="effects" long-name="Effects" origin-model="Foundation">
+     <component name="effects" long-name="Effects" origin-model="foundation">
       <!-- <unit bldFile="os/mm/devsoundextensions/effects/effecttest"/> -->
       <unit bldFile="os/mm/devsoundextensions/effects/group"/>
      </component>
-     <component name="effectspresets" long-name="Effects Presets" origin-model="Foundation">
+     <component name="effectspresets" long-name="Effects Presets" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
      </component>
-     <component name="telephonyaudiorouting" long-name="Telephony Audio Routing" origin-model="Foundation">
+     <component name="telephonyaudiorouting" long-name="Telephony Audio Routing" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/group"/>
       <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/server/group"/> -->
       <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/session/group"/> -->
       <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
       <!-- <unit bldFile="os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
      </component>
-     <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces" origin-model="Foundation">
+     <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/mmfcustominterfaces/group"/>
      </component>
-     <component name="addeddevsoundcontrol" long-name="Added DevSound Control" origin-model="Foundation">
+     <component name="addeddevsoundcontrol" long-name="Added DevSound Control" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
      </component>
-     <component name="globalaudiosettings" long-name="Global Audio Settings" origin-model="Foundation">
+     <component name="globalaudiosettings" long-name="Global Audio Settings" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/globalaudiosettings/group"/>
      </component>
-     <component name="restrictedaudiooutput" long-name="Restricted Audio Output" origin-model="Foundation">
+     <component name="restrictedaudiooutput" long-name="Restricted Audio Output" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/restrictedaudiooutput/group"/>
      </component>
-     <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins" origin-model="Foundation">
+     <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
      </component>
-     <component unofficial="yes" name="devsoundextensions_build" long-name="Devsound Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="devsoundextensions_build" long-name="Devsound Extensions Build" origin-model="foundation">
       <unit bldFile="os/mm/devsoundextensions/group"/>
      </component>
     </collection>
     <collection name="mdfdevvideoextensions" long-name="MDF devvideo Extensions" level="device-fw">
-     <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor" origin-model="Foundation">
+     <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor" origin-model="foundation">
       <unit bldFile="os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
      </component>
-     <component unofficial="yes" name="mdfdevvideoextensions_build" long-name="MDF devvideo Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="mdfdevvideoextensions_build" long-name="MDF devvideo Extensions Build" origin-model="foundation">
       <unit bldFile="os/mm/mdfdevvideoextensions/group"/>
      </component>
     </collection>
     <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
-     <component name="postingsurface" long-name="Posting Surface" origin-model="Foundation">
+     <component name="postingsurface" long-name="Posting Surface" origin-model="foundation">
       <unit bldFile="os/mm/videoadaptationextensions/postingsurface/group"/>
      </component>
-     <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
       <unit bldFile="os/mm/videoadaptationextensions/group"/>
      </component>
     </collection>
@@ -2019,12 +1443,38 @@
      </component>
     </collection>
     <collection name="mm_info" long-name="Multimedia Info" level="app-if">
-     <component unofficial="yes" name="mm_build" long-name="Multimedia Build" origin-model="Foundation">
+     <component unofficial="yes" name="mm_pub" long-name="Multimedia Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/mm/mm_pub/audio_effects_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/group"/>
+     </component>
+     <component unofficial="yes" name="mm_build" long-name="Multimedia Build" origin-model="foundation">
       <unit bldFile="os/mm/group"/>
      </component>
-     <component unofficial="yes" name="mm_test" long-name="Multimedia Test" origin-model="Foundation">
+     <component unofficial="yes" name="mm_test" long-name="Multimedia Test" origin-model="foundation">
       <!-- <unit bldFile="os/mm/tsrc/group"/> -->
      </component>
+     <component unofficial="yes" name="mm_plat" long-name="Multimedia Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/audio_routing_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/audio_visualization_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/group"/>
+      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/tsrc/group"/>
+     </component>
     <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
       <unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
      </component>
@@ -2032,250 +1482,6 @@
       <unit mrp="os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="custom_interface_message_handler_factory_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_visualization_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/audio_visualization_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="frametable_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_decoder_scaling_mdf_custom_interface" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="rds_adaptation_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_buffer_management_mdf_custom_interface" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_utility_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="fm_radio_adaptation_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_audio_routing_manager_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaacplusutil_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="display_posting_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_policy_header_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="nokia_audio_policy_header_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="mdf_plugin_uids" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_builder_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_audio_settings_definition_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_fourcc_definitions_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="devsound_adaptation_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_reclaim_extbuffers_ci" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
-     </component>
-     <component unofficial="yes" name="nokia_multimedia_fourcc_definitions_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_proxy_factory_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_msg_hdlr_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_window_control_custom_interface" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_audio_routing_client_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_audio_settings_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="secure_output_mdf_custom_interface" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_decoder_rotation_mdf_custom_interface" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_proxy_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
-     </component>
-    </collection>
-    <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
-     <component unofficial="yes" name="audio_effects_presets_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_audio_player_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_extension_interfaces_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_api" origin-model="Foundation">
-      <unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
-     </component>
-    </collection>
    <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
      <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
@@ -2389,73 +1595,49 @@
    </block>
    <block name="imagingext" long-name="Imaging Extensions" tech_domain="mm" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-     <component name="iclextjpegapi" long-name="ICL Ext JPEG API" origin-model="Foundation">
+     <component name="iclextjpegapi" long-name="ICL Ext JPEG API" origin-model="foundation">
       <unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
      </component>
-     <component unofficial="yes" name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" origin-model="foundation">
       <unit bldFile="os/imagingext/imageadaptationextensions/group"/>
      </component>
     </collection>
     <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-     <component name="exiflib" long-name="Exif Lib" origin-model="Foundation">
+     <component name="exiflib" long-name="Exif Lib" origin-model="foundation">
       <unit bldFile="os/imagingext/imagingmodules/exiflib/group"/>
      </component>
-     <component name="jp2kcodec" long-name="JP2K Codec" origin-model="Foundation">
+     <component name="jp2kcodec" long-name="JP2K Codec" origin-model="foundation">
       <unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
      </component>
-     <component name="H264AVCVideoEncARM" long-name="H264AVC VideoEnc ARM" origin-model="Foundation"/>
-     <component name="VideoEncPluginARM" long-name="VideoEnc Plugin ARM" origin-model="Foundation"/>
+     <component name="h264avcvideoencarm" long-name="H264AVC VideoEnc ARM" origin-model="foundation"/>
+     <component name="videoencpluginarm" long-name="VideoEnc Plugin ARM" origin-model="foundation"/>
     </collection>
     <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
-     <component unofficial="yes" name="imagingext_build" long-name="Imaging Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/imagingext/imagingext_plat/group"/>
+     </component>
+     <component unofficial="yes" name="imagingext_build" long-name="Imaging Extensions Build" origin-model="foundation">
       <unit bldFile="os/imagingext/group"/>
      </component>
-    </collection>
-    <collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="h324_annex_k_custom_api" origin-model="Foundation">
-      <unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="jpeg2000_icl_plugin_api" origin-model="Foundation">
-      <unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_face_tracking_custom_api" origin-model="Foundation">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_orientation_custom_api" origin-model="Foundation">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_icl_jpeg_api" origin-model="Foundation">
-      <unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_ui_orientation_override_custom_api" origin-model="Foundation">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-     </component>
-    </collection>
-    <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-     <component unofficial="yes" name="exif_api" origin-model="Foundation">
+     <component unofficial="yes" name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" class="api" origin-model="foundation">
       <!-- <unit bldFile="os/imagingext/imagingext_pub/exif_api/tsrc/group"/> -->
-      <unit bldFile="os/imagingext/imagingext_pub/exif_api/group"/>
+      <unit bldFile="os/imagingext/imagingext_pub/group"/>
      </component>
     </collection>
    </block>
    <block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
     <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
-     <component name="vgi" long-name="VGI" origin-model="Foundation">
+     <component name="vgi" long-name="VGI" origin-model="foundation">
       <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
      </component>
-     <component name="2D_OpenVG_1_0" long-name="2D Open VG 1.0" origin-model="Foundation"/>
-     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="Foundation"/>
+     <component name="2d_openvg_1_0" long-name="2D Open VG 1.0" origin-model="foundation"/>
+     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="foundation"/>
     </collection>
     <collection name="m3g" long-name="M3G" level="internal-adaptations">
-     <component name="m3gcore11" long-name="M3G Core 11" origin-model="Foundation">
+     <component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
       <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
      </component>
     </collection>
-    <collection name="graphics_pub" long-name="Graphics Public Interfaces" level="app-if">
-     <component unofficial="yes" name="graphics_pub_build" long-name="Graphics Public API Build" origin-model="Foundation">
-      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
-     </component>
-    </collection>
     <collection name="graphicstest" long-name="Graphics Test" level="app-if">
      <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
@@ -2465,9 +1647,20 @@
      </component>
     </collection>
     <collection name="graphics_info" long-name="Graphics Info" level="app-if">
-     <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="Foundation">
+     <component unofficial="yes" name="graphicssvs" origin-model="foundation">
+      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
+      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
+	  <unit mrp="os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
+     </component>
+     <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
+     </component>
+     <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="foundation">
       <unit bldFile="os/graphics/group"/>
      </component>
+     <component unofficial="yes" name="graphics_plat" long-name="Graphics Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/graphics/graphics_plat/group"/>
+     </component>
     <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
       <unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
      </component>
@@ -2475,14 +1668,6 @@
       <unit mrp="os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="openvg_binding_api" origin-model="Foundation">
-      <unit bldFile="os/graphics/graphics_plat/openvg_binding_api/group"/>
-     </component>
-     <component unofficial="yes" name="m3g_core_api" origin-model="Foundation">
-      <unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-     </component>
-    </collection>
    <collection name="windowing" long-name="Windowing" level="app-if">
      <component name="windowserver" long-name="Window Server" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
@@ -2543,19 +1728,13 @@
      </component>
     </collection>
     <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-<!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
+	 <!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
 <!--     <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
       <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
      </component>
 -->
     </collection>
     <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
-	 <component unofficial="yes" name="graphicssvs" long-name="Graphics Verification Suite" purpose="development" origin-model="Foundation">
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
-	  <!-- Unit manually added from OS after auto-merge -->
-	  <unit mrp="os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
-     </component>
      <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
       <!-- PLACEHOLDER="DS.1645"
       <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhai.mrp"/>
@@ -2565,13 +1744,13 @@
    </block>
    <block name="textandloc" long-name="Text and Localisation" tech_domain="ui" level="services" levels="encoding util fonts tools text">
     <collection name="charconvfw" long-name="Character Conversion FW" level="encoding">
-     <component name="charconv" long-name="Charconv" origin-model="Foundation">
+     <component name="charconv" long-name="Charconv" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/charconv/ongoing/group"/>
      </component>
-     <component name="charconvplugin" long-name="Charconv Plugin" origin-model="Foundation">
+     <component name="charconvplugin" long-name="Charconv Plugin" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/charconvplugin/group"/>
      </component>
-     <component name="charconv_fw" origin-model="Foundation" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
+     <component name="charconv_fw" origin-model="foundation" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
       <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
      </component>
      <!--Component manually removed and merged to OS-->
@@ -2618,28 +1797,28 @@
      </component>
     </collection>
     <collection name="textandlocutils" level="util" long-name="Text and Localisation Utils">
-     <component name="Localizer" long-name="Localizer" origin-model="Foundation">
+     <component name="localizer" long-name="Localizer" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/localizer/group"/>
      </component>
-     <component name="Findutil" long-name="Find Util" origin-model="Foundation">
+     <component name="findutil" long-name="Find Util" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/findutil/group"/>
      </component>
-     <component name="numbergrouping" long-name="Number Grouping" origin-model="Foundation">
+     <component name="numbergrouping" long-name="Number Grouping" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
      </component>
-     <component name="gamerecognizer" long-name="Game Recognizer" origin-model="Foundation">
+     <component name="gamerecognizer" long-name="Game Recognizer" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/gamerecognizer/group"/>
      </component>
-     <component name="JPLangUtil" long-name="JP Lang Util" origin-model="Foundation">
+     <component name="jplangutil" long-name="JP Lang Util" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
      </component>
-     <component name="SortUtil" long-name="Sort Util" origin-model="Foundation">
+     <component name="sortutil" long-name="Sort Util" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
      </component>
-     <component name="AknJapaneseReading" long-name="Akn Japanese Reading" origin-model="Foundation">
+     <component name="aknjapanesereading" long-name="Akn Japanese Reading" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/aknjapanesereading/group"/>
      </component>
-     <component name="inlinetext" long-name="Inline Text" origin-model="Foundation">
+     <component name="inlinetext" long-name="Inline Text" origin-model="foundation">
       <unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
      </component>
     <component name="nearestlangutil" long-name="Nearest Language Util" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
@@ -2649,96 +1828,75 @@
       <unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
      </component>
     </collection>
-	<!-- Collection manually added from OS after auto-merge -->
-	<collection name="localesupport" long-name="Locale Support" level="util">
-	 <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y">
-	  <unit bldFile="os/kernelhwsrv/localisation/localesupport" mrp="os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-	 </component>
-	 <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder">
-	  <!-- placeholder for split from bafl -->
-	 </component>
-	</collection>
-	<!-- Collection manually added from OS after auto-merge -->
-	<collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-	 <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC">
-	  <!-- placeholder for split from GDI Tools -->
-	 </component>
-	 <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-	  <unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-	 </component>
-	</collection>
-    <collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-     <component unofficial="yes" name="directory_localizer_api" origin-model="Foundation">
-      <unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_api" origin-model="Foundation">
-      <unit bldFile="os/textandloc/textandloc_pub/character_conversion_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_plugin_provider_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
-      <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/group"/>
+    <collection name="localesupport" long-name="Locale Support" level="util">
+     <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/kernelhwsrv/localisation/localesupport" mrp="os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
+     </component>
+     <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
+      <!-- placeholder for split from bafl -->
+     </component>
+    </collection>
+    <collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
+     <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC" plugin="N" origin-model="Symbian">
+      <!-- placeholder for split from GDI Tools -->
+     </component>
+     <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
+      <unit bldFile="os/graphics/graphicstools/bitmapfonttools/group" mrp="os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
      </component>
     </collection>
     <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-     <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build" origin-model="Foundation">
+     <component unofficial="yes" name="textandloc_pub" long-name="Text and Localisation Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
+      <unit bldFile="os/textandloc/textandloc_pub/group"/>
+     </component>
+     <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build" origin-model="foundation">
       <unit bldFile="os/textandloc/group"/>
      </component>
+     <component unofficial="yes" name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
+      <unit bldFile="os/textandloc/textandloc_plat/group"/>
+      <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
+     </component>
     <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-     <component unofficial="yes" name="findutil_api" origin-model="Foundation">
-      <unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
-      <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="japanese_language_utilities_api" origin-model="Foundation">
-      <unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_nonpublic_api" origin-model="Foundation">
-      <unit bldFile="os/textandloc/textandloc_plat/character_conversion_nonpublic_api/group"/>
-     </component>
-     <component unofficial="yes" name="sortutil_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
-      <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="xmlsrv" long-name="XML Services" tech_domain="rt" level="services" levels="plugin server framework generic specific">
     <collection name="xmlengine" long-name="XML Engine" level="server">
-     <component name="libxml2" long-name="Libxml2" origin-model="Foundation">
+     <component name="libxml2" long-name="Libxml2" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlengine/libxml2/group"/>
      </component>
-     <component name="xmlengineutils" long-name="XML Engine Utils" origin-model="Foundation">
+     <component name="xmlengineutils" long-name="XML Engine Utils" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlengine/xmlengineutils/group"/>
      </component>
-     <component name="domxpathwrapper" long-name="DOM XPath Wrapper" origin-model="Foundation">
+     <component name="domxpathwrapper" long-name="DOM XPath Wrapper" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlengine/domxpathwrapper/group"/>
      </component>
-     <component name="xmlengineserializer" long-name="XML Engines Erializer" origin-model="Foundation">
+     <component name="xmlengineserializer" long-name="XML Engines Erializer" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlengine/xmlengineserializer/group"/>
      </component>
-     <component name="xmlenginesaxplugin" long-name="XML Engine SAX Plugin" origin-model="Foundation">
+     <component name="xmlenginesaxplugin" long-name="XML Engine SAX Plugin" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlengine/xmlenginesaxplugin/group"/>
      </component>
-     <component unofficial="yes" name="xmlengine_build" long-name="XML Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="xmlengine_build" long-name="XML Engine Build" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlengine/group"/>
      </component>
     </collection>
     <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-     <component name="xmlseccertman" long-name="XML Security Certman" origin-model="Foundation">
+     <component name="xmlseccertman" long-name="XML Security Certman" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
      </component>
-     <component name="xmlsec" long-name="XML Security" origin-model="Foundation">
+     <component name="xmlsec" long-name="XML Security" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
      </component>
-     <component name="xmlseccrypto" long-name="XML Security Crypto" origin-model="Foundation">
+     <component name="xmlseccrypto" long-name="XML Security Crypto" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
      </component>
-     <component name="xmlsecwrapper" long-name="XML Security Wrapper" origin-model="Foundation">
+     <component name="xmlsecwrapper" long-name="XML Security Wrapper" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
      </component>
-     <component unofficial="yes" name="xmlsecurityengine_build" long-name="XML Security Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="xmlsecurityengine_build" long-name="XML Security Engine Build" origin-model="foundation">
       <unit bldFile="os/xmlsrv/xmlsecurityengine/group"/>
      </component>
     </collection>
@@ -2754,94 +1912,45 @@
      </component>
     </collection>
     <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-     <component unofficial="yes" name="xmlsrv_build" long-name="XML Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="xmlsrv_plat" long-name="XML Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="xmlsrv_build" long-name="XML Services Build" origin-model="foundation">
       <unit bldFile="os/xmlsrv/group"/>
      </component>
+     <component unofficial="yes" name="xmlsrv_pub" long-name="XML Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="os/xmlsrv/xmlsrv_pub/group"/>
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
+     </component>
     <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="xml_engine_serializer_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_utils_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_xml_pointer_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_pointer_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_encryption_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="libxml2_xml_schemas_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_schemas_api/group"/>
-     </component>
-     <component unofficial="yes" name="xmlsrv_plat_build" long-name="XML Services Platform API Build" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="xml_engine_xpath_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_security_engine_utils_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_engine_utils_api" origin-model="Foundation">
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_canonical_xml_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_canonical_xml_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_signature_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="libxml2_xpath_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xpath_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_engine_deserializer_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_deserializer_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_xml_linking_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_linking_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_parser_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_parser_api/group"/>
-     </component>
-    </collection>
-    <collection name="xmlsrv_pub" long-name="XML Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="xml_engine_dom_api" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xmlsrv_pub_build" long-name="XML Services Public API Build" origin-model="Foundation">
-      <unit bldFile="os/xmlsrv/xmlsrv_pub/group"/>
-     </component>
-    </collection>
    </block>
    <block name="deviceplatformrelease" long-name="Device Platform Release" tech_domain="to" level="services" levels="bld mid top">
-    <collection name="S60Extras" long-name="S60 Extras" level="mid">
-     <component name="S60Extras compo" long-name="S60 Extras Component" origin-model="Foundation">
+    <collection name="s60extras" long-name="S60 Extras" level="mid">
+     <component name="s60extras_build" long-name="S60 Extras Component" origin-model="foundation">
       <unit bldFile="os/deviceplatformrelease/s60extras/group"/>
      </component>
     </collection>
-    <collection name="S60LocFiles" long-name="S60 Loc Files" level="mid">
-     <component name="S60LocFiles compo" long-name="S60 Loc Files Component" origin-model="Foundation">
+    <collection name="s60locfiles" long-name="S60 Loc Files" level="mid">
+     <component name="s60locfiles_build" long-name="S60 Loc Files Component" origin-model="foundation">
       <unit bldFile="os/deviceplatformrelease/s60locfiles/group"/>
      </component>
     </collection>
-    <collection name="Version" long-name="Version" level="top">
-     <component name="Version compo" long-name="Version Component" origin-model="Foundation">
+    <collection name="version" long-name="Version" level="top">
+     <component name="version_build" long-name="Version Component" origin-model="foundation">
       <unit bldFile="os/deviceplatformrelease/version/group"/>
      </component>
     </collection>
     <collection name="sf_config" long-name="SF Config" level="mid">
-     <component name="config" origin-model="Foundation">
+     <component name="config" origin-model="foundation">
       <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/apac/group"/> -->
       <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/group"/> -->
       <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/japan/group"/> -->
@@ -2849,7 +1958,7 @@
      </component>
     </collection>
     <collection name="s60bld">
-     <component unofficial="yes" name="buildplatforms" origin-model="Foundation">
+     <component unofficial="yes" name="buildplatforms" origin-model="foundation">
       <unit bldFile="tools/buildplatforms/group"/>
      </component>
     </collection>
@@ -2877,115 +1986,101 @@
    </block>
    <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
     <collection name="stif" long-name="STIF" level="fw">
-     <component name="TestInterface" long-name="Test Interface" origin-model="Foundation">
+     <component name="testinterface" long-name="Test Interface" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/testinterface/group"/>
      </component>
-     <component name="TestServer" long-name="Test Server" origin-model="Foundation">
+     <component name="testserver" long-name="Test Server" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/testserver/group"/>
      </component>
-     <component name="TestEngine" long-name="Test Engine" origin-model="Foundation">
+     <component name="testengine" long-name="Test Engine" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/testengine/group"/>
      </component>
-     <component name="TestServerStarter" long-name="Test Server Starter" origin-model="Foundation">
+     <component name="testserverstarter" long-name="Test Server Starter" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/testserverstarter/group"/>
      </component>
-     <component name="StifTFwIf" long-name="STIF TFwIf" origin-model="Foundation">
+     <component name="stiftfwif" long-name="STIF TFwIf" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/stiftfwif/group"/>
      </component>
-     <component name="ConsoleUI" long-name="Console UI" origin-model="Foundation">
+     <component name="consoleui" long-name="Console UI" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/consoleui/group"/>
      </component>
-     <component name="TestCombiner" long-name="Test Combiner" origin-model="Foundation">
+     <component name="testcombiner" long-name="Test Combiner" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/testcombiner/group"/>
      </component>
-     <component name="DemoModule" long-name="Demo Module" origin-model="Foundation">
+     <component name="demomodule" long-name="Demo Module" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/demomodule/group"/>
      </component>
-     <component name="ATSLogger" long-name="ATS Logger" origin-model="Foundation">
+     <component name="atslogger" long-name="ATS Logger" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/atslogger/group"/>
      </component>
-     <component name="ATSInterface" long-name="ATS Interface" origin-model="Foundation">
+     <component name="atsinterface" long-name="ATS Interface" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/atsinterface/group"/>
      </component>
-     <component name="TestScripter" long-name="Test Scripter" origin-model="Foundation">
+     <component name="testscripter" long-name="Test Scripter" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/testscripter/group"/>
      </component>
-     <component name="SUEvent" long-name="SU Event" origin-model="Foundation">
+     <component name="suevent" long-name="SU Event" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/suevent/group"/>
      </component>
-     <component name="StifKernelTestClassBase" long-name="STIF Kernel Test Class Base" origin-model="Foundation">
+     <component name="stifkerneltestclassbase" long-name="STIF Kernel Test Class Base" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/stifkerneltestclassbase/group"/>
      </component>
-     <component name="examples" long-name="Examples" origin-model="Foundation">
+     <component name="examples" long-name="Examples" origin-model="foundation">
       <!-- <unit bldFile="ostools/osrndtools/stif/examples/stiftestmeasurementstub/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/examples/stifhwresetstub/group"/> -->
      </component>
-     <component name="TestModuleTemplates" long-name="Test Module Templates" origin-model="Foundation">
+     <component name="testmoduletemplates" long-name="Test Module Templates" origin-model="foundation">
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/capsmodifierxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/testmodulexxx/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
-     </component>
-     <component unofficial="yes" name="stif_build" long-name="STIF Build" origin-model="Foundation">
+     </component>
+     <component unofficial="yes" name="stif_build" long-name="STIF Build" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/stif/group"/>
      </component>
     </collection>
     <collection name="memspy" long-name="Memspy" level="trace">
-     <component name="Driver" origin-model="Foundation">
+     <component name="driver" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/memspy/driver/group"/>
      </component>
-     <component name="Engine" origin-model="Foundation">
+     <component name="memspy_engine" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/memspy/engine/group"/>
      </component>
-     <component name="CommandLine" origin-model="Foundation">
+     <component name="commandline" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/memspy/commandline/group"/>
      </component>
-     <component name="Console" origin-model="Foundation">
+     <component name="console" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/memspy/console/group"/>
      </component>
-     <component unofficial="yes" name="memspy_build" long-name="Memspy Build" origin-model="Foundation">
+     <component unofficial="yes" name="memspy_build" long-name="Memspy Build" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/memspy/group"/>
      </component>
     </collection>
     <collection name="hti" long-name="HTI" level="trace">
-     <component name="HtiCfg" origin-model="Foundation">
+     <component name="hticfg" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/hti/hticfg/group"/>
      </component>
-     <component name="HtiAutoStart" origin-model="Foundation">
+     <component name="htiautostart" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/hti/htiautostart/group"/>
      </component>
-     <component name="HtiFramework" origin-model="Foundation">
+     <component name="htiframework" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/hti/htiframework/group"/>
      </component>
-     <component name="HtiCommPlugins" long-name="HTI Comm Plugins" origin-model="Foundation"/>
-     <component name="HtiServicePlugins" long-name="HTI Service Plugins" origin-model="Foundation"/>
-     <component name="HtiFileHlp" origin-model="Foundation">
+     <!-- Empty duplicate component HtiCommPlugins removed -->
+     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="htifilehlp" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/hti/htifilehlp/group"/>
      </component>
-     <component name="HtiWatchDog" origin-model="Foundation">
+     <component name="htiwatchdog" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/hti/htiwatchdog/group"/>
      </component>
-     <component unofficial="yes" name="hti_build" long-name="HTI Build" origin-model="Foundation">
+     <component unofficial="yes" name="hti_build" long-name="HTI Build" origin-model="foundation">
       <unit bldFile="ostools/osrndtools/hti/group"/>
      </component>
     </collection>
-    <collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
-     <component unofficial="yes" name="memspy_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
-     </component>
-     <component unofficial="yes" name="stif_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/stif_api/group"/>
-     </component>
-     <component unofficial="yes" name="hti_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/hti_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_system_trace_api" origin-model="Foundation">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
-     </component>
-    </collection>
-   <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
+    <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
      <component name="cinidata" long-name="CINI Data" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
      </component>
@@ -2994,14 +2089,17 @@
      </component>
     </collection>
     <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
-     <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+     <component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build" origin-model="foundation">
+      <unit bldFile="ostools/osrndtools/group"/>
+     </component>
+    <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
     <collection name="gid_pc_tool" long-name="GID PC Tool">
-     <component name="DBImporter" long-name="DB Importer" origin-model="Foundation">
+     <component name="dbimporter" long-name="DB Importer" origin-model="foundation">
       <unit bldFile="tools/swconfigtools/gid_pc_tool/group"/>
      </component>
     </collection>
@@ -3162,7 +2260,7 @@
      </component>
     </collection>
     <collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-     <component unofficial="yes" name="localesupport" origin-model="Foundation">
+     <component unofficial="yes" name="localesupport" origin-model="foundation">
       <!-- <unit bldFile="os/kernelhwsrv/localisation/localesupport/mmpfiles"/> -->
      </component>
     <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
@@ -3260,24 +2358,16 @@
      </component>
     </collection>
     <collection name="shortlinksrv_info" long-name="Short Link Services Info" level="app-if">
-     <component unofficial="yes" name="shortlinksrv_build" origin-model="Foundation">
+     <component unofficial="yes" name="shortlinksrv_build" origin-model="foundation">
       <unit bldFile="os/shortlinksrv/group"/>
      </component>
+     <component unofficial="yes" name="shortlinksrv_plat" class="api" origin-model="foundation">
+      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/group"/>
+     </component>
     <component name="shortlinksrv_metadata" long-name="Short Link Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/shortlinksrv/shortlinksrv_info/shortlinksrv_metadata/shortlinksrv_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="shortlinksrv_plat">
-     <component unofficial="yes" name="bluetooth_power_management_api" origin-model="Foundation">
-      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/bluetooth_power_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_audio_adaptation_api" origin-model="Foundation">
-      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/bluetooth_audio_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="shortlinksrv_plat_build" origin-model="Foundation">
-      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
     <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
@@ -3297,7 +2387,7 @@
      </component>
     </collection>
     <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-     <component unofficial="yes" name="buildsystem" origin-model="Foundation">
+     <component unofficial="yes" name="buildsystem" origin-model="foundation">
       <!-- <unit bldFile="os/buildtools/toolsandutils/buildsystem/test/helloworld"/> -->
       <!-- <unit bldFile="os/buildtools/toolsandutils/buildsystem/test/binaryvariation"/> -->
      </component>
@@ -3544,19 +2634,19 @@
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appsupport" long-name="Generic Application Support" tech_domain="rt" level="generic" levels="system plugin framework server generic specific">
     <collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-     <component name="oodmonitor" long-name="OOD Monitor" origin-model="Foundation">
+     <component name="oodmonitor" long-name="OOD Monitor" origin-model="foundation">
       <unit bldFile="mw/appsupport/sysresmonitoring/oodmonitor/group"/>
      </component>
-     <component name="oommonitor" long-name="OOM Monitor" origin-model="Foundation">
+     <component name="oommonitor" long-name="OOM Monitor" origin-model="foundation">
       <unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/group"/>
       <!-- <unit bldFile="mw/appsupport/sysresmonitoring/oommonitor/tsrc/public/basic/group"/> -->
      </component>
-     <component unofficial="yes" name="sysresmonitoring_build" long-name="System Resource Monitoring Build" origin-model="Foundation">
+     <component unofficial="yes" name="sysresmonitoring_build" long-name="System Resource Monitoring Build" origin-model="foundation">
       <unit bldFile="mw/appsupport/sysresmonitoring/group"/>
      </component>
     </collection>
     <collection name="gssettingsuis" long-name="GS Settings UIs" level="specific">
-     <component name="Gs" long-name="GS" origin-model="Foundation">
+     <component name="gs" long-name="GS" origin-model="foundation">
       <unit bldFile="mw/appsupport/gssettingsuis/gs/group"/>
       <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/gsdiagnosticsplugin"/> -->
       <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/gsprslnplugin"/> -->
@@ -3564,278 +2654,137 @@
      </component>
     </collection>
     <collection name="profilesservices" long-name="Profiles Services" level="server">
-     <component name="FileList" long-name="File List" origin-model="Foundation">
+     <component name="filelist" long-name="File List" origin-model="foundation">
       <unit bldFile="mw/appsupport/profilesservices/filelist/group"/>
       <unit bldFile="mw/appsupport/profilesservices/filelist/tsrc/public/basic/group"/>
      </component>
-     <component name="MediaFileList" long-name="Media File List" origin-model="Foundation">
+     <component name="mediafilelist" long-name="Media File List" origin-model="foundation">
       <unit bldFile="mw/appsupport/profilesservices/mediafilelist/group"/>
      </component>
-     <component name="ProfileEngine" long-name="Profile Engine" origin-model="Foundation">
+     <component name="profileengine" long-name="Profile Engine" origin-model="foundation">
       <unit bldFile="mw/appsupport/profilesservices/profileengine/group"/>
       <unit bldFile="mw/appsupport/profilesservices/profileengine/tsrc/public/basic/group"/>
      </component>
-     <component name="RingingTone3DPlugin" long-name="Ringing Tone 3D Plugin" origin-model="Foundation">
+     <component name="ringingtone3dplugin" long-name="Ringing Tone 3D Plugin" origin-model="foundation">
       <unit bldFile="mw/appsupport/profilesservices/ringingtone3dplugin/group"/>
      </component>
-     <component unofficial="yes" name="profilesservices_test" long-name="Profiles Services Test" origin-model="Foundation">
+     <component unofficial="yes" name="profilesservices_test" long-name="Profiles Services Test" origin-model="foundation">
       <!-- <unit bldFile="mw/appsupport/profilesservices/tsrc/public/basic/group"/> -->
      </component>
     </collection>
     <collection name="flashliteapi_3_1" long-name="Flashlite API 3.1" level="specific">
-     <component name="flashliteapi_3_1 compo" origin-model="Foundation"/>
+     <component name="flashliteapi_3_1_build" origin-model="foundation"/>
     </collection>
     <collection name="contextframework" long-name="Context Framework" level="framework">
-     <component name="cfw" long-name="Context Framework" origin-model="Foundation">
+     <component name="cfw" long-name="Context Framework" origin-model="foundation">
       <unit bldFile="mw/appsupport/contextframework/cfw/group"/>
       <!-- <unit bldFile="mw/appsupport/contextframework/cfw/tsrc/cfwtest/group"/> -->
       <!-- <unit bldFile="mw/appsupport/contextframework/cfw/tsrc/public/basic/group"/> -->
      </component>
-     <component name="cfwplugins" long-name="Context Framework Plugins" origin-model="Foundation">
+     <component name="cfwplugins" long-name="Context Framework Plugins" origin-model="foundation">
       <unit bldFile="mw/appsupport/contextframework/cfwplugins/group"/>
      </component>
-     <component unofficial="yes" name="contextframework_build" long-name="Context Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="contextframework_build" long-name="Context Framework Build" origin-model="foundation">
       <unit bldFile="mw/appsupport/contextframework/group"/>
      </component>
     </collection>
     <collection name="mediakeys" long-name="Media Keys" level="plugin">
-     <component name="KeyPublisherPlugin" long-name="Key Publisher Plugin" origin-model="Foundation">
+     <component name="keypublisherplugin" long-name="Key Publisher Plugin" origin-model="foundation">
       <!-- <unit bldFile="mw/appsupport/mediakeys/keypublisherplugin/group"/> -->
      </component>
-     <component name="MMKeyBearer" long-name="MM Key Bearer" origin-model="Foundation">
+     <component name="mmkeybearer" long-name="MM Key Bearer" origin-model="foundation">
       <!-- <unit bldFile="mw/appsupport/mediakeys/mmkeybearer/group"/> -->
      </component>
-     <component unofficial="yes" name="mediakeys_build" long-name="Media Keys Build" origin-model="Foundation">
+     <component unofficial="yes" name="mediakeys_build" long-name="Media Keys Build" origin-model="foundation">
       <unit bldFile="mw/appsupport/mediakeys/group"/>
      </component>
     </collection>
     <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-     <component name="DbRecovery" long-name="Db Recovery" origin-model="Foundation">
+     <component name="dbrecovery" long-name="Db Recovery" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
      </component>
-     <component name="NspsWsPlugin" long-name="Nsps WS Plugin" origin-model="Foundation">
+     <component name="nspswsplugin" long-name="Nsps WS Plugin" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
      </component>
-     <component name="Rfs" long-name="RFS" origin-model="Foundation">
+     <component name="rfs" long-name="RFS" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfs/plugins/gsrfsplugin/group"/> -->
      </component>
-     <component name="rfsplugins" long-name="Rfs Plugins" origin-model="Foundation">
+     <component name="rfsplugins" long-name="Rfs Plugins" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/group"/>
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group"/> -->
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group"/> -->
      </component>
-     <component name="SysAp" long-name="Sys Ap" origin-model="Foundation">
+     <component name="sysap" long-name="Sys Ap" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
      </component>
-     <component name="VariatedSettings" long-name="Variated Settings" origin-model="Foundation">
+     <component name="variatedsettings" long-name="Variated Settings" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
      </component>
-     <component name="accfwuinotifier" long-name="ACC Framework UI Notifier" origin-model="Foundation">
+     <component name="accfwuinotifier" long-name="ACC Framework UI Notifier" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
      </component>
-     <component name="kefmapper" long-name="Key Event Framework Mapper" origin-model="Foundation">
+     <component name="kefmapper" long-name="Key Event Framework Mapper" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/kefmapper/group"/>
      </component>
-     <component name="advancedtspcontroller" long-name="Advanced TSP Controller" origin-model="Foundation">
+     <component name="advancedtspcontroller" long-name="Advanced TSP Controller" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group"/> -->
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/advancedtspcontroller/tsrc/stub/group"/> -->
      </component>
-     <component name="powersaveutilities" long-name="Power Save Utilities" origin-model="Foundation">
+     <component name="powersaveutilities" long-name="Power Save Utilities" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/powersaveutilities/tsrc/public/basic/group"/> -->
      </component>
-     <component name="gsserverenginestub" long-name="GS Server Engine Stub" origin-model="Foundation">
+     <component name="gsserverenginestub" long-name="GS Server Engine Stub" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
      </component>
-     <component name="GSServerEngine" long-name="GS Server Engine" origin-model="Foundation">
+     <component name="gsserverengine" long-name="GS Server Engine" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
      </component>
-     <component name="GSServer" long-name="GS Server" origin-model="Foundation">
+     <component name="gsserver" long-name="GS Server" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserver/group"/>
      </component>
-     <component name="sensordatacompensatorplugin" long-name="Sensor Data Compensator Plugin" origin-model="Foundation">
+     <component name="sensordatacompensatorplugin" long-name="Sensor Data Compensator Plugin" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group"/> -->
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group"/> -->
      </component>
-     <component unofficial="yes" name="coreapplicationuis_test" long-name="Core Application UIs Test" origin-model="Foundation">
+     <component unofficial="yes" name="coreapplicationuis_test" long-name="Core Application UIs Test" origin-model="foundation">
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/tsrc/public/basic/group"/> -->
      </component>
-     <component unofficial="yes" name="coreapplicationuis_build" long-name="Core Application UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="coreapplicationuis_build" long-name="Core Application UIs Build" origin-model="foundation">
       <unit bldFile="mw/appsupport/coreapplicationuis/group"/>
      </component>
     </collection>
     <collection name="startupservices" long-name="Startup Services" level="system">
-     <component name="SplashScreen" long-name="Splash Screen" origin-model="Foundation">
+     <component name="splashscreen" long-name="Splash Screen" origin-model="foundation">
       <unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
      </component>
-     <component name="Startup" origin-model="Foundation">
+     <component name="startup" origin-model="foundation">
       <unit bldFile="mw/appsupport/startupservices/startup/group"/>
       <!-- <unit bldFile="mw/appsupport/startupservices/startup/mediatorplugin/group"/> -->
       <!-- <unit bldFile="mw/appsupport/startupservices/startup/startupsyncplugin/group"/> -->
       <!-- <unit bldFile="mw/appsupport/startupservices/startup/systemerrorplugin/group"/> -->
      </component>
-     <component name="startupanimation" long-name="Startup Animation" origin-model="Foundation">
+     <component name="startupanimation" long-name="Startup Animation" origin-model="foundation">
       <unit bldFile="mw/appsupport/startupservices/startupanimation/group"/>
      </component>
-     <component unofficial="yes" name="startupservices_build" long-name="Startup Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="startupservices_build" long-name="Startup Services Build" origin-model="foundation">
       <unit bldFile="mw/appsupport/startupservices/group"/>
      </component>
     </collection>
     <collection name="systemsettings" long-name="System Settings" level="system">
-     <component name="gssensorplugin" long-name="GS Sensor Plugin" origin-model="Foundation">
+     <component name="gssensorplugin" long-name="GS Sensor Plugin" origin-model="foundation">
       <unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
      </component>
-     <component name="GSAccessoryPlugin" long-name="GS Accessory Plugin" origin-model="Foundation">
+     <component name="gsaccessoryplugin" long-name="GS Accessory Plugin" origin-model="foundation">
       <unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
      </component>
-     <component unofficial="yes" name="systemsettings_build" long-name="System Settings Build" origin-model="Foundation">
+     <component unofficial="yes" name="systemsettings_build" long-name="System Settings Build" origin-model="foundation">
       <unit bldFile="mw/appsupport/systemsettings/group"/>
      </component>
     </collection>
-    <collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-     <component unofficial="yes" name="settings_launch_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/group"/>
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="secondary_display_startup_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_accfw_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_subscription_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_user_setting_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-     </component>
-     <component unofficial="yes" name="action_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="application_orientation_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-     </component>
-     <component unofficial="yes" name="filelist_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/filelist_api/group"/>
-     </component>
-     <component unofficial="yes" name="restore_factory_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_source_settings_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="oom_monitor_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_configuration_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_client_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_listbox_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/group"/>
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="context_framework_listener_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_version_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_source_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="oom_monitor_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_services_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_plugin_callback_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_mediafilelist_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/profiles_mediafilelist_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_uis_cenrep_collection_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_uis_cenrep_collection_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_notification_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_sysap_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-     </component>
-     <component unofficial="yes" name="ood_threshold_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_backgroundimage_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/group"/>
-     </component>
-     <component unofficial="yes" name="restore_factory_settings_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_keys_definition_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_system_state_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_light_control_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="operation_provider_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_engine_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_key_handler_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_access_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_framework_mapper_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonecmdhandler_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-     </component>
-    </collection>
-    <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-     <component unofficial="yes" name="profiles_engine_active_profile_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_active_profile_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="flash_viewer_framework_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="network_status_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_engine_wrapper_api" origin-model="Foundation">
-      <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/group"/>
-      <!-- <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/> -->
-     </component>
-    </collection>
     <collection name="filehandling" long-name="File Handling" level="server">
      <component name="fileconverterfw" long-name="File Converter Framework" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="mw/appsupport/filehandling/fileconverterfw/group" mrp="mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
@@ -3931,7 +2880,21 @@
      </component>
     </collection>
     <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-     <component unofficial="yes" name="appsupport_build" long-name="Generic Application Support Build" origin-model="Foundation">
+     <component unofficial="yes" name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/appsupport/appsupport_plat/group"/>
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="appsupport_pub" long-name="Generic Application Support Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
+      <unit bldFile="mw/appsupport/appsupport_pub/group"/>
+      <!-- <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/> -->
+     </component>
+     <component unofficial="yes" name="appsupport_build" long-name="Generic Application Support Build" origin-model="foundation">
       <unit bldFile="mw/appsupport/group"/>
      </component>
     <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
@@ -3941,68 +2904,68 @@
    </block>
    <block name="securitysrv" long-name="Security Services" tech_domain="se" level="generic" levels="plugin framework server generic specific">
     <collection name="gba" long-name="Generic Boot Architecture" level="specific">
-     <component name="uicc" long-name="Uicc" origin-model="Foundation">
+     <component name="uicc" long-name="Uicc" origin-model="foundation">
       <unit bldFile="mw/securitysrv/gba/uicc/group"/>
      </component>
-     <component name="bootstrap" long-name="Bootstrap" origin-model="Foundation">
+     <component name="bootstrap" long-name="Bootstrap" origin-model="foundation">
       <unit bldFile="mw/securitysrv/gba/bootstrap/group"/>
      </component>
-     <component name="gbaserver" long-name="GBA Server" origin-model="Foundation">
+     <component name="gbaserver" long-name="GBA Server" origin-model="foundation">
       <unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
      </component>
-     <component name="gbaapi" long-name="GBA API" origin-model="Foundation">
+     <component name="gbaapi" long-name="GBA API" origin-model="foundation">
       <unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
      </component>
-     <component name="gbafilter" long-name="GBA Filter" origin-model="Foundation">
+     <component name="gbafilter" long-name="GBA Filter" origin-model="foundation">
       <unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
      </component>
-     <component unofficial="yes" name="gba_build" long-name="Generic Boot Architecture Build" origin-model="Foundation">
+     <component unofficial="yes" name="gba_build" long-name="Generic Boot Architecture Build" origin-model="foundation">
       <unit bldFile="mw/securitysrv/gba/group"/>
      </component>
     </collection>
     <collection name="wim" long-name="WIM" level="framework">
-     <component name="SwimReader" long-name="Swim Reader" origin-model="Foundation"/>
-     <component name="Scard" long-name="S Card" origin-model="Foundation"/>
-     <component name="WimUtil" long-name="WIM Util" origin-model="Foundation"/>
-     <component name="WimServer" long-name="WIM Server" origin-model="Foundation"/>
-     <component name="WimClient" long-name="WIM Client" origin-model="Foundation"/>
-     <component name="WimPlugin" long-name="WIM Plugin" origin-model="Foundation"/>
-     <component unofficial="yes" name="wim_build" long-name="WIM Build" origin-model="Foundation">
+     <component name="swimreader" long-name="Swim Reader" origin-model="foundation"/>
+     <component name="scard" long-name="S Card" origin-model="foundation"/>
+     <component name="wimutil" long-name="WIM Util" origin-model="foundation"/>
+     <component name="wimserver" long-name="WIM Server" origin-model="foundation"/>
+     <component name="wimclient" long-name="WIM Client" origin-model="foundation"/>
+     <component name="wimplugin" long-name="WIM Plugin" origin-model="foundation"/>
+     <component unofficial="yes" name="wim_build" long-name="WIM Build" origin-model="foundation">
       <unit bldFile="mw/securitysrv/wim/group"/>
      </component>
     </collection>
     <collection name="cms" long-name="Certificate Management Services" level="generic">
-     <component name="CMS.Dll=binary" long-name="CMS" origin-model="Foundation">
+     <component name="cms_build" long-name="CMS" origin-model="foundation">
       <unit bldFile="mw/securitysrv/cms/group"/>
      </component>
     </collection>
     <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-     <component name="x509certnameparser" long-name="X509cert Name Parser" origin-model="Foundation">
+     <component name="x509certnameparser" long-name="X509cert Name Parser" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
      </component>
-     <component name="PKCS12" origin-model="Foundation">
+     <component name="pkcs12" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
      </component>
-     <component name="CertmanUi" long-name="Certman UI" origin-model="Foundation">
+     <component name="certmanui" long-name="Certman UI" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
      </component>
-     <component name="CTSecurityDialogs" long-name="CT Security Dialogs" origin-model="Foundation">
+     <component name="ctsecuritydialogs" long-name="CT Security Dialogs" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
      </component>
-     <component name="CertSaver" long-name="Cert Saver" origin-model="Foundation">
+     <component name="certsaver" long-name="Cert Saver" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
      </component>
-     <component name="SecModUI" long-name="Sec Mod UI" origin-model="Foundation">
+     <component name="secmodui" long-name="Sec Mod UI" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
      </component>
-     <component name="DeviceToken" long-name="Device Token" origin-model="Foundation">
+     <component name="devicetoken" long-name="Device Token" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
      </component>
-     <component name="Certificates" origin-model="Foundation">
+     <component name="certificates" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/certificates/group"/>
      </component>
-     <component name="Certificates_OEM" origin-model="Foundation"/>
-     <component unofficial="yes" name="pkiutilities_build" long-name="PKI Utilities Build" origin-model="Foundation">
+     <component name="certificates_oem" origin-model="foundation"/>
+     <component unofficial="yes" name="pkiutilities_build" long-name="PKI Utilities Build" origin-model="foundation">
       <unit bldFile="mw/securitysrv/pkiutilities/group"/>
      </component>
     <component name="ocsp" long-name="Online Certificate Status Protocol" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
@@ -4010,93 +2973,51 @@
      </component>
     </collection>
     <collection name="remotelock" long-name="Remote Lock" level="server">
-     <component name="RemotelockSettings" long-name="Remote Lock Settings" origin-model="Foundation"/>
-     <component name="RemoteLockEngine" long-name="Remote Lock Engine" origin-model="Foundation"/>
-     <component unofficial="yes" name="remotelock_build" long-name="Remote Lock Build" origin-model="Foundation">
+     <component name="remotelocksettings" long-name="Remote Lock Settings" origin-model="foundation"/>
+     <component name="remotelockengine" long-name="Remote Lock Engine" origin-model="foundation"/>
+     <component unofficial="yes" name="remotelock_build" long-name="Remote Lock Build" origin-model="foundation">
       <unit bldFile="mw/securitysrv/remotelock/group"/>
      </component>
     </collection>
     <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-     <component name="TrkDummy" long-name="Trk Dummy" origin-model="Foundation">
+     <component name="trkdummy" long-name="Trk Dummy" origin-model="foundation">
       <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/trkdummy/group"/> -->
      </component>
-     <component unofficial="yes" name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build" origin-model="Foundation">
+     <component unofficial="yes" name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build" origin-model="foundation">
       <unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
      </component>
     </collection>
     <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-     <component name="keylockpolicyapi" long-name="Keylock Policy Api" origin-model="Foundation">
+     <component name="keylockpolicyapi" long-name="Keylock Policy Api" origin-model="foundation">
       <unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
      </component>
-     <component name="Autolock" origin-model="Foundation">
+     <component name="autolock" origin-model="foundation">
       <unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
      </component>
-     <component name="SecUi" long-name="Sec UI" origin-model="Foundation">
+     <component name="secui" long-name="Sec UI" origin-model="foundation">
       <unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
      </component>
-     <component name="Securitynotifier" long-name="Security Notifier" origin-model="Foundation">
+     <component name="securitynotifier" long-name="Security Notifier" origin-model="foundation">
       <unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
      </component>
-     <component name="Securityobserver" long-name="Security Observer" origin-model="Foundation">
+     <component name="securityobserver" long-name="Security Observer" origin-model="foundation">
       <unit bldFile="mw/securitysrv/securitydialogs/securityobserver/group"/>
      </component>
-     <component unofficial="yes" name="securitydialogs_build" long-name="Security Dialogs Build" origin-model="Foundation">
+     <component unofficial="yes" name="securitydialogs_build" long-name="Security Dialogs Build" origin-model="foundation">
       <unit bldFile="mw/securitysrv/securitydialogs/group"/>
      </component>
     </collection>
     <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-     <component unofficial="yes" name="provisioning_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-     </component>
-     <component unofficial="yes" name="cms_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-     </component>
-     <component unofficial="yes" name="gba_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-     </component>
-     <component unofficial="yes" name="remote_lock_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-     </component>
-     <component unofficial="yes" name="x509certnameparser_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-     </component>
-     <component unofficial="yes" name="devicelock_access_api" origin-model="Foundation">
+     <component unofficial="yes" name="securitysrv_build" long-name="Security Services Build" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/group"/>
+     </component>
+     <component unofficial="yes" name="secsrv_plat" class="api" origin-model="foundation">
       <!-- <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="keylock_policy_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="wim_cert_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-     </component>
-     <component unofficial="yes" name="keyguard_configuration_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="lockapp_server_api" origin-model="Foundation">
+      <unit bldFile="mw/securitysrv/secsrv_plat/group"/>
+      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
       <!-- <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
      </component>
-     <component unofficial="yes" name="securitysrv_build" long-name="Security Services Build" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/group"/>
-     </component>
-     <component unofficial="yes" name="pkcs12_parser_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="keyguard_access_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="device_key_store_encryption_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_utils_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="pkidialog_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="security_code_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="securitysrv_test" long-name="Security Services Test" origin-model="Foundation">
+     <component unofficial="yes" name="securitysrv_test" long-name="Security Services Test" origin-model="foundation">
       <!-- <unit bldFile="mw/securitysrv/tsrc/group"/> -->
      </component>
     <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
@@ -4106,48 +3027,48 @@
    </block>
    <block name="drm" long-name="DRM" tech_domain="se" level="generic" levels="plugin framework server generic specific">
     <collection name="commondrm" long-name="Common DRM" level="generic">
-     <component name="drmencryptor" long-name="DRM Encryptor" origin-model="Foundation"/>
-     <component name="drmsettingsplugin" long-name="DRM Settings Plugin" origin-model="Foundation"/>
-     <component name="drmrightsmanagerui" long-name="DRM Rights Manager UI" origin-model="Foundation">
+     <component name="drmencryptor" long-name="DRM Encryptor" origin-model="foundation"/>
+     <component name="drmsettingsplugin" long-name="DRM Settings Plugin" origin-model="foundation"/>
+     <component name="drmrightsmanagerui" long-name="DRM Rights Manager UI" origin-model="foundation">
       <unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
      </component>
-     <component name="drmutility" long-name="DRM Utility" origin-model="Foundation">
+     <component name="drmutility" long-name="DRM Utility" origin-model="foundation">
       <unit bldFile="mw/drm/commondrm/drmutility/group"/>
      </component>
-     <component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper" origin-model="Foundation">
+     <component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper" origin-model="foundation">
       <unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
      </component>
-     <component name="drmrightsstoringlocation" long-name="DRM Rights Storing Location" origin-model="Foundation">
+     <component name="drmrightsstoringlocation" long-name="DRM Rights Storing Location" origin-model="foundation">
       <unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
      </component>
-     <component unofficial="yes" name="commondrm_build" long-name="Common DRM Build" origin-model="Foundation">
+     <component unofficial="yes" name="commondrm_build" long-name="Common DRM Build" origin-model="foundation">
       <unit bldFile="mw/drm/commondrm/group"/>
      </component>
     </collection>
     <collection name="omadrm" long-name="OMA DRM" level="server">
-     <component name="drmroapwbxmlparser" long-name="DRM ROAP WBXML Parser" origin-model="Foundation">
+     <component name="drmroapwbxmlparser" long-name="DRM ROAP WBXML Parser" origin-model="foundation">
       <!-- <unit bldFile="mw/drm/omadrm/drmroapwbxmlparser/group"/> -->
      </component>
-     <component name="drmplugins" long-name="DRM Plugins" origin-model="Foundation">
+     <component name="drmplugins" long-name="DRM Plugins" origin-model="foundation">
       <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmfilter/group"/> -->
       <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmrecognizer/group"/> -->
       <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmrohandler/group"/> -->
       <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmromtm/group"/> -->
      </component>
-     <component name="drmengine" long-name="DRM Engine" origin-model="Foundation"/>
-     <component name="drmhelper" long-name="DRM Helper" origin-model="Foundation">
+     <component name="drmengine" long-name="DRM Engine" origin-model="foundation"/>
+     <component name="drmhelper" long-name="DRM Helper" origin-model="foundation">
       <!-- <unit bldFile="mw/drm/omadrm/drmhelper/drmhelperserver/group"/> -->
       <!-- <unit bldFile="mw/drm/omadrm/drmhelper/group"/> -->
      </component>
-     <component name="drmlicensemanager" long-name="Drm License Manager" origin-model="Foundation">
+     <component name="drmlicensemanager" long-name="Drm License Manager" origin-model="foundation">
       <!-- <unit bldFile="mw/drm/omadrm/drmlicensemanager/group"/> -->
      </component>
-     <component unofficial="yes" name="omadrm_build" long-name="OMA DRM Build" origin-model="Foundation">
+     <component unofficial="yes" name="omadrm_build" long-name="OMA DRM Build" origin-model="foundation">
       <unit bldFile="mw/drm/omadrm/group"/>
      </component>
     </collection>
     <collection name="wmdrm" long-name="WM DRM" level="framework">
-     <component name="wmdrmengine" long-name="WM DRM Engine" origin-model="Foundation">
+     <component name="wmdrmengine" long-name="WM DRM Engine" origin-model="foundation">
       <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmagent/group"/> -->
       <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
       <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
@@ -4155,7 +3076,7 @@
       <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
       <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
      </component>
-     <component name="camese" long-name="Camese" origin-model="Foundation">
+     <component name="camese" long-name="Camese" origin-model="foundation">
       <!-- <unit bldFile="mw/drm/wmdrm/camese/cameseutility/group"/> -->
       <!-- <unit bldFile="mw/drm/wmdrm/camese/group"/> -->
       <!-- <unit bldFile="mw/drm/wmdrm/camese/httpfiltercamese/group"/> -->
@@ -4166,567 +3087,336 @@
       <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlautils/group"/> -->
       <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlawrapper/group"/> -->
      </component>
-     <component name="wmdrmplugins" long-name="WM DRM Plugins" origin-model="Foundation"/>
-     <component unofficial="yes" name="wmdrm_build" long-name="WM DRM Build" origin-model="Foundation">
+     <component name="wmdrmplugins" long-name="WM DRM Plugins" origin-model="foundation"/>
+     <component unofficial="yes" name="wmdrm_build" long-name="WM DRM Build" origin-model="foundation">
       <unit bldFile="mw/drm/wmdrm/group"/>
      </component>
     </collection>
-    <collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-     <component unofficial="yes" name="oma_drm_caf_agent_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_license_checker_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_helper_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-     </component>
-    </collection>
     <collection name="drm_info" long-name="DRM Info" level="specific">
-     <component unofficial="yes" name="drm_build" long-name="DRM Build" origin-model="Foundation">
-      <unit bldFile="mw/drm/group"/>
-     </component>
-    </collection>
-    <collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-     <component unofficial="yes" name="drm_plat_build" long-name="DRM Platform API Build" origin-model="Foundation">
+     <component unofficial="yes" name="drm_pub" long-name="DRM Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
+      <unit bldFile="mw/drm/drm_pub/group"/>
+      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
+     </component>
+     <component unofficial="yes" name="drm_plat" long-name="DRM Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
       <unit bldFile="mw/drm/drm_plat/group"/>
-     </component>
-     <component unofficial="yes" name="camese_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="camese_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_common_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="roap_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/roap_api/group"/>
       <!-- <unit bldFile="mw/drm/drm_plat/roap_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="drm_license_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_agents_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_legacy_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-     </component>
-     <component unofficial="yes" name="dcf_repository_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_service_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_rights_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-      <!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="wmdrm_core_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
+     <component unofficial="yes" name="drm_build" long-name="DRM Build" origin-model="foundation">
+      <unit bldFile="mw/drm/group"/>
      </component>
     </collection>
    </block>
    <block name="accesssec" long-name="Access Security" tech_domain="se" level="generic" levels="plugin framework server generic specific">
     <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-     <component name="wapisecuritysettingsui" long-name="WAPI Security Settings UI" origin-model="Foundation">
+     <component name="wapisecuritysettingsui" long-name="WAPI Security Settings UI" origin-model="foundation">
       <unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
      </component>
-     <component name="wepsecuritysettingsui" long-name="WEP Security Eettings UI" origin-model="Foundation">
+     <component name="wepsecuritysettingsui" long-name="WEP Security Eettings UI" origin-model="foundation">
       <unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
      </component>
-     <component name="wifiprotectedsetup" long-name="WIFI Protected Setup" origin-model="Foundation">
+     <component name="wifiprotectedsetup" long-name="WIFI Protected Setup" origin-model="foundation">
       <unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
      </component>
-     <component name="wlaneapsettingsui" long-name="WLAN EAP Settings UI" origin-model="Foundation">
+     <component name="wlaneapsettingsui" long-name="WLAN EAP Settings UI" origin-model="foundation">
       <unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
      </component>
-     <component name="wpasecuritysettingsui" long-name="WPA Security Settings UI" origin-model="Foundation">
+     <component name="wpasecuritysettingsui" long-name="WPA Security Settings UI" origin-model="foundation">
       <unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
      </component>
-     <component unofficial="yes" name="wlansecuritysettings_build" long-name="WLAN Security Settings Build" origin-model="Foundation">
+     <component unofficial="yes" name="wlansecuritysettings_build" long-name="WLAN Security Settings Build" origin-model="foundation">
       <unit bldFile="mw/accesssec/wlansecuritysettings/group"/>
      </component>
     </collection>
     <collection name="eapol" long-name="EAPOL" level="framework">
-     <component name="eapol_framework" long-name="EAPOL Framework" origin-model="Foundation">
+     <component name="eapol_framework" long-name="EAPOL Framework" origin-model="foundation">
       <unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
      </component>
-     <component unofficial="yes" name="eapol_build" long-name="EAPOL Build" origin-model="Foundation">
+     <component unofficial="yes" name="eapol_build" long-name="EAPOL Build" origin-model="foundation">
       <unit bldFile="mw/accesssec/eapol/group"/>
      </component>
     </collection>
-    <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-     <component unofficial="yes" name="eapsim_db_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapleap_db_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaptlspeap_db_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="wep_security_settings_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="eap_type_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-     </component>
-     <component unofficial="yes" name="wapi_db_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eap_vpn_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-     </component>
-     <component unofficial="yes" name="wpa_security_settings_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="accesssec_plat_build" long-name="Access Security Platform API Build" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/group"/>
-     </component>
-     <component unofficial="yes" name="eapmschapv2_db_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapgtc_db_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="wi-fi_protected_setup_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="wapi_security_settings_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_eap_settings_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapaka_db_api" origin-model="Foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-     </component>
-    </collection>
     <collection name="accesssec_info" long-name="Access Security Info" level="specific">
-     <component unofficial="yes" name="accesssec_build" long-name="Access Security Build" origin-model="Foundation">
+     <component unofficial="yes" name="accesssec_plat" long-name="Access Security Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/accesssec/accesssec_plat/group"/>
+     </component>
+     <component unofficial="yes" name="accesssec_build" long-name="Access Security Build" origin-model="foundation">
       <unit bldFile="mw/accesssec/group"/>
      </component>
     </collection>
    </block>
    <block name="locationsrv" long-name="Location Services" tech_domain="lo" level="specific" levels="plugins fw interface">
     <collection name="landmarks" long-name="Landmarks" level="fw">
-     <component name="locationlandmarks" long-name="Location Landmarks" origin-model="Foundation">
+     <component name="locationlandmarks" long-name="Location Landmarks" origin-model="foundation">
       <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
      </component>
-     <component unofficial="yes" name="landmarks_build" long-name="Landmarks Build" origin-model="Foundation">
+     <component unofficial="yes" name="landmarks_build" long-name="Landmarks Build" origin-model="foundation">
       <unit bldFile="mw/locationsrv/landmarks/group"/>
      </component>
     </collection>
     <collection name="locationmapnavfw" long-name="Location Map Nav Framework" level="fw">
-     <component name="library" long-name="Library" origin-model="Foundation">
+     <component name="library" long-name="Library" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
      </component>
-     <component name="aiwprovider" long-name="Application Inter-Working Provider" origin-model="Foundation">
+     <component name="aiwprovider" long-name="Application Inter-Working Provider" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
      </component>
-     <component unofficial="yes" name="locationmapnavfw_build" long-name="Location Map Nav Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="locationmapnavfw_build" long-name="Location Map Nav Framework Build" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
      </component>
     </collection>
     <collection name="locationsystemui" long-name="Location System UI" level="interface">
-     <component name="locationsysui" long-name="Location Sys UI" origin-model="Foundation">
+     <component name="locationsysui" long-name="Location Sys UI" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
      </component>
-     <component unofficial="yes" name="locationsystemui_build" long-name="Location System UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="locationsystemui_build" long-name="Location System UI Build" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationsystemui/group"/>
      </component>
     </collection>
     <collection name="supl" long-name="SUPL" level="plugins">
-     <component name="locationsuplfw" long-name="Location SUPL Framework" origin-model="Foundation">
+     <component name="locationsuplfw" long-name="Location SUPL Framework" origin-model="foundation">
       <unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
      </component>
-     <component name="locationomasuplprotocolhandler" long-name="Location OMA SUPL Protocol Handler" origin-model="Foundation">
+     <component name="locationomasuplprotocolhandler" long-name="Location OMA SUPL Protocol Handler" origin-model="foundation">
       <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
      </component>
-     <component name="locationomasuplpostester" long-name="Location OMA SUPL Pos Tester" origin-model="Foundation">
+     <component name="locationomasuplpostester" long-name="Location OMA SUPL Pos Tester" origin-model="foundation">
       <unit bldFile="mw/locationsrv/supl/locationomasuplpostester/group"/>
      </component>
-     <component unofficial="yes" name="supl_build" long-name="SUPL Build" origin-model="Foundation">
+     <component unofficial="yes" name="supl_build" long-name="SUPL Build" origin-model="foundation">
       <unit bldFile="mw/locationsrv/supl/group"/>
      </component>
     </collection>
     <collection name="locationtriggering" long-name="Location Triggering" level="interface">
-     <component name="ltlogger" long-name="LT Logger" origin-model="Foundation">
+     <component name="ltlogger" long-name="LT Logger" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
      </component>
-     <component name="ltclientlib" long-name="LT Client Lib" origin-model="Foundation">
+     <component name="ltclientlib" long-name="LT Client Lib" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
      </component>
-     <component name="ltmanagementlib" long-name="LT Management Library" origin-model="Foundation">
+     <component name="ltmanagementlib" long-name="LT Management Library" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
      </component>
-     <component name="ltcontainer" long-name="LT Container" origin-model="Foundation">
+     <component name="ltcontainer" long-name="LT Container" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
      </component>
-     <component name="ltserver" long-name="LT Server" origin-model="Foundation">
+     <component name="ltserver" long-name="LT Server" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
      </component>
-     <component name="ltstrategypluginapi" long-name="LT Strategy Plugin API" origin-model="Foundation">
+     <component name="ltstrategypluginapi" long-name="LT Strategy Plugin API" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
      </component>
-     <component name="ltstrategyengine" long-name="LT Strategy Engine" origin-model="Foundation">
+     <component name="ltstrategyengine" long-name="LT Strategy Engine" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
      </component>
-     <component name="ltmovementdetectionpluginapi" long-name="Movement Detection Plugin API" origin-model="Foundation">
+     <component name="ltmovementdetectionpluginapi" long-name="Movement Detection Plugin API" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
      </component>
-     <component name="ltcellidmovementdetector" long-name="Cell ID Movement Detector" origin-model="Foundation">
+     <component name="ltcellidmovementdetector" long-name="Cell ID Movement Detector" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
      </component>
-     <component name="lbtmgmtui" long-name="LBT Management UI" origin-model="Foundation">
+     <component name="lbtmgmtui" long-name="LBT Management UI" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
      </component>
-     <component unofficial="yes" name="locationtriggering_test" long-name="Location Triggering Test" origin-model="Foundation">
+     <component unofficial="yes" name="locationtriggering_test" long-name="Location Triggering Test" origin-model="foundation">
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreatetest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/createtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
-     </component>
-     <component unofficial="yes" name="locationtriggering_build" long-name="Location Triggering Build" origin-model="Foundation">
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
+     </component>
+     <component unofficial="yes" name="locationtriggering_build" long-name="Location Triggering Build" origin-model="foundation">
       <unit bldFile="mw/locationsrv/locationtriggering/group"/>
      </component>
     </collection>
     <collection name="locationsrv_info" long-name="Location Services Info" level="interface">
-     <component unofficial="yes" name="location_notation_preferences_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_local_variation_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-     </component>
-     <component unofficial="yes" name="supl_settings_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_and_navigation_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
+     <component unofficial="yes" name="locsrv_plat" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <unit bldFile="mw/locationsrv/locsrv_plat/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_settings_notifier_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="privacy_notifiers_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_triggering_status_information_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_image_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_centre_registration_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_pub/location_centre_registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_category_definition_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_centre_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="landmarks_database_management_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="np_proxy_configuration_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="genericpositioningplugins" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_search_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_terminal_initiation_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-     </component>
-     <component unofficial="yes" name="locationsrv_test" long-name="Location Services Test" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="location_triggering_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_image_conversion_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_pos_message_plugin_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="oma_supl_asn_codec_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="geocoding_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
-     </component>
-     <component unofficial="yes" name="map_and_navigation_provider_discovery_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_and_navigation_provider_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_supl_configuration_parameter_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="blid_application_satellite_info_api" origin-model="Foundation">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="genericpositioningplugins" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
+     </component>
+     <component unofficial="yes" name="locationsrv_test" long-name="Location Services Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/locationsrv/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="locationsrv_build" long-name="Location Services Build" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/group"/>
+     </component>
+     <component unofficial="yes" name="locsrv_pub" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="locationsrv_build" long-name="Location Services Build" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/group"/>
-     </component>
-     <component unofficial="yes" name="supl_query_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_triggering_management_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_settings_launch_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_api" origin-model="Foundation">
+      <unit bldFile="mw/locationsrv/locsrv_pub/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="map_and_navigation_aiw_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-     </component>
-     <component unofficial="yes" name="psy_configuration_ui_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="supl_network_initiation_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
    <block name="ipconnmgmt" long-name="IP Connectivity Management" tech_domain="dc" level="generic" levels="plugin framework server generic utils">
     <collection name="alwayson_net_plugin" long-name="Always On Net Plugin" level="server">
-     <component name="pdpcontextmanager2" long-name="PDP Context Manager 2" origin-model="Foundation">
+     <component name="pdpcontextmanager2" long-name="PDP Context Manager 2" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
      </component>
-     <component unofficial="yes" name="alwayson_net_plugin_build" long-name="Always On Net Plugin Build" origin-model="Foundation">
+     <component unofficial="yes" name="alwayson_net_plugin_build" long-name="Always On Net Plugin Build" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/group"/>
      </component>
     </collection>
     <collection name="bearermanagement" long-name="Bearer Management" level="framework">
-     <component name="mpm" long-name="MPM" origin-model="Foundation">
+     <component name="mpm" long-name="MPM" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
      </component>
-     <component name="bearermanager" long-name="Bearer Manager" origin-model="Foundation">
+     <component name="bearermanager" long-name="Bearer Manager" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/bearermanagement/bearermanager/group"/>
      </component>
-     <component unofficial="yes" name="bearermanagement_build" long-name="Bearer Management Build" origin-model="Foundation">
+     <component unofficial="yes" name="bearermanagement_build" long-name="Bearer Management Build" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/bearermanagement/group"/>
      </component>
     </collection>
     <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-     <component name="connectionmonitorplugin" long-name="Connection Monitor Plugin" origin-model="Foundation">
+     <component name="connectionmonitorplugin" long-name="Connection Monitor Plugin" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
      </component>
-     <component name="connectionmonitorui" long-name="Connection Monitor UI" origin-model="Foundation">
+     <component name="connectionmonitorui" long-name="Connection Monitor UI" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
      </component>
-     <component name="connmon" long-name="Connection Monitor" origin-model="Foundation">
+     <component name="connmon" long-name="Connection Monitor" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
      </component>
-     <component name="connmonext" long-name="Connection Monitor Ext" origin-model="Foundation">
+     <component name="connmonext" long-name="Connection Monitor Ext" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
      </component>
-     <component unofficial="yes" name="connectionmonitoring_build" long-name="Connection Monitoring Build" origin-model="Foundation">
+     <component unofficial="yes" name="connectionmonitoring_build" long-name="Connection Monitoring Build" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/connectionmonitoring/group"/>
      </component>
     </collection>
     <collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-     <component name="apcontrollistplugin" long-name="Access Point Control List Plugin" origin-model="Foundation">
+     <component name="apcontrollistplugin" long-name="Access Point Control List Plugin" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
      </component>
     </collection>
     <collection name="apengine" long-name="Application Engine" level="framework">
-     <component name="apeng" long-name="Access Point Engine" origin-model="Foundation">
+     <component name="apeng" long-name="Access Point Engine" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
      </component>
-     <component name="apsettingshandlerui" long-name="Access Point Settings Handler UI" origin-model="Foundation">
+     <component name="apsettingshandlerui" long-name="Access Point Settings Handler UI" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
      </component>
-     <component name="apsettingsplugin" long-name="Access Point Settings Plugin" origin-model="Foundation">
+     <component name="apsettingsplugin" long-name="Access Point Settings Plugin" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
      </component>
-     <component unofficial="yes" name="apengine_build" long-name="Application Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="apengine_build" long-name="Application Engine Build" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/apengine/group"/>
      </component>
     </collection>
     <collection name="cmmanager" long-name="CM Manager" level="framework">
-     <component name="cmmgr" long-name="CM Manager" origin-model="Foundation">
+     <component name="cmmgr" long-name="CM Manager" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
      </component>
     </collection>
     <collection name="dbcreator" long-name="DB Creator" level="utils">
-     <component name="commsdatcreator" long-name="Comms Database Creator" origin-model="Foundation">
+     <component name="commsdatcreator" long-name="Comms Database Creator" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
      </component>
-     <component name="commsdatcreatorrfsplugin" long-name="Comms Database Creator RFS Pluginr" origin-model="Foundation">
+     <component name="commsdatcreatorrfsplugin" long-name="Comms Database Creator RFS Pluginr" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
      </component>
-     <component name="commsdatstartup" long-name="Comms Database Startup" origin-model="Foundation">
+     <component name="commsdatstartup" long-name="Comms Database Startup" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
      </component>
-     <component name="dbcreatorexe" long-name="DB Creator" origin-model="Foundation">
+     <component name="dbcreatorexe" long-name="DB Creator" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
      </component>
-     <component unofficial="yes" name="dbcreator_build" long-name="DB Creator Build" origin-model="Foundation">
+     <component unofficial="yes" name="dbcreator_build" long-name="DB Creator Build" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
      </component>
     </collection>
     <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-     <component name="connectiondialogs" long-name="ConnectionDialogs" origin-model="Foundation">
+     <component name="connectiondialogs" long-name="ConnectionDialogs" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
      </component>
     </collection>
     <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-     <component unofficial="yes" name="data_connection_log_counters_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
-     </component>
-     <component unofficial="yes" name="commsdat_wlan_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_monitor_server_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="disconnect_dialog_disable_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-     </component>
-     <component unofficial="yes" name="agent_dialog_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="disconnect_dialog_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="ipconnmgmt_build" long-name="IP Connectivity Management Build" origin-model="Foundation">
+     <component unofficial="yes" name="ipconnmgmt_build" long-name="IP Connectivity Management Build" origin-model="foundation">
       <unit bldFile="mw/ipconnmgmt/group"/>
      </component>
-     <component unofficial="yes" name="connection_monitor_extension_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_engine_misc_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_settings_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_connection_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_ui_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_settings_handler_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="bearer_settings_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="pdpcontextmanager2_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpm_connect_screen_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="pdpcontextmanager2_reset_factory_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpm_default_connection_api" origin-model="Foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+     <component unofficial="yes" name="ipcm_pub" class="api" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/group"/>
+     </component>
+     <component unofficial="yes" name="ipcm_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="netprotocols" long-name="High-level Internet Protocols" tech_domain="dc" level="generic" levels="plugin framework server generic specific">
     <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-     <component name="httpfiltercommon" long-name="HTTP Filter Common" origin-model="Foundation">
+     <component name="httpfiltercommon" long-name="HTTP Filter Common" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
      </component>
-     <component name="cookie" long-name="Cookie" origin-model="Foundation">
+     <component name="cookie" long-name="Cookie" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
      </component>
-     <component name="deflatefilter" long-name="Deflate Filter" origin-model="Foundation">
+     <component name="deflatefilter" long-name="Deflate Filter" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
      </component>
-     <component name="httpfilteracceptheader" long-name="HTTP Filter Accept Header" origin-model="Foundation">
+     <component name="httpfilteracceptheader" long-name="HTTP Filter Accept Header" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
      </component>
-     <component name="httpfilterauthentication" long-name="HTTP Filter Authentication" origin-model="Foundation">
+     <component name="httpfilterauthentication" long-name="HTTP Filter Authentication" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
      </component>
-     <component name="httpfilterconnhandler" long-name="HTTP Filter Conn Handler" origin-model="Foundation">
+     <component name="httpfilterconnhandler" long-name="HTTP Filter Conn Handler" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
      </component>
-     <component name="httpfilteriop" long-name="HTTP Filter Iop" origin-model="Foundation">
+     <component name="httpfilteriop" long-name="HTTP Filter Iop" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
      </component>
-     <component name="httpfilterproxy" long-name="HTTP Filter Proxy" origin-model="Foundation">
+     <component name="httpfilterproxy" long-name="HTTP Filter Proxy" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
      </component>
-     <component name="uaproffilter" long-name="UAProf Filter" origin-model="Foundation">
+     <component name="uaproffilter" long-name="UAProf Filter" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
      </component>
-     <component unofficial="yes" name="httpfilters_build" long-name="HTTP Filters Build" origin-model="Foundation">
+     <component unofficial="yes" name="httpfilters_build" long-name="HTTP Filters Build" origin-model="foundation">
       <unit bldFile="mw/netprotocols/httpfilters/group"/>
      </component>
     </collection>
@@ -4770,55 +3460,44 @@
      </component>
     </collection>
     <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-     <component unofficial="yes" name="netprotocols_build" long-name="High-level Internet Protocols Build" origin-model="Foundation">
+     <component unofficial="yes" name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
+     </component>
+     <component unofficial="yes" name="netprotocols_build" long-name="High-level Internet Protocols Build" origin-model="foundation">
       <unit bldFile="mw/netprotocols/group"/>
      </component>
     <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-     <component unofficial="yes" name="http_cache_mgr_api" origin-model="Foundation">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-     </component>
-     <component unofficial="yes" name="http_filters_api" origin-model="Foundation">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-     </component>
-     <component unofficial="yes" name="netprotocols_plat_build" long-name="High-level Internet Protocols Platform API Build" origin-model="Foundation">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
-     </component>
-     <component unofficial="yes" name="cookie_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="ipappprotocols" long-name="IP App Protocols" tech_domain="dc" level="generic" levels="plugin framework conn server">
     <collection name="rtp" long-name="RTP" level="server">
-     <component name="srtpstack" long-name="SRTP Stack" origin-model="Foundation">
+     <component name="srtpstack" long-name="SRTP Stack" origin-model="foundation">
       <unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
       <!-- <unit bldFile="mw/ipappprotocols/rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
      </component>
-     <component name="rtpstack" long-name="RTP Stack" origin-model="Foundation">
+     <component name="rtpstack" long-name="RTP Stack" origin-model="foundation">
       <unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
       <!-- <unit bldFile="mw/ipappprotocols/rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
      </component>
     </collection>
     <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-     <component name="sippwlanplugin" long-name="SIP WLAN Plugin" origin-model="Foundation">
+     <component name="sippwlanplugin" long-name="SIP WLAN Plugin" origin-model="foundation">
       <unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
      </component>
-     <component name="sippsipsettingsui" long-name="SIP Settings UI" origin-model="Foundation">
+     <component name="sippsipsettingsui" long-name="SIP Settings UI" origin-model="foundation">
       <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
       <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
      </component>
-     <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter" origin-model="Foundation">
+     <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter" origin-model="foundation">
       <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
       <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
      </component>
-     <component name="sippsystemstatemonitor" long-name="SIP System State Monitor" origin-model="Foundation">
+     <component name="sippsystemstatemonitor" long-name="SIP System State Monitor" origin-model="foundation">
       <unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
      </component>
-     <component name="sippsipadapter" long-name="SIP Adapter" origin-model="Foundation">
+     <component name="sippsipadapter" long-name="SIP Adapter" origin-model="foundation">
       <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
       <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group"/> -->
      </component>
@@ -4838,320 +3517,306 @@
      </component>
     </collection>
     <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
-     <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build" origin-model="Foundation">
+     <component unofficial="yes" name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/group"/>
+     </component>
+     <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build" origin-model="foundation">
       <unit bldFile="mw/ipappprotocols/group"/>
      </component>
     <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="server">
-     <component unofficial="yes" name="srtp_api" origin-model="Foundation">
-      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtprtcp_api" origin-model="Foundation">
-      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="wirelessacc" long-name="Wireless Access" tech_domain="dc" level="specific" levels="framework generic ui">
     <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
-     <component name="hsserver" long-name="HotSpot Server" origin-model="Foundation"/>
-     <component name="hsclient" long-name="HS Client" origin-model="Foundation"/>
-     <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service" origin-model="Foundation">
+     <component name="hsserver" long-name="HotSpot Server" origin-model="foundation"/>
+     <component name="hsclient" long-name="HS Client" origin-model="foundation"/>
+     <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service" origin-model="foundation">
       <!-- <unit bldFile="mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/> -->
      </component>
-     <component name="ictsdialogs" long-name="ICTS Dialogs" origin-model="Foundation">
+     <component name="ictsdialogs" long-name="ICTS Dialogs" origin-model="foundation">
       <!-- <unit bldFile="mw/wirelessacc/hotspotfw/ictsdialogs/group"/> -->
      </component>
-     <component name="hspluginforagent" long-name="HotSpot Plugin For Agent" origin-model="Foundation">
+     <component name="hspluginforagent" long-name="HotSpot Plugin For Agent" origin-model="foundation">
       <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hspluginforagent/group"/> -->
      </component>
-     <component name="hsbrowser" long-name="HotSpot Browser" origin-model="Foundation">
+     <component name="hsbrowser" long-name="HotSpot Browser" origin-model="foundation">
       <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hsbrowser/group"/> -->
      </component>
-     <component unofficial="yes" name="hotspotfw_build" long-name="Hotspot Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="hotspotfw_build" long-name="Hotspot Framework Build" origin-model="foundation">
       <unit bldFile="mw/wirelessacc/hotspotfw/group"/>
      </component>
     </collection>
     <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-     <component name="wlanplugin" long-name="WLAN Plugin" origin-model="Foundation">
+     <component name="wlanplugin" long-name="WLAN Plugin" origin-model="foundation">
       <unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
      </component>
-     <component name="wlansettingsui" long-name="WLAN Settings UI" origin-model="Foundation">
+     <component name="wlansettingsui" long-name="WLAN Settings UI" origin-model="foundation">
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
      </component>
-     <component name="wlansniffer" long-name="WLAN Sniffer" origin-model="Foundation">
+     <component name="wlansniffer" long-name="WLAN Sniffer" origin-model="foundation">
       <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
      </component>
-     <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin" origin-model="Foundation">
+     <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin" origin-model="foundation">
       <unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
      </component>
-     <component unofficial="yes" name="wlanutilities_build" long-name="WLAN Utilities Build" origin-model="Foundation">
+     <component unofficial="yes" name="wlanutilities_build" long-name="WLAN Utilities Build" origin-model="foundation">
       <unit bldFile="mw/wirelessacc/wlanutilities/group"/>
      </component>
     </collection>
     <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-     <component unofficial="yes" name="hotspot_framework_client_api" origin-model="Foundation">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="hotspot_framework_client_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_connectivity_test_service_api" origin-model="Foundation">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_connectivity_test_service_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build" origin-model="Foundation">
+     <component unofficial="yes" name="hsfw_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/hsfw_plat/group"/>
+     </component>
+     <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build" origin-model="foundation">
       <unit bldFile="mw/wirelessacc/group"/>
      </component>
     </collection>
    </block>
    <block name="vpnclient" long-name="VPN Client" tech_domain="dc" level="specific" levels="engine ui api">
     <collection name="vpnclient_sis" long-name="VPN Client Sis" level="api">
-     <component name="ce_sis" long-name="CE SIS" origin-model="Foundation">
+     <component name="ce_sis" long-name="CE SIS" origin-model="foundation">
       <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/ce_sis/group"/> -->
      </component>
-     <component name="stub_sis" long-name="Stub Sis" origin-model="Foundation">
+     <component name="stub_sis" long-name="Stub Sis" origin-model="foundation">
       <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/stub_sis/group"/> -->
      </component>
-     <component unofficial="yes" name="vpnclient_sis_build" origin-model="Foundation">
+     <component unofficial="yes" name="vpnclient_sis_build" origin-model="foundation">
       <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/group"/> -->
      </component>
     </collection>
     <collection name="vpnengine" long-name="VPN Engine" level="engine">
-     <component name="eventmediatorapi" long-name="Event Mediator API" origin-model="Foundation">
+     <component name="eventmediatorapi" long-name="Event Mediator API" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
      </component>
-     <component name="eventviewer" long-name="Event Viewer" origin-model="Foundation">
+     <component name="eventviewer" long-name="Event Viewer" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
      </component>
-     <component name="vpnins" long-name="VPN Ins" origin-model="Foundation">
+     <component name="vpnins" long-name="VPN Ins" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
      </component>
-     <component name="acuagenttransport" long-name="ACU Agent Transport" origin-model="Foundation">
+     <component name="acuagenttransport" long-name="ACU Agent Transport" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/acuagenttransport/group"/>
      </component>
-     <component name="acupluginlib" long-name="ACU Plugin Lib" origin-model="Foundation">
+     <component name="acupluginlib" long-name="ACU Plugin Lib" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/acupluginlib/group"/>
      </component>
-     <component name="ikepolparser" long-name="IKE Policy Parser" origin-model="Foundation">
+     <component name="ikepolparser" long-name="IKE Policy Parser" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
      </component>
-     <component name="utlbase64" long-name="UTL Base64" origin-model="Foundation">
+     <component name="utlbase64" long-name="UTL Base64" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
      </component>
-     <component name="utlcrypto" long-name="UTL Crypto" origin-model="Foundation">
+     <component name="utlcrypto" long-name="UTL Crypto" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
      </component>
-     <component name="utlxml" long-name="UTL XML" origin-model="Foundation">
+     <component name="utlxml" long-name="UTL XML" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
      </component>
-     <component name="utlpkcs10" long-name="UTL PKCS10" origin-model="Foundation">
+     <component name="utlpkcs10" long-name="UTL PKCS10" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
      </component>
-     <component name="pkiserviceapi" long-name="PKI Service API" origin-model="Foundation">
+     <component name="pkiserviceapi" long-name="PKI Service API" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
      </component>
-     <component name="acuagentcrypto" long-name="ACU Agent Crypto" origin-model="Foundation">
+     <component name="acuagentcrypto" long-name="ACU Agent Crypto" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/acuagentcrypto/group"/>
      </component>
-     <component name="vpnextapi" long-name="VPN Ext. API" origin-model="Foundation">
+     <component name="vpnextapi" long-name="VPN Ext. API" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/vpnextapi/group"/>
      </component>
-     <component name="ikecert" long-name="Ike Cert" origin-model="Foundation">
+     <component name="ikecert" long-name="Ike Cert" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
      </component>
-     <component name="kmdapi" long-name="KMD API" origin-model="Foundation">
+     <component name="kmdapi" long-name="KMD API" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
      </component>
-     <component name="kmdserver" long-name="Kmd Server" origin-model="Foundation">
+     <component name="kmdserver" long-name="Kmd Server" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
      </component>
-     <component name="ikeutils" long-name="IKE Utils" origin-model="Foundation">
+     <component name="ikeutils" long-name="IKE Utils" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
      </component>
-     <component name="ikev1lib" long-name="Ikev1 Library" origin-model="Foundation">
+     <component name="ikev1lib" long-name="Ikev1 Library" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
      </component>
-     <component name="ikev2lib" long-name="Ikev2 Library" origin-model="Foundation">
+     <component name="ikev2lib" long-name="Ikev2 Library" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
      </component>
-     <component name="acuagentmessage" long-name="ACU Agent Message" origin-model="Foundation">
+     <component name="acuagentmessage" long-name="ACU Agent Message" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/acuagentmessage/group"/>
      </component>
-     <component name="acuagent" long-name="ACU Agent" origin-model="Foundation">
+     <component name="acuagent" long-name="ACU Agent" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/acuagent/group"/>
      </component>
-     <component name="vpnawapi" long-name="VPN AW API" origin-model="Foundation">
+     <component name="vpnawapi" long-name="VPN AW API" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/vpnawapi/group"/>
      </component>
-     <component name="vpnipsecpolparser" long-name="VPN Ipsecpolparser" origin-model="Foundation">
+     <component name="vpnipsecpolparser" long-name="VPN Ipsecpolparser" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
      </component>
-     <component name="sit" long-name="Sit" origin-model="Foundation">
+     <component name="sit" long-name="Sit" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
      </component>
-     <component name="acuins" long-name="ACU INS" origin-model="Foundation">
+     <component name="acuins" long-name="ACU INS" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/acuins/group"/>
      </component>
-     <component name="vpntcwrapper" long-name="VP NTC Wrapper" origin-model="Foundation">
+     <component name="vpntcwrapper" long-name="VP NTC Wrapper" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
      </component>
-     <component name="eventmediator" long-name="Event Mediator" origin-model="Foundation">
+     <component name="eventmediator" long-name="Event Mediator" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
      </component>
-     <component name="ipsecacuplugin" long-name="IPseca Cu Plugin" origin-model="Foundation">
+     <component name="ipsecacuplugin" long-name="IPseca Cu Plugin" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/ipsecacuplugin/group"/>
      </component>
-     <component name="pkiservice" long-name="PKI Service" origin-model="Foundation">
+     <component name="pkiservice" long-name="PKI Service" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
      </component>
-     <component name="vpnconnagt" long-name="VPN Connagt" origin-model="Foundation">
+     <component name="vpnconnagt" long-name="VPN Connagt" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
      </component>
-     <component name="vpnmanager" long-name="VPN Manager" origin-model="Foundation">
+     <component name="vpnmanager" long-name="VPN Manager" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
      </component>
-     <component name="vpncleaner" long-name="VPN Cleaner" origin-model="Foundation">
+     <component name="vpncleaner" long-name="VPN Cleaner" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
      </component>
-     <component name="utlpkcs12" long-name="UTL PKCS12" origin-model="Foundation">
+     <component name="utlpkcs12" long-name="UTL PKCS12" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
      </component>
-     <component name="dmadengine" long-name="DM Adapter Engine" origin-model="Foundation">
+     <component name="dmadengine" long-name="DM Adapter Engine" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
      </component>
-     <component name="dmadipsecvpn" long-name="DM Adapter IPsec VPN" origin-model="Foundation">
+     <component name="dmadipsecvpn" long-name="DM Adapter IPsec VPN" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
      </component>
-     <component name="dmadpki" long-name="DM Adapter PKI" origin-model="Foundation">
+     <component name="dmadpki" long-name="DM Adapter PKI" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
      </component>
-     <component name="ikesocketplugin" long-name="IKE Socket Plugin" origin-model="Foundation">
+     <component name="ikesocketplugin" long-name="IKE Socket Plugin" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnengine/ikesocketplugin/group"/>
      </component>
-     <component name="vpnnif" long-name="VPN NIF" origin-model="Foundation"/>
+     <component name="vpnnif" long-name="VPN NIF" origin-model="foundation"/>
     </collection>
     <collection name="vpnui" long-name="VPN UI" level="ui">
-     <component name="vpnecomnotifier" long-name="VPN ECOM Notifier" origin-model="Foundation">
+     <component name="vpnecomnotifier" long-name="VPN ECOM Notifier" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
      </component>
-     <component name="vpndialogmanager" long-name="VPN Dialog Manager" origin-model="Foundation">
+     <component name="vpndialogmanager" long-name="VPN Dialog Manager" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
      </component>
-     <component name="vpnmanagementui" long-name="VPN Management UI" origin-model="Foundation">
+     <component name="vpnmanagementui" long-name="VPN Management UI" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
      </component>
-     <component name="vpnpolins" long-name="VPN Policy Ins" origin-model="Foundation">
+     <component name="vpnpolins" long-name="VPN Policy Ins" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
      </component>
-     <component name="vpnpolicyrecognizer" long-name="VPN Policy Recognizer" origin-model="Foundation">
+     <component name="vpnpolicyrecognizer" long-name="VPN Policy Recognizer" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
      </component>
     </collection>
     <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-     <component name="vpnapi.dll=binary" long-name="VPN API" origin-model="Foundation">
+     <component name="vpnapi" long-name="VPN API" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
      </component>
     </collection>
     <collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-     <component unofficial="yes" name="vpnclient_help" long-name="VPN Client Help" origin-model="Foundation">
+     <component unofficial="yes" name="vpnclient_help" long-name="VPN Client Help" origin-model="foundation">
       <unit bldFile="mw/vpnclient/help/group"/>
      </component>
-     <component unofficial="yes" name="vpnclient_build" long-name="VPN Client Build" origin-model="Foundation">
+     <component unofficial="yes" name="vpnclient_build" long-name="VPN Client Build" origin-model="foundation">
       <unit bldFile="mw/vpnclient/group"/>
      </component>
-     <component unofficial="yes" name="vpnapi" origin-model="Foundation">
+     <component unofficial="yes" name="vpnc_plat" class="api" origin-model="foundation">
       <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
      </component>
     </collection>
    </block>
    <block name="ipappsrv" long-name="IP App Services" tech_domain="vc" level="specific" levels="framework  generic server  conn plugin">
     <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-     <component name="mmccinterface" long-name="MMCC Interface" origin-model="Foundation">
+     <component name="mmccinterface" long-name="MMCC Interface" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/tsrc/ut_interface/group"/> -->
      </component>
-     <component name="mmccjitterbuffer" long-name="Jitter Buffer" origin-model="Foundation">
+     <component name="mmccjitterbuffer" long-name="Jitter Buffer" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/tsrc/ut_jitterbuffer/group"/> -->
      </component>
-     <component name="mmccqoscontroller" long-name="QoS Controller" origin-model="Foundation">
+     <component name="mmccqoscontroller" long-name="QoS Controller" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/tsrc/ut_qoscontroller/group"/> -->
      </component>
-     <component name="mmccmultiplexer" long-name="MMCC Multiplexer" origin-model="Foundation">
+     <component name="mmccmultiplexer" long-name="MMCC Multiplexer" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/tsrc/ut_multiplexer/group"/> -->
      </component>
-     <component name="mmccsubcontroller" long-name="MMCC Subcontroller" origin-model="Foundation">
+     <component name="mmccsubcontroller" long-name="MMCC Subcontroller" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_rtpmediaclock/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/group"/> -->
      </component>
-     <component name="mmcccontroller" long-name="MMCC Controller" origin-model="Foundation">
+     <component name="mmcccontroller" long-name="MMCC Controller" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/tsrc/ut_controller/group"/> -->
      </component>
-     <component name="mmccredpayloadformat" long-name="RED Payload Format" origin-model="Foundation">
+     <component name="mmccredpayloadformat" long-name="RED Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/tsrc/ut_redpayloadformat/group"/> -->
      </component>
-     <component name="mmccamrpayloadformat" long-name="AMR Payload Format" origin-model="Foundation">
+     <component name="mmccamrpayloadformat" long-name="AMR Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/tsrc/ut_amrpayloadformat/group"/> -->
      </component>
-     <component name="mmccg711payloadformat" long-name="G711 Payload Format" origin-model="Foundation">
+     <component name="mmccg711payloadformat" long-name="G711 Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/tsrc/ut_g711payloadformat/group"/> -->
      </component>
-     <component name="mmccg729payloadformat" long-name="G729 Payload Format" origin-model="Foundation">
+     <component name="mmccg729payloadformat" long-name="G729 Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/tsrc/ut_g729payloadformat/group"/> -->
      </component>
-     <component name="mmccilbcpayloadformat" long-name="ILBC Payload Format" origin-model="Foundation">
+     <component name="mmccilbcpayloadformat" long-name="ILBC Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/tsrc/ut_ilbcpayloadformat/group"/> -->
      </component>
-     <component name="mmccdtmfpayloadformat" long-name="DTMF Payload Format" origin-model="Foundation">
+     <component name="mmccdtmfpayloadformat" long-name="DTMF Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/tsrc/ut_dtmfpayloadformat/group"/> -->
      </component>
-     <component name="mmccrtpsourcesink" long-name="RTP Source Sink" origin-model="Foundation">
+     <component name="mmccrtpsourcesink" long-name="RTP Source Sink" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/group"/> -->
      </component>
-     <component name="mmccvideosourcesink" long-name="Video Source Sink" origin-model="Foundation">
+     <component name="mmccvideosourcesink" long-name="Video Source Sink" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/tsrc/ut_videosourcesink/group"/> -->
      </component>
-     <component name="mmcch263payloadformat" long-name="H263 Payload Format" origin-model="Foundation">
+     <component name="mmcch263payloadformat" long-name="H263 Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/tsrc/ut_h263payloadformat/group"/> -->
      </component>
-     <component name="mmccanypayloadformat" long-name="ANY Payload Format" origin-model="Foundation">
+     <component name="mmccanypayloadformat" long-name="ANY Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/tsrc/ut_anypayloadformat/group"/> -->
      </component>
-     <component name="mmccfilesourcesink" long-name="MMCC File Source Sink" origin-model="Foundation">
+     <component name="mmccfilesourcesink" long-name="MMCC File Source Sink" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/tsrc/ut_filesourcesink/group"/> -->
      </component>
-     <component name="mmccanysourcesink" long-name="Anysource Sink" origin-model="Foundation">
+     <component name="mmccanysourcesink" long-name="Anysource Sink" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/tsrc/ut_anysourcesink/group"/> -->
      </component>
-     <component name="mmccavcpayloadformat" long-name="AVC Payload Format" origin-model="Foundation">
+     <component name="mmccavcpayloadformat" long-name="AVC Payload Format" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/tsrc/ut_avcpayloadformat/group"/> -->
      </component>
-     <component unofficial="yes" name="multimediacommscontroller_build" long-name="Multimedia Comms Controller Build" origin-model="Foundation">
+     <component unofficial="yes" name="multimediacommscontroller_build" long-name="Multimedia Comms Controller Build" origin-model="foundation">
       <unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
      </component>
-     <component unofficial="yes" name="multimediacommscontroller_test" long-name="Multimedia Comms Controller Test" origin-model="Foundation">
+     <component unofficial="yes" name="multimediacommscontroller_test" long-name="Multimedia Comms Controller Test" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/dptests/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/clienttests/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/componenttests/group"/> -->
@@ -5162,389 +3827,265 @@
      </component>
     </collection>
     <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-     <component name="mmcecli" long-name="MMCE Client" origin-model="Foundation">
+     <component name="mmcecli" long-name="MMCE Client" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcecli/group"/> -->
      </component>
-     <component name="mmcefloorctrlengine" long-name="MMCE Foor Control Engine" origin-model="Foundation">
+     <component name="mmcefloorctrlengine" long-name="MMCE Foor Control Engine" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin2/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/group"/> -->
      </component>
-     <component name="mmcefloorctrlplugin" long-name="MMCE Foor Control Plugin" origin-model="Foundation">
+     <component name="mmcefloorctrlplugin" long-name="MMCE Foor Control Plugin" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/tsrc/ut_floorctrlplugin/group"/> -->
      </component>
-     <component name="mmcesrv" long-name="MMCE Server" origin-model="Foundation">
+     <component name="mmcesrv" long-name="MMCE Server" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/sip_stub/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmcemediamanager/tsrc/ut_mediamanager/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/group"/> -->
      </component>
-     <component unofficial="yes" name="multimediacommsengine_build" long-name="Multimedia Comms Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="multimediacommsengine_build" long-name="Multimedia Comms Engine Build" origin-model="foundation">
       <unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
      </component>
-     <component unofficial="yes" name="multimediacommsengine_test" long-name="Multimedia Comms Engine Test" origin-model="Foundation">
+     <component unofficial="yes" name="multimediacommsengine_test" long-name="Multimedia Comms Engine Test" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
      </component>
     </collection>
     <collection name="natfw" long-name="NAT Framework" level="framework">
-     <component name="natfwsettings" long-name="NAT Framework Settings" origin-model="Foundation">
+     <component name="natfwsettings" long-name="NAT Framework Settings" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group"/> -->
      </component>
-     <component name="natfwconnectionmultiplexer" long-name="NAT Framework Connection Multiplexer" origin-model="Foundation">
+     <component name="natfwconnectionmultiplexer" long-name="NAT Framework Connection Multiplexer" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/muxtestconsole/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group"/> -->
      </component>
-     <component name="natfwclient" long-name="NAT Framework Client" origin-model="Foundation">
+     <component name="natfwclient" long-name="NAT Framework Client" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/tsrc/ut_natfwclient/group"/> -->
      </component>
-     <component name="natfwsocketmediaconnwrapper" long-name="Socket Media Connection Wrapper" origin-model="Foundation">
+     <component name="natfwsocketmediaconnwrapper" long-name="Socket Media Connection Wrapper" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group"/> -->
      </component>
-     <component name="natfwunsaf_protocols" long-name="NAT Framework Unsaf Protocols" origin-model="Foundation">
+     <component name="natfwunsaf_protocols" long-name="NAT Framework Unsaf Protocols" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group"/> -->
      </component>
-     <component name="natfwstunturnclient" long-name="NAT Framework Stun Turn Client" origin-model="Foundation">
+     <component name="natfwstunturnclient" long-name="NAT Framework Stun Turn Client" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group"/> -->
      </component>
-     <component name="natfwstunserver" long-name="NAT Framework Stun Server" origin-model="Foundation">
+     <component name="natfwstunserver" long-name="NAT Framework Stun Server" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group"/> -->
      </component>
-     <component name="natfwicecandidatehandler" long-name="NAT Framework Ice Candidate Handler" origin-model="Foundation">
+     <component name="natfwicecandidatehandler" long-name="NAT Framework Ice Candidate Handler" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group"/> -->
      </component>
-     <component name="natfwstunplugin" long-name="NAT Framework STUN Plugin" origin-model="Foundation">
+     <component name="natfwstunplugin" long-name="NAT Framework STUN Plugin" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group"/> -->
      </component>
-     <component name="natfwturnplugin" long-name="NAT Framework TURN Plugin" origin-model="Foundation">
+     <component name="natfwturnplugin" long-name="NAT Framework TURN Plugin" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group"/> -->
      </component>
-     <component unofficial="yes" name="natfw_build" long-name="NAT Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="natfw_build" long-name="NAT Framework Build" origin-model="foundation">
       <unit bldFile="mw/ipappsrv/natfw/group"/>
      </component>
-     <component unofficial="yes" name="natfw_test" long-name="NAT Framework Test" origin-model="Foundation">
+     <component unofficial="yes" name="natfw_test" long-name="NAT Framework Test" origin-model="foundation">
       <!-- <unit bldFile="mw/ipappsrv/natfw/tsrc/natfwtestconsoles/natfwtestconsole/group"/> -->
      </component>
     </collection>
     <collection name="natplugins" long-name="NAT Plugins" level="plugin">
-     <component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter" origin-model="Foundation">
+     <component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter" origin-model="foundation">
       <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
       <!-- <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/tsrc/t_natfwtraversaladapter/group"/> -->
      </component>
-     <component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter" origin-model="Foundation">
+     <component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter" origin-model="foundation">
       <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
       <!-- <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/tsrc/ut_cnsmldmnatfwtraversaladapter/group"/> -->
      </component>
-     <component name="natptraversalcontroller" long-name="NAT Traversal Controller" origin-model="Foundation">
+     <component name="natptraversalcontroller" long-name="NAT Traversal Controller" origin-model="foundation">
       <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
       <!-- <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/tsrc/ut_nattraversalcontroller/group"/> -->
      </component>
-     <component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider" origin-model="Foundation">
+     <component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider" origin-model="foundation">
       <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
       <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/testconsole/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/ut_natfwsdpprovider/group"/> -->
      </component>
     </collection>
     <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-     <component unofficial="yes" name="ipappsrv_build" long-name="IP App Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/group"/>
+     </component>
+     <component unofficial="yes" name="ipappsrv_build" long-name="IP App Services Build" origin-model="foundation">
       <unit bldFile="mw/ipappsrv/group"/>
      </component>
     </collection>
-    <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="floor_control_api" origin-model="Foundation">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_control_api" origin-model="Foundation">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="nat_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="transcoder_api" origin-model="Foundation">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-     </component>
-     <component unofficial="yes" name="comms_event_api" origin-model="Foundation">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_comms_api" origin-model="Foundation">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="phonesrv" long-name="Telephony and SIM Services" tech_domain="vc" level="specific" levels="plugin framework server generic specific">
     <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-     <component name="phonecmdhnlr" long-name="Phone Command Handler" origin-model="Foundation">
+     <component name="phonecmdhnlr" long-name="Phone Command Handler" origin-model="foundation">
       <unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
      </component>
     </collection>
     <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-     <component name="CbsServer" long-name="CBS Server" origin-model="Foundation">
+     <component name="cbsserver" long-name="CBS Server" origin-model="foundation">
       <unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
      </component>
-     <component name="cbsui" long-name="CBS UI" origin-model="Foundation">
+     <component name="cbsui" long-name="CBS UI" origin-model="foundation">
       <unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
      </component>
     </collection>
     <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-     <component name="callprovider" long-name="Call Provider" origin-model="Foundation">
+     <component name="callprovider" long-name="Call Provider" origin-model="foundation">
       <unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
      </component>
-     <component name="cce" long-name="CCE" origin-model="Foundation">
+     <component name="cce" long-name="CCE" origin-model="foundation">
       <unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
      </component>
-     <component name="spsettings" long-name="SP Settings" origin-model="Foundation">
+     <component name="spsettings" long-name="SP Settings" origin-model="foundation">
       <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
       <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
       <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
      </component>
-     <component name="cenrepdatabase" long-name="Cenrep Database" origin-model="Foundation">
+     <component name="cenrepdatabase" long-name="Cenrep Database" origin-model="foundation">
       <unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
      </component>
-     <component name="serviceselector" long-name="Service Selector" origin-model="Foundation">
+     <component name="serviceselector" long-name="Service Selector" origin-model="foundation">
       <unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
      </component>
-     <component name="csplugin" long-name="CS Plugin" origin-model="Foundation">
+     <component name="csplugin" long-name="CS Plugin" origin-model="foundation">
       <unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
      </component>
-     <component unofficial="yes" name="convergedcallengine_build" long-name="Converged Call Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="convergedcallengine_build" long-name="Converged Call Engine Build" origin-model="foundation">
       <unit bldFile="mw/phonesrv/convergedcallengine/group"/>
      </component>
     </collection>
     <collection name="networkhandling" long-name="Network Handling" level="plugin">
-     <component name="networkhandlingengine" long-name="Network Handling Engine" origin-model="Foundation">
+     <component name="networkhandlingengine" long-name="Network Handling Engine" origin-model="foundation">
       <unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
      </component>
     </collection>
     <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-     <component name="EnPolicy" long-name="En Policy" origin-model="Foundation">
+     <component name="enpolicy" long-name="En Policy" origin-model="foundation">
       <unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
      </component>
-     <component name="aiwdialdata" long-name="AIW Dial Data" origin-model="Foundation">
+     <component name="aiwdialdata" long-name="AIW Dial Data" origin-model="foundation">
       <unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
      </component>
-     <component name="dialutils" long-name="Dial Utils" origin-model="Foundation">
+     <component name="dialutils" long-name="Dial Utils" origin-model="foundation">
       <unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
      </component>
-     <component name="phoneclient" long-name="Phone Client" origin-model="Foundation">
+     <component name="phoneclient" long-name="Phone Client" origin-model="foundation">
       <unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
      </component>
-     <component name="phoneserver" long-name="Phones Erver" origin-model="Foundation">
+     <component name="phoneserver" long-name="Phones Erver" origin-model="foundation">
       <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
      </component>
-     <component name="CallUI" long-name="Call UI" origin-model="Foundation">
+     <component name="callui" long-name="Call UI" origin-model="foundation">
       <unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
      </component>
     </collection>
     <collection name="satengine" long-name="Sat Engine" level="generic">
-     <component name="SatServer" long-name="Sat Server" origin-model="Foundation">
+     <component name="satserver" long-name="Sat Server" origin-model="foundation">
       <unit bldFile="mw/phonesrv/satengine/satserver/group"/>
      </component>
-     <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build" origin-model="foundation">
       <unit bldFile="mw/phonesrv/satengine/group"/>
      </component>
     </collection>
     <collection name="satui" long-name="Sat UI" level="specific">
-     <component name="satapp" long-name="Sat App" origin-model="Foundation">
+     <component name="satapp" long-name="Sat App" origin-model="foundation">
       <unit bldFile="mw/phonesrv/satui/satapp/group"/>
      </component>
-     <component name="satplugin" long-name="Sat Plugin" origin-model="Foundation">
+     <component name="satplugin" long-name="Sat Plugin" origin-model="foundation">
       <unit bldFile="mw/phonesrv/satui/satplugin/group"/>
      </component>
-     <component unofficial="yes" name="satui_build" long-name="Sat UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="satui_build" long-name="Sat UI Build" origin-model="foundation">
       <unit bldFile="mw/phonesrv/satui/group"/>
      </component>
     </collection>
     <collection name="telutils" long-name="Utilities" level="generic">
-     <component name="phoneparser" long-name="Phone Parser" origin-model="Foundation">
+     <component name="phoneparser" long-name="Phone Parser" origin-model="foundation">
       <unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
      </component>
-     <component name="telephonyservice" long-name="Telephony Service" origin-model="Foundation">
+     <component name="telephonyservice" long-name="Telephony Service" origin-model="foundation">
       <unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
      </component>
     </collection>
     <collection name="cellular" long-name="Cellular" level="server">
-     <component name="telephonysettings" long-name="Telephony Settings" origin-model="Foundation">
+     <component name="telephonysettings" long-name="Telephony Settings" origin-model="foundation">
       <unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
      </component>
-     <component name="SSSettings" long-name="SS Settings" origin-model="Foundation">
+     <component name="sssettings" long-name="SS Settings" origin-model="foundation">
       <unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
      </component>
-     <component name="PsetNotesUi" long-name="Pset Notes UI" origin-model="Foundation">
+     <component name="psetnotesui" long-name="Pset Notes UI" origin-model="foundation">
       <unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
      </component>
-     <component name="ServiceRequest" long-name="Service Request" origin-model="Foundation">
+     <component name="servicerequest" long-name="Service Request" origin-model="foundation">
       <unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
      </component>
     </collection>
     <collection name="engines" long-name="Telephony Engines" level="specific">
-     <component name="vmbxengine" long-name="Voice Mailbox Engine" origin-model="Foundation">
+     <component name="vmbxengine" long-name="Voice Mailbox Engine" origin-model="foundation">
       <unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
      </component>
     </collection>
     <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
-     <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/group"/>
-     </component>
-    </collection>
-    <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="voice_mailbox_number_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-     </component>
-     <component unofficial="yes" name="cbs_mcn_client_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_notify_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-     </component>
-     <component unofficial="yes" name="converged_call_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="dial_utils_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_ussd_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-     </component>
-     <component unofficial="yes" name="default_emergency_numbers_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_observer_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_ussd_internal_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_command_handler_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_emergency_call_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_messenger_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_information_mediator_api" origin-model="Foundation">
+     <component unofficial="yes" name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="cbs_message_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_mailbox_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_notes_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_service_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="callui_reconnect_query_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-     </component>
-     <component unofficial="yes" name="ss_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_dial_data_consumer_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_image_handler_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="service_provider_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="string_parser_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="converged_call_provider_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_network_information_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_sat_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_information_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="network_handling_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_configuration_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="cenrep_database_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_refresh_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group"/>
+      <unit bldFile="mw/phonesrv/phonesrv_plat/group"/>
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="incoming_call_monitor_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_server_information_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_client_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group"/>
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phone_client_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+     <component unofficial="yes" name="phonesrv_pub" long-name="Telephony and SIM Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phonesrv_pub/group"/>
+     </component>
+     <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/group"/>
      </component>
     </collection>
    </block>
    <block name="messagingmw" long-name="Messaging Middleware" tech_domain="pr" level="specific" levels="stack fw api">
     <collection name="msgbranched" long-name="Messaging Branched" level="fw">
-     <component name="msgbranched.lib=binary" origin-model="Foundation">
+     <component name="msgbranched_build" origin-model="foundation">
       <unit bldFile="mw/messagingmw/msgbranched/group"/>
      </component>
     </collection>
     <collection name="messagingfw" long-name="Messaging FW" level="fw">
-     <component name="alwaysonline" long-name="Always Online" origin-model="Foundation">
+     <component name="alwaysonline" long-name="Always Online" origin-model="foundation">
       <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
       <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
       <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
      </component>
-     <component name="msgcommonutils" long-name="Messaging Common Utils" origin-model="Foundation">
+     <component name="msgcommonutils" long-name="Messaging Common Utils" origin-model="foundation">
       <unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
      </component>
-     <component name="senduiservices" long-name="Send UI Services" origin-model="Foundation">
+     <component name="senduiservices" long-name="Send UI Services" origin-model="foundation">
       <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/datautils/group"/> -->
       <unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
       <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/launcher/group"/> -->
@@ -5636,8 +4177,8 @@
        <unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpush"/>
        <unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpushscriptbased"/>
      </component>-->
-     <component name="suplsmshandler" origin-model="Foundation"/>
-     <component name="suplwappushhandler" origin-model="Foundation"/>
+     <component name="suplsmshandler" origin-model="foundation"/>
+     <component name="suplwappushhandler" origin-model="foundation"/>
     <component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
      </component>
@@ -5685,27 +4226,17 @@
      </component>
     </collection>
     <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-     <component unofficial="yes" name="send_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+     <component unofficial="yes" name="msgfw_pub" class="api" origin-model="foundation">
+      <unit bldFile="mw/messagingmw/msgfw_pub/group"/>
       <!-- <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="always_online_client_api" origin-model="Foundation">
-      <unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_datautils_api" origin-model="Foundation">
-      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
-     </component>
-     <component unofficial="yes" name="messagingmw_build" long-name="Messaging Middleware Build" origin-model="Foundation">
+      <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="messagingmw_build" long-name="Messaging Middleware Build" origin-model="foundation">
       <unit bldFile="mw/messagingmw/group"/>
      </component>
-     <component unofficial="yes" name="always_online_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="msg_common_utils_api" origin-model="Foundation">
-      <unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+     <component unofficial="yes" name="msgfw_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/messagingmw/msgfw_plat/group"/>
+      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/tsrc/group"/>
      </component>
     <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
@@ -5714,51 +4245,53 @@
    </block>
    <block name="imsrv" long-name="Instant Messaging and Presence Services" tech_domain="pr" level="specific" levels="plugin framework server generic specific">
     <collection name="imservices" long-name="IM Services" level="generic">
-     <component name="imfeatureplugin" long-name="IM Feature Plugin" origin-model="Foundation">
+     <component name="imfeatureplugin" long-name="IM Feature Plugin" origin-model="foundation">
       <unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
       <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimdatamodel/group"/> -->
       <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimfrontend/group"/> -->
       <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimoperations/group"/> -->
       <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimprocessor/group"/> -->
      </component>
-     <component name="searchfeatureplugin" long-name="Search Feature Plugin" origin-model="Foundation">
+     <component name="searchfeatureplugin" long-name="Search Feature Plugin" origin-model="foundation">
       <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
       <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
       <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
       <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
       <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
      </component>
-     <component name="xmppsettingsapi" long-name="XMPP Setting Sapi" origin-model="Foundation">
+     <component name="xmppsettingsapi" long-name="XMPP Setting Sapi" origin-model="foundation">
       <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
       <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/tsrc/group"/> -->
      </component>
-     <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher" origin-model="Foundation">
+     <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher" origin-model="foundation">
       <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
       <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
      </component>
-     <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="Foundation">
+     <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="foundation">
       <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
       <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
       <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
      </component>
-     <component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="Foundation">
+     <component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="foundation">
       <unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
       <!-- <unit bldFile="mw/imsrv/imservices/instantmessagingcache/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="imservices_build" long-name="IM Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="imservices_build" long-name="IM Services Build" origin-model="foundation">
       <unit bldFile="mw/imsrv/imservices/group"/>
      </component>
     </collection>
     <collection name="ximpfw" long-name="XIMP Framework" level="framework">
-     <component name="ximpfw_core" long-name="Core" origin-model="Foundation">
+     <component name="ximpfw_core" long-name="Core" origin-model="foundation">
       <!-- <unit bldFile="mw/imsrv/ximpfw/core/group"/> -->
      </component>
-     <component name="presence" long-name="Presence" origin-model="Foundation">
+     <component name="presence" long-name="Presence" origin-model="foundation">
       <!-- <unit bldFile="mw/imsrv/ximpfw/presence/group"/> -->
      </component>
-     <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test" origin-model="Foundation">
+     <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test" origin-model="foundation">
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/group"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
@@ -5766,203 +4299,127 @@
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_utils"/> -->
      </component>
-     <component unofficial="yes" name="ximpfw_build" long-name="XIMP Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="ximpfw_build" long-name="XIMP Framework Build" origin-model="foundation">
       <unit bldFile="mw/imsrv/ximpfw/group"/>
      </component>
     </collection>
     <collection name="brandingserver" long-name="Branding Server" level="specific">
-     <component name="tools" long-name="Tools" origin-model="Foundation">
+     <component name="tools" long-name="Tools" origin-model="foundation">
       <!-- <unit bldFile="mw/imsrv/brandingserver/tools/bsimport/group"/> -->
      </component>
-     <component unofficial="yes" name="brandingserver_build" long-name="Branding Server Build" origin-model="Foundation">
+     <component unofficial="yes" name="brandingserver_build" long-name="Branding Server Build" origin-model="foundation">
       <unit bldFile="mw/imsrv/brandingserver/group"/>
      </component>
     </collection>
-    <collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="ximp_search_protocol_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_avabilitytext" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_protocol_plugin_host_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_management_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_management_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_data_model_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_base_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_data_model_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_cache_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_protocol_plugin_host_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_protocol_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_protocol_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_protocol_plugin_host_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_base_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_data_model_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_data_model_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="xmpp_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="im_cache_client_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
-      <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_base_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_feature_plugin_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
-     </component>
-     <component unofficial="yes" name="ximp_search_management_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_base_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_protocol_plugin_host_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_management_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_protocol_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-     </component>
-    </collection>
     <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
-     <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/imsrv/imsrv_plat/group"/>
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build" origin-model="foundation">
       <unit bldFile="mw/imsrv/group"/>
      </component>
     </collection>
    </block>
    <block name="legacypresence" long-name="Legacy Presence Services" tech_domain="pr" level="specific" levels="engine fw ui">
     <collection name="xdmengine" long-name="XDM Engine" level="engine">
-     <component name="XdmSettingsApi" long-name="XDM Settings Api" origin-model="Foundation">
+     <component name="xdmsettingsapi" long-name="XDM Settings Api" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmsettingsapi/group"/> -->
      </component>
-     <component name="XdmProvisioning" long-name="XDM Provisioning" origin-model="Foundation">
+     <component name="xdmprovisioning" long-name="XDM Provisioning" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmprovisioning/group"/> -->
      </component>
-     <component name="XdmDeviceManagement" long-name="XDM Device Management" origin-model="Foundation">
+     <component name="xdmdevicemanagement" long-name="XDM Device Management" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmdevicemanagement/group"/> -->
      </component>
-     <component unofficial="yes" name="xdmengine_build" long-name="XDM Engine Build" origin-model="Foundation">
+     <component name="xdmengine_build" long-name="XDM Engine" origin-model="foundation">
       <unit bldFile="mw/legacypresence/xdmengine/group"/>
      </component>
     </collection>
     <collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
-     <component name="xdmsettingsui_help" long-name="Help" origin-model="Foundation">
+     <component name="xdmsettingsui_help" long-name="Help" origin-model="foundation">
       <unit bldFile="mw/legacypresence/xdmsettingsui/help/group"/>
      </component>
-     <component unofficial="yes" name="xdmsettingsui_build" long-name="XDM Settings UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="xdmsettingsui_build" long-name="XDM Settings UI Build" origin-model="foundation">
       <unit bldFile="mw/legacypresence/xdmsettingsui/group"/>
      </component>
     </collection>
     <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-     <component name="msgconnmanager.dll=binary" origin-model="Foundation">
+     <component name="msgconnmanager_build" origin-model="foundation">
       <unit bldFile="mw/legacypresence/msgconnmanager/group"/>
      </component>
     </collection>
     <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptor" level="fw">
-     <component name="simpleplugin.dll=binary" origin-model="Foundation">
+     <component name="simpleplugin" origin-model="foundation">
       <unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
      </component>
     </collection>
     <collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
-     <component name="presencesettingsui_help" long-name="Help" origin-model="Foundation">
+     <component name="presencesettingsui_help" long-name="Help" origin-model="foundation">
       <unit bldFile="mw/legacypresence/presencesettingsui/help/group"/>
      </component>
-     <component unofficial="yes" name="presencesettingsui_build" long-name="Presence Settings UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="presencesettingsui_build" long-name="Presence Settings UI Build" origin-model="foundation">
       <unit bldFile="mw/legacypresence/presencesettingsui/group"/>
      </component>
     </collection>
     <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
-     <component name="presencesettingsapi" long-name="Presence Settings API" origin-model="Foundation">
+     <component name="presencesettingsapi" long-name="Presence Settings API" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/simpleengine/presencesettingsapi/group"/> -->
      </component>
-     <component name="siputils" long-name="SIP Utils" origin-model="Foundation">
+     <component name="siputils" long-name="SIP Utils" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/simpleengine/siputils/group"/> -->
      </component>
-     <component name="xmlutils" long-name="XML Utils" origin-model="Foundation">
+     <component name="xmlutils" long-name="XML Utils" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/simpleengine/xmlutils/group"/> -->
      </component>
-     <component name="simpleengine_engine" long-name="Engine" origin-model="Foundation">
+     <component name="simpleengine_engine" long-name="Engine" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/simpleengine/engine/group"/> -->
      </component>
-     <component name="xdmrlspres" long-name="XDM Rlspres" origin-model="Foundation">
+     <component name="xdmrlspres" long-name="XDM Rlspres" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/simpleengine/xdmrlspres/group"/> -->
      </component>
-     <component name="presencedm" long-name="Presence DM" origin-model="Foundation">
+     <component name="presencedm" long-name="Presence DM" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/simpleengine/presencedm/group"/> -->
      </component>
-     <component name="presenceprovisioning" long-name="Presence Provisioning" origin-model="Foundation">
+     <component name="presenceprovisioning" long-name="Presence Provisioning" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/simpleengine/presenceprovisioning/group"/> -->
      </component>
-     <component unofficial="yes" name="simpleengine_build" long-name="SIMPLE Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="simpleengine_build" long-name="SIMPLE Engine Build" origin-model="foundation">
       <unit bldFile="mw/legacypresence/simpleengine/group"/>
      </component>
     </collection>
     <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
-     <component name="XdmXmlParser" long-name="XDM XML Parser" origin-model="Foundation">
+     <component name="xdmxmlparser" long-name="XDM XML Parser" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xdmxmlparser/group"/> -->
      </component>
-     <component name="XcapProtocol" long-name="Xcap Protocol" origin-model="Foundation">
+     <component name="xcapprotocol" long-name="Xcap Protocol" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
@@ -5971,139 +4428,98 @@
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaputils/group"/> -->
      </component>
-     <component name="LocalProtocol" long-name="Local Protocol" origin-model="Foundation">
+     <component name="localprotocol" long-name="Local Protocol" origin-model="foundation">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/localoperations/group"/> -->
      </component>
-     <component unofficial="yes" name="xdmprotocols_build" long-name="XDM Protocols Build" origin-model="Foundation">
+     <component unofficial="yes" name="xdmprotocols_build" long-name="XDM Protocols Build" origin-model="foundation">
       <unit bldFile="mw/legacypresence/xdmprotocols/group"/>
      </component>
     </collection>
     <collection name="simpledatamodeladapter" long-name="SIMPLE Data Mode Aadapter" level="fw">
-     <component name="presenceplugin.dll=binary" origin-model="Foundation">
+     <component name="presenceplugin" origin-model="foundation">
       <unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
      </component>
     </collection>
     <collection name="legacypresence_info" long-name="Legacy Presence Services Info" level="ui">
-     <component unofficial="yes" name="xdm_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-     </component>
-     <component unofficial="yes" name="watcher_info_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_connection_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="simple_instant_msg_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-     </component>
-     <component unofficial="yes" name="simple_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="publisher_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-     </component>
-     <component unofficial="yes" name="authorization_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-     </component>
-     <component unofficial="yes" name="simple_documents_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-     </component>
-     <component unofficial="yes" name="xdm_protocol_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="registration_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="xdm_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_list_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="watcher_api" origin-model="Foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
+     <component unofficial="yes" name="pressrv_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/pressrv_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="opensrv" long-name="Open Services" tech_domain="rt" level="specific" levels="prt lib server eng">
     <collection name="loudmouth" long-name="Loudmouth" level="prt">
-     <component unofficial="yes" name="loudmouth_build" long-name="Loudmouth Build" origin-model="Foundation">
+     <component name="loudmouth_build" origin-model="foundation">
       <unit bldFile="mw/opensrv/loudmouth/group"/>
      </component>
-     <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test" origin-model="Foundation">
+     <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test" origin-model="foundation">
       <!-- <unit bldFile="mw/opensrv/loudmouth/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-     <component unofficial="yes" name="libtelepathy_build" long-name="Telepathy Library Build" origin-model="Foundation">
+     <component name="libtelepathy_build" origin-model="foundation">
       <unit bldFile="mw/opensrv/libtelepathy/group"/>
      </component>
-     <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test" origin-model="Foundation">
+     <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test" origin-model="foundation">
       <!-- <unit bldFile="mw/opensrv/libtelepathy/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-     <component unofficial="yes" name="telepathygabble_build" long-name="Telepathy Gabble Build" origin-model="Foundation">
+     <component unofficial="yes" name="telepathygabble_build" long-name="Telepathy Gabble Build" origin-model="foundation">
       <unit bldFile="mw/opensrv/telepathygabble/group"/>
      </component>
     </collection>
     <collection name="isolationserver" long-name="Isloation Server" level="server">
-     <component name="messagequeue" long-name="Message Queue" origin-model="Foundation">
+     <component name="messagequeue" long-name="Message Queue" origin-model="foundation">
       <unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
      </component>
-     <component name="isoserver" long-name="ISO Server" origin-model="Foundation">
+     <component name="isoserver" long-name="ISO Server" origin-model="foundation">
       <unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
      </component>
-     <component unofficial="yes" name="isolationserver_test" long-name="Isloation Server Test" origin-model="Foundation">
+     <component unofficial="yes" name="isolationserver_test" long-name="Isloation Server Test" origin-model="foundation">
       <!-- <unit bldFile="mw/opensrv/isolationserver/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="isolationserver_build" long-name="Isloation Server Build" origin-model="Foundation">
+     <component unofficial="yes" name="isolationserver_build" long-name="Isloation Server Build" origin-model="foundation">
       <unit bldFile="mw/opensrv/isolationserver/group"/>
      </component>
     </collection>
     <collection name="opensrv_info" long-name="Open Services Info" level="eng">
-     <component unofficial="yes" name="opensrv_build" long-name="Open Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="opensrv_plat" long-name="Open Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
+      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="opensrv_build" long-name="Open Services Build" origin-model="foundation">
       <unit bldFile="mw/opensrv/group"/>
      </component>
     </collection>
-    <collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-     <component unofficial="yes" name="opensrv_plat_build" long-name="Open Services Platform API Build" origin-model="Foundation">
-      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="messagequeue_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
-      <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="remotemgmt" long-name="Remote Management" tech_domain="dm" level="specific" levels="plugin framework server generic specific">
     <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-     <component name="pnputil" long-name="PnP Util" origin-model="Foundation">
+     <component name="pnputil" long-name="PnP Util" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
       <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
      </component>
-     <component name="provisioning" long-name="provisioning" origin-model="Foundation">
+     <component name="provisioning" long-name="provisioning" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
       <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
      </component>
     </collection>
     <collection name="policymanagement" long-name="Policy Management" level="generic">
-     <component name="pmdmadapter" long-name="PMDM Adapter" origin-model="Foundation">
+     <component name="pmdmadapter" long-name="PMDM Adapter" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
      </component>
-     <component name="dmutilserver" long-name="DM Util Server" origin-model="Foundation">
+     <component name="dmutilserver" long-name="DM Util Server" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
      </component>
-     <component name="policyengine" long-name="Polic Eengine" origin-model="Foundation">
+     <component name="policyengine" long-name="Polic Eengine" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
      </component>
-     <component unofficial="yes" name="policymanagement_build" long-name="Policy Management Build" origin-model="Foundation">
+     <component unofficial="yes" name="policymanagement_build" long-name="Policy Management Build" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/policymanagement/group"/>
      </component>
     </collection>
     <collection name="syncmlfw" long-name="SyncML Framework" level="server">
-     <component name="syncmlfw_common" long-name="Common" origin-model="Foundation">
+     <component name="syncmlfw_common" long-name="Common" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/syncmlfw/common/alerthandler/bld"/>
       <unit bldFile="mw/remotemgmt/syncmlfw/common/alertqueue/bld"/>
       <unit bldFile="mw/remotemgmt/syncmlfw/common/debug/bld"/>
@@ -6128,7 +4544,7 @@
       <unit bldFile="mw/remotemgmt/syncmlfw/common/wbxml/bld"/>
       <unit bldFile="mw/remotemgmt/syncmlfw/common/xml/bld"/>
      </component>
-     <component name="ds" long-name="DS" origin-model="Foundation">
+     <component name="ds" long-name="DS" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/adapterlog/bld"/>
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/adapters/dataproviderbase/bld"/>
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/agentlog/bld"/>
@@ -6150,7 +4566,7 @@
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/syncagent/bld"/>
       <unit bldFile="mw/remotemgmt/syncmlfw/ds/wappushalert/bld"/>
      </component>
-     <component name="dm" long-name="DM" origin-model="Foundation">
+     <component name="dm" long-name="DM" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/bld"/>
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/callbackserver/bld"/>
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/dmutils/bld"/>
@@ -6165,56 +4581,52 @@
       <!-- <unit bldFile="mw/remotemgmt/syncmlfw/dm/tsrc/group"/> -->
       <unit bldFile="mw/remotemgmt/syncmlfw/dm/wappushalert/bld"/>
      </component>
-     <component name="syncmlnotifier" long-name="SyncML Notifier" origin-model="Foundation">
+     <component name="syncmlnotifier" long-name="SyncML Notifier" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/syncmlfw/syncmlnotifier/group"/>
      </component>
-     <component name="syncservice" long-name="Sync Service" origin-model="Foundation">
+     <component name="syncservice" long-name="Sync Service" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/syncmlfw/syncservice/group"/>
      </component>
-     <component unofficial="yes" name="syncmlfw_build" long-name="SyncML Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="syncmlfw_build" long-name="SyncML Framework Build" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/syncmlfw/group"/>
      </component>
     </collection>
     <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-     <component name="SCP" origin-model="Foundation">
+     <component name="scp" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
      </component>
-     <component name="terminalsecurity_client" long-name="Client" origin-model="Foundation">
+     <component name="terminalsecurity_client" long-name="Client" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
      </component>
-     <component name="terminalsecurity_server" long-name="Server" origin-model="Foundation">
+     <component name="terminalsecurity_server" long-name="Server" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
      </component>
-     <component name="tcadapter" long-name="TC Adapter" origin-model="Foundation">
+     <component name="tcadapter" long-name="TC Adapter" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
      </component>
-     <component unofficial="yes" name="terminalsecurity_build" long-name="Terminal Security Build" origin-model="Foundation">
+     <component unofficial="yes" name="terminalsecurity_build" long-name="Terminal Security Build" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
      </component>
     </collection>
     <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-     <component name="diagframework" long-name="Diagnostics Framework" origin-model="Foundation">
+     <component name="diagframework" long-name="Diagnostics Framework" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
      </component>
-     <component name="diagpluginbase" long-name="Diagnostics Plugin Base" origin-model="Foundation">
+     <component name="diagpluginbase" long-name="Diagnostics Plugin Base" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
      </component>
-     <component name="diagresultsdb" long-name="Diagnostics Results DB" origin-model="Foundation">
+     <component name="diagresultsdb" long-name="Diagnostics Results DB" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
      </component>
-     <component unofficial="yes" name="devicediagnosticsfw_build" long-name="Device Diagnostics Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="devicediagnosticsfw_build" long-name="Device Diagnostics Framework Build" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
      </component>
     </collection>
-    <collection name="ahle" long-name="Adaptive History List" level="generic">
-     <component name="ahleserver" long-name="Adaptive History List Server" origin-model="Foundation"/>
-     <component name="ahleclient" long-name="Adaptive History List Client" origin-model="Foundation"/>
-    </collection>
     <collection name="n:remotemgmttest" long-name="Remote Management Test" level="specific">
      <component name="n:omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/>
@@ -6255,223 +4667,120 @@
      </component>
     </collection>
     <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
-     <component unofficial="yes" name="remotemgmt_build" long-name="Remote Management Build" origin-model="Foundation">
+     <component unofficial="yes" name="remotemgmt_build" long-name="Remote Management Build" origin-model="foundation">
       <unit bldFile="mw/remotemgmt/group"/>
      </component>
-     <component unofficial="yes" name="fotaapplication" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
+     <component unofficial="yes" name="remotemgmt_pub" long-name="Remote Management Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/remotemgmt_pub/group"/>
+     </component>
+     <component unofficial="yes" name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/group"/>
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
      </component>
     <component name="n:remotemgmt_metadata" long-name="Remote Management Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/remotemgmt/remotemgmt_info/remotemgmt_metadata/remotemgmt_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-     <component unofficial="yes" name="synchronization_capability_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-     </component>
-    </collection>
-    <collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-     <component unofficial="yes" name="adaptive_history_list_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="pnpms_utils_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="diagnostics_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="adaptive_history_list_session_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-     </component>
-     <component unofficial="yes" name="dm_utils_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="device_management_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="scp_server_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="syncml_client_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="obex_client_session_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-     </component>
-     <component unofficial="yes" name="policy_management_request_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_ds_extensions_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-     </component>
-     <component unofficial="yes" name="dm_tree_apis" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-     </component>
-     <component unofficial="yes" name="dm_constant_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_provisioning_adapter_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-     </component>
-     <component unofficial="yes" name="data_synchronization_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="setting_enforcement_info_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="device_management_parameter_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_alert_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-     </component>
-     <component unofficial="yes" name="sync_service_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="policy_management_certificate_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_provisioning_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_results_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-     </component>
-     <component unofficial="yes" name="data_synchronization_notification_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="ds_constant_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="update_package_storage_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_notifier_roaming_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-     </component>
-     <component unofficial="yes" name="terminal_security_device_lock_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_agent_util_and_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_pool_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-     </component>
-     <component unofficial="yes" name="sync_alert_handler_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_notifier_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="fota_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
-     </component>
-    </collection>
    </block>
    <block name="networkingdm" long-name="Networking Device Management" tech_domain="dm" level="generic" levels="plugin framework server generic specific">
     <collection name="clientprovisioning" long-name="Client Provisioning" level="specific">
-     <component name="accesspointadapter" long-name="Access Point Adapter" origin-model="Foundation">
+     <component name="accesspointadapter" long-name="Access Point Adapter" origin-model="foundation">
       <unit bldFile="mw/networkingdm/clientprovisioning/accesspointadapter/group"/>
      </component>
-     <component name="cpdestinationnwadapter" long-name="CP Destination NW Adapter" origin-model="Foundation">
+     <component name="cpdestinationnwadapter" long-name="CP Destination NW Adapter" origin-model="foundation">
       <unit bldFile="mw/networkingdm/clientprovisioning/cpdestinationnwadapter/group"/>
      </component>
-     <component unofficial="yes" name="clientprovisioning_build" long-name="Client Provisioning Build" origin-model="Foundation">
+     <component unofficial="yes" name="clientprovisioning_build" long-name="Client Provisioning Build" origin-model="foundation">
       <unit bldFile="mw/networkingdm/clientprovisioning/group"/>
      </component>
     </collection>
     <collection name="devicemanagement" long-name="Device Management" level="specific">
-     <component name="globalwlansettings" long-name="Global WLAN Settings" origin-model="Foundation">
+     <component name="globalwlansettings" long-name="Global WLAN Settings" origin-model="foundation">
       <unit bldFile="mw/networkingdm/devicemanagement/globalwlansettings/group"/>
      </component>
-     <component name="nsmldinternet" long-name="NSMLD Internet" origin-model="Foundation">
+     <component name="nsmldinternet" long-name="NSMLD Internet" origin-model="foundation">
       <unit bldFile="mw/networkingdm/devicemanagement/nsmldinternet/group"/>
      </component>
-     <component name="nsmldmalwaysonadapter" long-name="Nsmldm Always On Adapter" origin-model="Foundation">
+     <component name="nsmldmalwaysonadapter" long-name="Nsmldm Always On Adapter" origin-model="foundation">
       <unit bldFile="mw/networkingdm/devicemanagement/nsmldmalwaysonadapter/group"/>
      </component>
-     <component name="nsmldmbmadapter" long-name="NSMLDM BM Adapter" origin-model="Foundation">
+     <component name="nsmldmbmadapter" long-name="NSMLDM BM Adapter" origin-model="foundation">
       <unit bldFile="mw/networkingdm/devicemanagement/nsmldmbmadapter/group"/>
      </component>
-     <component unofficial="yes" name="devicemanagement_build" long-name="Device Management Build" origin-model="Foundation">
+     <component unofficial="yes" name="devicemanagement_build" long-name="Device Management Build" origin-model="foundation">
       <unit bldFile="mw/networkingdm/devicemanagement/group"/>
      </component>
     </collection>
     <collection name="networkingdm_info" long-name="Networking Device Management Info" level="specific">
-     <component unofficial="yes" name="networkingdm_build" long-name="Networking Device Management Build" origin-model="Foundation">
+     <component unofficial="yes" name="networkingdm_build" long-name="Networking Device Management Build" origin-model="foundation">
       <unit bldFile="mw/networkingdm/group"/>
      </component>
     </collection>
    </block>
    <block name="remotestorage" long-name="Remote Storage" tech_domain="de" level="generic" levels="framework">
     <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-     <component name="mountstore" long-name="Mount Store" origin-model="Foundation">
+     <component name="mountstore" long-name="Mount Store" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
      </component>
-     <component name="rsfwnotifierplugins" long-name="RS Framework Notifier Plugins" origin-model="Foundation">
+     <component name="rsfwnotifierplugins" long-name="RS Framework Notifier Plugins" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
      </component>
-     <component name="remotefileengine" long-name="Remote File Engine" origin-model="Foundation">
+     <component name="remotefileengine" long-name="Remote File Engine" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
      </component>
-     <component name="mountmanager" long-name="Mount Manager" origin-model="Foundation">
+     <component name="mountmanager" long-name="Mount Manager" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
       <!-- <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/tsrc/public/basic/group"/> -->
      </component>
-     <component name="webdavaccessplugin" long-name="WebDAV Access Plugin" origin-model="Foundation">
+     <component name="webdavaccessplugin" long-name="WebDAV Access Plugin" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
      </component>
-     <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin" origin-model="Foundation">
+     <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
      </component>
-     <component name="gsplugin" long-name="GS Plugin" origin-model="Foundation">
+     <component name="remotestoragegsplugin" long-name="GS Plugin" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/gsplugin/group"/>
      </component>
-     <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control" origin-model="Foundation">
+     <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/remotedriveconfigurationbiocontrol/group"/>
      </component>
-     <component unofficial="yes" name="remotestoragefw_build" long-name="Remote Storage Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="remotestoragefw_build" long-name="Remote Storage Framework Build" origin-model="foundation">
       <unit bldFile="mw/remotestorage/remotestoragefw/group"/>
      </component>
     </collection>
     <collection name="remotestorage_info" long-name="Remote Storage Info" level="framework">
-     <component unofficial="yes" name="rsfw_access_protocol_plugin_api" origin-model="Foundation">
+     <component unofficial="yes" name="rsfw_plat" class="api" origin-model="foundation">
       <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
      </component>
     </collection>
    </block>
    <block name="remoteconn" long-name="Remote Connectivity" tech_domain="de" level="generic" levels="plugin framework server generic specific">
     <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-     <component name="SeCon" long-name="Se Con" origin-model="Foundation">
+     <component name="secon" long-name="Se Con" origin-model="foundation">
       <unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
      </component>
     </collection>
     <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-     <component unofficial="yes" name="remoteconn_build" long-name="Remote Connectivity Build" origin-model="Foundation">
+     <component unofficial="yes" name="remoteconn_build" long-name="Remote Connectivity Build" origin-model="foundation">
       <unit bldFile="mw/remoteconn/group"/>
      </component>
+     <component unofficial="yes" name="remoteconn_plat" long-name="Remote Connectivity Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/remoteconn/remoteconn_plat/group"/>
+     </component>
     <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
      </component>
@@ -6547,178 +4856,178 @@
    </block>
    <block name="dlnasrv" long-name="DLNA Services" tech_domain="de" level="specific" levels="framework server plugin">
     <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-     <component name="avcontrolframework" long-name="A/V Control Famework" origin-model="Foundation">
+     <component name="avcontrolframework" long-name="A/V Control Famework" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
      </component>
-     <component name="avcpengine" long-name="AVCP Engine" origin-model="Foundation"/>
-     <component name="avcpengineclient" long-name="Avcp Engine Client" origin-model="Foundation"/>
-     <component name="upnpaccessplugin" long-name="UPnP Access Plugin" origin-model="Foundation"/>
-     <component unofficial="yes" name="upnpavcontrolpoint_build" long-name="UPnP A/V Control Point Build" origin-model="Foundation">
+     <component name="avcpengine" long-name="AVCP Engine" origin-model="foundation"/>
+     <component name="avcpengineclient" long-name="Avcp Engine Client" origin-model="foundation"/>
+     <component name="upnpaccessplugin" long-name="UPnP Access Plugin" origin-model="foundation"/>
+     <component unofficial="yes" name="upnpavcontrolpoint_build" long-name="UPnP A/V Control Point Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
      </component>
     </collection>
     <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-     <component name="avobjects" long-name="A/V Objects" origin-model="Foundation">
+     <component name="avobjects" long-name="A/V Objects" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
      </component>
-     <component name="mediaserverclient" long-name="Media Server Client" origin-model="Foundation">
+     <component name="mediaserverclient" long-name="Media Server Client" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
      </component>
-     <component name="connectionmanagerservice" long-name="Connection Manager Service" origin-model="Foundation">
+     <component name="connectionmanagerservice" long-name="Connection Manager Service" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
      </component>
-     <component name="contentdirectoryservice" long-name="Content Directory Service" origin-model="Foundation">
+     <component name="contentdirectoryservice" long-name="Content Directory Service" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
      </component>
-     <component name="mediaserverengine" long-name="Media Server Engine" origin-model="Foundation">
+     <component name="mediaserverengine" long-name="Media Server Engine" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
      </component>
-     <component unofficial="yes" name="upnpmediaserver_build" long-name="UPnP Media Server Build" origin-model="Foundation">
+     <component unofficial="yes" name="upnpmediaserver_build" long-name="UPnP Media Server Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
      </component>
     </collection>
     <collection name="upnpstack" long-name="UPnP Stack" level="framework">
-     <component name="upnputils" long-name="UPnP Utils" origin-model="Foundation">
+     <component name="upnputils" long-name="UPnP Utils" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/upnputils/group"/>
      </component>
-     <component name="upnpconnectionmanagersession" long-name="UPnP Connection Manager Session" origin-model="Foundation">
+     <component name="upnpconnectionmanagersession" long-name="UPnP Connection Manager Session" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/upnpconnectionmanagersession/group"/>
      </component>
-     <component name="upnpconnmanager" long-name="UPnP Connection Manager" origin-model="Foundation">
+     <component name="upnpconnmanager" long-name="UPnP Connection Manager" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/upnpconnmanager/group"/>
      </component>
-     <component name="dlnawebserver" long-name="DLNA Web Server" origin-model="Foundation">
+     <component name="dlnawebserver" long-name="DLNA Web Server" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/dlnawebserver/group"/>
      </component>
-     <component name="serviceframework" long-name="Service Framework" origin-model="Foundation">
+     <component name="serviceframework" long-name="Service Framework" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/serviceframework/group"/>
      </component>
-     <component name="ssdpserver" long-name="SSDP Server" origin-model="Foundation">
+     <component name="ssdpserver" long-name="SSDP Server" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/ssdpserver/group"/>
      </component>
-     <component name="messagehandler" long-name="Message Handler" origin-model="Foundation">
+     <component name="messagehandler" long-name="Message Handler" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/messagehandler/group"/>
      </component>
-     <component name="controlpointbase" long-name="Control Point Base" origin-model="Foundation">
+     <component name="controlpointbase" long-name="Control Point Base" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/controlpointbase/group"/>
      </component>
-     <component name="upnphttptransfer" long-name="UPnP HTTP Transfer" origin-model="Foundation">
+     <component name="upnphttptransfer" long-name="UPnP HTTP Transfer" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/upnphttptransfer/group"/>
      </component>
-     <component unofficial="yes" name="upnpstack_build" long-name="UPnP Stack Build" origin-model="Foundation">
+     <component unofficial="yes" name="upnpstack_build" long-name="UPnP Stack Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpstack/group"/>
      </component>
     </collection>
     <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-     <component name="upnpdlnaprofiler" long-name="UPnP DLNA Profiler" origin-model="Foundation">
+     <component name="upnpdlnaprofiler" long-name="UPnP DLNA Profiler" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
      </component>
-     <component name="upnpsecurity" long-name="UPnP Security" origin-model="Foundation">
+     <component name="upnpsecurity" long-name="UPnP Security" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
      </component>
-     <component name="upnpcontentserver" long-name="UPnP Content Server" origin-model="Foundation">
+     <component name="upnpcontentserver" long-name="UPnP Content Server" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
      </component>
-     <component name="applicationengine" long-name="Application Engine" origin-model="Foundation">
+     <component name="applicationengine" long-name="Application Engine" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
      </component>
-     <component unofficial="yes" name="upnpsharing_build" long-name="UPnP Sharing Build" origin-model="Foundation">
+     <component unofficial="yes" name="upnpsharing_build" long-name="UPnP Sharing Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsharing/group"/>
      </component>
     </collection>
     <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-     <component name="upnpsettingsengine" long-name="UPnP Settings Engine" origin-model="Foundation">
+     <component name="upnpsettingsengine" long-name="UPnP Settings Engine" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
      </component>
-     <component name="multiselectionui" long-name="Multi-Selection UI" origin-model="Foundation">
+     <component name="multiselectionui" long-name="Multi-Selection UI" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsettings/multiselectionui/group"/>
      </component>
-     <component name="appwizard" long-name="App Wizard" origin-model="Foundation">
+     <component name="appwizard" long-name="App Wizard" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsettings/appwizard/group"/>
      </component>
-     <component name="upnpsharingui" long-name="UPnP Sharing UI" origin-model="Foundation">
+     <component name="upnpsharingui" long-name="UPnP Sharing UI" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
      </component>
-     <component name="upnpgsplugin" long-name="UPnP GS Plugin" origin-model="Foundation">
+     <component name="upnpgsplugin" long-name="UPnP GS Plugin" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
      </component>
-     <component unofficial="yes" name="upnpsettings_build" long-name="UPnP Settings Build" origin-model="Foundation">
+     <component unofficial="yes" name="upnpsettings_build" long-name="UPnP Settings Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpsettings/group"/>
      </component>
     </collection>
     <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-     <component name="upnpplaybackplugins" long-name="UPnP Playback Plugins" origin-model="Foundation">
+     <component name="upnpplaybackplugins" long-name="UPnP Playback Plugins" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
      </component>
-     <component unofficial="yes" name="upnpmpxplugins_build" long-name="UPnP MPX Plugins Build" origin-model="Foundation">
+     <component unofficial="yes" name="upnpmpxplugins_build" long-name="UPnP MPX Plugins Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
      </component>
     </collection>
     <collection name="upnpharvester" long-name="UPnP Harvester" level="server">
-     <component name="upnpharvester_common" long-name="Common" origin-model="Foundation">
+     <component name="upnpharvester_common" long-name="Common" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
       <unit bldFile="mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
       <unit bldFile="mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
       <unit bldFile="mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
      </component>
-     <component name="cdssync" long-name="CDS Sync" origin-model="Foundation">
+     <component name="cdssync" long-name="CDS Sync" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpharvester/cdssync/common"/>
      </component>
-     <component name="mdhserver" long-name="MDH Server" origin-model="Foundation">
+     <component name="mdhserver" long-name="MDH Server" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpharvester/mdhserver/group"/>
      </component>
-     <component unofficial="yes" name="upnpharvester_build" long-name="UPnP Harvester Build" origin-model="Foundation">
+     <component unofficial="yes" name="upnpharvester_build" long-name="UPnP Harvester Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpharvester/group"/>
      </component>
     </collection>
     <collection name="upnpframework" long-name="UPnP Framework" level="framework">
-     <component name="upnputilities" long-name="UPnP Utilities" origin-model="Foundation">
+     <component name="upnputilities" long-name="UPnP Utilities" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
      </component>
-     <component name="upnpextensionpluginif" long-name="UPnP Extension Plugin IF" origin-model="Foundation">
+     <component name="upnpextensionpluginif" long-name="UPnP Extension Plugin IF" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
      </component>
-     <component name="upnpfiletransferengine" long-name="UPnP File Transfer Engine" origin-model="Foundation">
+     <component name="upnpfiletransferengine" long-name="UPnP File Transfer Engine" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
      </component>
-     <component name="upnpmusicadapter" long-name="UPnP Musicadapter" origin-model="Foundation">
+     <component name="upnpmusicadapter" long-name="UPnP Musicadapter" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
      </component>
-     <component name="upnpcommonui" long-name="UPnP Common UI" origin-model="Foundation">
+     <component name="upnpcommonui" long-name="UPnP Common UI" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/upnpcommonui/group"/>
      </component>
-     <component name="upnpcommand" long-name="UPnP Command" origin-model="Foundation">
+     <component name="upnpcommand" long-name="UPnP Command" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
      </component>
-     <component name="upnpaiwengine" long-name="UPnP AIW Engine" origin-model="Foundation">
+     <component name="upnpaiwengine" long-name="UPnP AIW Engine" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
      </component>
-     <component name="upnpaiwprovider" long-name="UPnP AIW Provider" origin-model="Foundation">
+     <component name="upnpaiwprovider" long-name="UPnP AIW Provider" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
      </component>
-     <component unofficial="yes" name="upnpframework_build" long-name="UPnP Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="upnpframework_build" long-name="UPnP Framework Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpframework/group"/>
      </component>
     </collection>
     <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="server">
-     <component name="upnpxmlparser" long-name="UPnP XML Parser" origin-model="Foundation">
+     <component name="upnpxmlparser" long-name="UPnP XML Parser" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
      </component>
-     <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server" origin-model="Foundation">
+     <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
      </component>
-     <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client" origin-model="Foundation">
+     <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
      </component>
-     <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper" origin-model="Foundation">
+     <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
      </component>
-     <component unofficial="yes" name="upnpavcontroller_build" long-name="UPnP A/V Controller Build" origin-model="Foundation">
+     <component unofficial="yes" name="upnpavcontroller_build" long-name="UPnP A/V Controller Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
      </component>
     </collection>
     <collection name="homesync" long-name="Home Sync" level="plugin">
-     <component name="contentmanager" long-name="Content Manager" origin-model="Foundation">
+     <component name="contentmanager" long-name="Content Manager" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmfillmanager/group"/>
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmmemorymanager/group"/>
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmscheduler/group"/>
@@ -6729,201 +5038,150 @@
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/applicationengine/group"/>
       <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/group"/>
      </component>
-     <component unofficial="yes" name="homesync_build" long-name="Home Sync Build" origin-model="Foundation">
+     <component unofficial="yes" name="homesync_build" long-name="Home Sync Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/homesync/group"/>
      </component>
     </collection>
     <collection name="homemedia" long-name="Home Media" level="framework">
-     <component name="homemedia" long-name="Home Media" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/homemedia/homemedia/group"/>
-     </component>
-     <component unofficial="yes" name="homemedia_build" long-name="Home Media Build" origin-model="Foundation">
+     <component name="homemedia_build" long-name="Home Media" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/homemedia/group"/>
      </component>
-    </collection>
-    <collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="upnp_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_http_transfer_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_http_transfer_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_media_server_metadata_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_media_server_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_command_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_httpserver_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_httpserver_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_common_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_avcp_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_media_server_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_security_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_control_point_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_control_point_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_av_objects_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_device_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_utils_api" origin-model="Foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_utils_api/group"/>
-     </component>
+     
     </collection>
     <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-     <component unofficial="yes" name="dlnasrv_build" long-name="DLNA Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/group"/>
+     </component>
+     <component unofficial="yes" name="dlnasrv_build" long-name="DLNA Services Build" origin-model="foundation">
       <unit bldFile="mw/dlnasrv/group"/>
      </component>
     </collection>
    </block>
    <block name="shortlinkconn" long-name="Shortlink Connectivity" tech_domain="de" level="generic" levels="framework server generic specific plugin">
     <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-     <component name="bteng" long-name="Bluetooth Engine" origin-model="Foundation">
+     <component name="bteng" long-name="Bluetooth Engine" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bteng/group"/>
      </component>
-     <component name="btnotif" long-name="Bluetooth Notifier" origin-model="Foundation">
+     <component name="btnotif" long-name="Bluetooth Notifier" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
      </component>
-     <component name="btaudioman" long-name="Bluetooth Audio Man" origin-model="Foundation">
+     <component name="btaudioman" long-name="Bluetooth Audio Man" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudioman/group"/>
      </component>
-     <component name="btmac" long-name="Bluetooth Mac" origin-model="Foundation">
+     <component name="btmac" long-name="Bluetooth Mac" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btmac/group"/>
      </component>
-     <component name="btsac" long-name="Bluetooth SAC" origin-model="Foundation">
+     <component name="btsac" long-name="Bluetooth SAC" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btsac/group"/>
      </component>
-     <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" origin-model="Foundation">
+     <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
      </component>
-     <component name="btsap" long-name="Bluetooth SAP" origin-model="Foundation">
+     <component name="btsap" long-name="Bluetooth SAP" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btsap/group"/>
      </component>
-     <component name="btui" long-name="Bluetooth UI" origin-model="Foundation">
+     <component name="btui" long-name="Bluetooth UI" origin-model="foundation">
       <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/ecom/group"/> -->
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/group"/>
      </component>
-     <component name="btpbap" long-name="Bluetooth PBAP" origin-model="Foundation">
+     <component name="btpbap" long-name="Bluetooth PBAP" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/btpbap/group"/>
      </component>
-     <component name="bthid" long-name="BTHID" origin-model="Foundation">
+     <component name="bthid" long-name="BTHID" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/group"/>
      </component>
-     <component unofficial="yes" name="bluetoothengine_build" long-name="Bluetooth Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="bluetoothengine_build" long-name="Bluetooth Engine Build" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/bluetoothengine/group"/>
      </component>
     </collection>
     <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-     <component name="atext" long-name="Atext" origin-model="Foundation">
+     <component name="atext" long-name="Atext" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/atext/group"/>
      </component>
-     <component name="locod" long-name="Locod" origin-model="Foundation">
+     <component name="locod" long-name="Locod" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
      </component>
-     <component name="obexserviceman" long-name="Obex Service Man" origin-model="Foundation">
+     <component name="obexserviceman" long-name="Obex Service Man" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
      </component>
-     <component name="obexsendservices" long-name="Obex Send Services" origin-model="Foundation">
+     <component name="obexsendservices" long-name="Obex Send Services" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
      </component>
-     <component name="obexreceiveservices" long-name="OBEX Receive Services" origin-model="Foundation">
+     <component name="obexreceiveservices" long-name="OBEX Receive Services" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
      </component>
-     <component name="dun" long-name="Dun" origin-model="Foundation">
+     <component name="dun" long-name="Dun" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
      </component>
-     <component name="lcstylustap" long-name="LC Stylus Tap" origin-model="Foundation">
+     <component name="lcstylustap" long-name="LC Stylus Tap" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
      </component>
-     <component name="generichid" long-name="Generic HID" origin-model="Foundation">
+     <component name="generichid" long-name="Generic HID" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
      </component>
-     <component unofficial="yes" name="localconnectivityservice_build" long-name="Local Connectivity Service Build" origin-model="Foundation">
+     <component unofficial="yes" name="localconnectivityservice_build" long-name="Local Connectivity Service Build" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/group"/>
      </component>
     </collection>
     <collection name="usbclasses" long-name="USB classes" level="framework">
-     <component name="usbobexclasscontroller" long-name="USB Obex Class Controller" origin-model="Foundation">
+     <component name="usbobexclasscontroller" long-name="USB Obex Class Controller" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/tsrc/group"/> -->
      </component>
-     <component name="usbbasicpersonality" long-name="USB Basic Personality" origin-model="Foundation">
+     <component name="usbbasicpersonality" long-name="USB Basic Personality" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbclasses/usbbasicpersonality/group"/>
      </component>
-     <component name="usbmscpersonality" long-name="USB Msc Personality" origin-model="Foundation">
+     <component name="usbmscpersonality" long-name="USB Msc Personality" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbclasses/usbmscpersonality/group"/>
      </component>
-     <component name="ptpstack" long-name="Ptp Stack" origin-model="Foundation">
+     <component name="ptpstack" long-name="Ptp Stack" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbclasses/ptpstack/group"/>
      </component>
-     <component name="sicdusbplugin" long-name="Sicd USB Plugin" origin-model="Foundation">
+     <component name="sicdusbplugin" long-name="Sicd USB Plugin" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbclasses/sicdusbplugin/group"/>
      </component>
-     <component name="ptpserver" long-name="Ptp Server" origin-model="Foundation">
+     <component name="ptpserver" long-name="Ptp Server" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/ptpclasscontroller/group"/> -->
      </component>
-     <component name="pictbridgeengine" long-name="Pictbridge Engine" origin-model="Foundation">
+     <component name="pictbridgeengine" long-name="Pictbridge Engine" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbclasses/pictbridgeengine/group"/>
      </component>
-     <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler" origin-model="Foundation"/>
+     <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler" origin-model="foundation"/>
     </collection>
     <collection name="usbengines" long-name="USB Engines" level="generic">
-     <component name="usbwatcher" long-name="USB Watcher" origin-model="Foundation">
+     <component name="usbwatcher" long-name="USB Watcher" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbengines/usbwatcher/group"/>
      </component>
-     <component name="usblocodplugin" long-name="USB Locod Plugin" origin-model="Foundation">
+     <component name="usblocodplugin" long-name="USB Locod Plugin" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/tsrc/group"/> -->
      </component>
-     <component name="usbdevcon" long-name="USB Devcon" origin-model="Foundation">
+     <component name="usbdevcon" long-name="USB Devcon" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbengines/usbdevcon/group"/>
      </component>
-     <component name="usbremotepersonality" long-name="USB Remote Personality" origin-model="Foundation">
+     <component name="usbremotepersonality" long-name="USB Remote Personality" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbengines/usbremotepersonality/group"/>
      </component>
     </collection>
     <collection name="usbuis" long-name="USB UIs" level="specific">
-     <component name="usbui" long-name="USB UI" origin-model="Foundation">
+     <component name="usbui" long-name="USB UI" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbuis/usbui/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbui/tsrc/usbuiapitest/group"/> -->
      </component>
-     <component name="usbuinotif" long-name="USB UI Notif" origin-model="Foundation">
+     <component name="usbuinotif" long-name="USB UI Notif" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/group"/>
       <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/tsrc/usbuinotifapitest/group"/> -->
      </component>
-     <component name="imageprintuiprovider" long-name="ImagePrint UI Provider" origin-model="Foundation">
+     <component name="imageprintuiprovider" long-name="ImagePrint UI Provider" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
      </component>
-     <component name="imageprintui" long-name="ImagePrint UI" origin-model="Foundation">
+     <component name="usbimageprintui" long-name="ImagePrint UI" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/usbuis/imageprintui/group"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" level="plugin">
-     <component unofficial="yes" name="bluetooth_power_state_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/bluetooth_power_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_notifier_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/bluetooth_notifier_api/group"/>
-     </component>
-    </collection>
     <collection name="obex" long-name="OBEX" level="generic">
      <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="mw/shortlinkconn/obex/obexprotocol/group" mrp="mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
@@ -6938,550 +5196,345 @@
      </component>
     </collection>
     <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
-     <component unofficial="yes" name="public" origin-model="Foundation">
+     <component unofficial="yes" name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/group"/>
+     </component>
+     <component unofficial="yes" name="public" origin-model="foundation">
       <!-- <unit bldFile="mw/shortlinkconn/tsrc/public/basic/group"/> -->
      </component>
-     <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build" origin-model="Foundation">
+     <component unofficial="yes" name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/group"/>
+     </component>
+     <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build" origin-model="foundation">
       <unit bldFile="mw/shortlinkconn/group"/>
      </component>
     <component name="shortlinkconn_metadata" long-name="Shortlink Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/shortlinkconn/shortlinkconn_info/shortlinkconn_metadata/shortlinkconn_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="bluetooth_engine_settings_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialup_connection_status_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_dosserver_audio_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_dosserver_audio_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_watcher_info_api_header" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_watcher_info_api_header/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_sap_connection_state_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_sap_connection_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_notifier_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_notifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="pictbridge_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/pictbridge_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_transport_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_transport_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_device_management_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_device_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_device_control_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_device_control_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_notifier_internal_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_notifier_internal_api/group"/>
-     </component>
-     <component unofficial="yes" name="at_command_handler_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/at_command_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_connection_management_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_connection_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_watcher_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_watcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="obex_secondary_display_notification_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_personality_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_personality_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_responder_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_responder_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_secondary_display_notification_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="dun_secondary_display_notification_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_discovery_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_discovery_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_dut_mode_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_dut_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_local_variation_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_local_variation_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_personality_api_header" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_personality_api_header/group"/>
-     </component>
-     <component unofficial="yes" name="obex_service_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_server_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="obex_service_utils_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="imghandling" long-name="Image Handling" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
     <collection name="3gplibrary" long-name="3GP Library" level="server">
-     <component name="3gpmp4lib" long-name="3GP MP4 Library" origin-model="Foundation">
+     <component name="3gpmp4lib" long-name="3GP MP4 Library" origin-model="foundation">
       <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/group"/>
       <!-- <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/tsrc/public/basic/group"/> -->
      </component>
-     <component unofficial="yes" name="3gplibrary_build" long-name="3GP Library Build" origin-model="Foundation">
+     <component unofficial="yes" name="3gplibrary_build" long-name="3GP Library Build" origin-model="foundation">
       <unit bldFile="mw/imghandling/3gplibrary/group"/>
      </component>
     </collection>
     <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
-     <component name="IHL.dll=binary" long-name="IHL" origin-model="Foundation">
+     <component name="ihl" long-name="IHL" origin-model="foundation">
       <unit bldFile="mw/imghandling/imagehandlinglib/group"/>
      </component>
     </collection>
     <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="specific">
-     <component name="imageinfopopup" long-name="Image Info Popup" origin-model="Foundation">
+     <component name="imageinfopopup" long-name="Image Info Popup" origin-model="foundation">
       <unit bldFile="mw/imghandling/imagehandlingutilities/imageinfopopup/group"/>
      </component>
-     <component name="imagepreview" long-name="Image Preview" origin-model="Foundation">
+     <component name="imagepreview" long-name="Image Preview" origin-model="foundation">
       <unit bldFile="mw/imghandling/imagehandlingutilities/imagepreview/group"/>
      </component>
-     <component name="thumbnailmanager" long-name="Thumbnail Manager" origin-model="Foundation">
+     <component name="thumbnailmanager" long-name="Thumbnail Manager" origin-model="foundation">
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
      </component>
-     <component name="tvoutengine" long-name="TV Out Engine" origin-model="Foundation">
+     <component name="tvoutengine" long-name="TV Out Engine" origin-model="foundation">
       <unit bldFile="mw/imghandling/imagehandlingutilities/tvoutengine/group"/>
      </component>
     </collection>
     <collection name="imghandling_info" long-name="Image Handling Info" level="specific">
-     <component unofficial="yes" name="tvoutengine_api" origin-model="Foundation">
-      <unit bldFile="mw/imghandling/imagehandling_plat/tvoutengine_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_handling_library_api" origin-model="Foundation">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-     </component>
-     <component unofficial="yes" name="3gp_library_api" origin-model="Foundation">
-      <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+     <component unofficial="yes" name="imagehandling_plat" class="api" origin-model="foundation">
       <!-- <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="image_info_popup_api" origin-model="Foundation">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_info_popup_api/group"/>
-     </component>
-     <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build" origin-model="Foundation">
+      <unit bldFile="mw/imghandling/imagehandling_plat/group"/>
+      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build" origin-model="foundation">
       <unit bldFile="mw/imghandling/group"/>
      </component>
-     <component unofficial="yes" name="thumbnailmanager_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
-      <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_preview_api" origin-model="Foundation">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_preview_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="metadatasrv" long-name="Legacy Metadata Services" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
     <collection name="contentlistingframework" long-name="Content Listing Framework" level="framework">
-     <component unofficial="yes" name="contentlistingframework_build" long-name="Content Listing Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="contentlistingframework_build" long-name="Content Listing Framework Build" origin-model="foundation">
       <unit bldFile="mw/metadatasrv/contentlistingframework/group"/>
      </component>
     </collection>
     <collection name="mediamanagementuis" long-name="Media Management UIs" level="server">
-     <component name="mediastylegrid" long-name="Media Style Grid" origin-model="Foundation">
+     <component name="mediastylegrid" long-name="Media Style Grid" origin-model="foundation">
       <unit bldFile="mw/metadatasrv/mediamanagementuis/mediastylegrid/group"/>
      </component>
     </collection>
     <collection name="mediamanagementutilities" long-name="Media Management utilities" level="generic">
-     <component name="mediafetch" long-name="Media Fetch" origin-model="Foundation">
+     <component name="mediafetch" long-name="Media Fetch" origin-model="foundation">
       <unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
      </component>
     </collection>
-    <collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform API Build" origin-model="Foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_extended_api" origin-model="Foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_fetch_implementation_api" origin-model="Foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_collection_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_style_grid_api" origin-model="Foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_style_grid_api/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="content_listing_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="metadatasrv_pub_build" long-name="Legacy Metadata Services Public API Build" origin-model="Foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
-     </component>
-     <component unofficial="yes" name="media_fetch_api" origin-model="Foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
-     </component>
-    </collection>
     <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
-     <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
+     </component>
+     <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build" origin-model="foundation">
       <unit bldFile="mw/metadatasrv/group"/>
      </component>
+     <component unofficial="yes" name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
+     </component>
     </collection>
    </block>
    <block name="mds" long-name="Metadata Services" tech_domain="mm" level="specific" levels="mgr eng server int">
     <collection name="clfwrapper" long-name="CLF Wrapper" level="int">
-     <component unofficial="yes" name="clfwrapper_build" long-name="CLF Wrapper Build" origin-model="Foundation">
+     <component unofficial="yes" name="clfwrapper_build" long-name="CLF Wrapper Build" origin-model="foundation">
       <unit bldFile="mw/mds/clfwrapper/group"/>
      </component>
     </collection>
     <collection name="contextengine" long-name="Context Engine" level="eng">
-     <component name="contextengine_plugins" long-name="Plugins" origin-model="Foundation">
+     <component name="contextengine_plugins" long-name="Plugins" origin-model="foundation">
       <unit bldFile="mw/mds/contextengine/plugins/group"/>
      </component>
-     <component unofficial="yes" name="contextengine_build" long-name="Context Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="contextengine_build" long-name="Context Engine Build" origin-model="foundation">
       <unit bldFile="mw/mds/contextengine/group"/>
      </component>
     </collection>
     <collection name="harvester" long-name="Harvester" level="eng">
-     <component name="blacklistclient" long-name="Blacklist Client" origin-model="Foundation">
+     <component name="blacklistclient" long-name="Blacklist Client" origin-model="foundation">
       <unit bldFile="mw/mds/harvester/blacklistclient/group"/>
      </component>
-     <component name="blacklistserver" long-name="Blacklist Server" origin-model="Foundation">
+     <component name="blacklistserver" long-name="Blacklist Server" origin-model="foundation">
       <unit bldFile="mw/mds/harvester/blacklistserver/group"/>
      </component>
-     <component name="harvester_common" long-name="Common" origin-model="Foundation">
+     <component name="harvester_common" long-name="Common" origin-model="foundation">
       <unit bldFile="mw/mds/harvester/common/group"/>
      </component>
-     <component name="composerplugins" long-name="Composer Plugins" origin-model="Foundation">
+     <component name="composerplugins" long-name="Composer Plugins" origin-model="foundation">
       <unit bldFile="mw/mds/harvester/composerplugins/group"/>
      </component>
-     <component name="harvesterplugins" long-name="Harvester Plugins" origin-model="Foundation">
+     <component name="harvesterplugins" long-name="Harvester Plugins" origin-model="foundation">
       <!-- <unit bldFile="mw/mds/harvester/harvesterplugins/audioplaylistplugin/group"/> -->
       <unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
      </component>
-     <component name="monitorplugins" long-name="Monitor Plugins" origin-model="Foundation">
+     <component name="monitorplugins" long-name="Monitor Plugins" origin-model="foundation">
       <unit bldFile="mw/mds/harvester/monitorplugins/group"/>
      </component>
-     <component name="harvester_server" long-name="Server" origin-model="Foundation">
+     <component name="harvester_server" long-name="Server" origin-model="foundation">
       <unit bldFile="mw/mds/harvester/server/group"/>
      </component>
-     <component name="harvester_client" long-name="Client" origin-model="Foundation">
+     <component name="harvester_client" long-name="Client" origin-model="foundation">
       <unit bldFile="mw/mds/harvester/client/group"/>
      </component>
-     <component unofficial="yes" name="harvester_build" long-name="Harvester Build" origin-model="Foundation">
+     <component unofficial="yes" name="harvester_build" long-name="Harvester Build" origin-model="foundation">
       <unit bldFile="mw/mds/harvester/group"/>
      </component>
     </collection>
     <collection name="locationmanager" long-name="Location Manager" level="mgr">
-     <component name="locationtrail" long-name="Location Trail" origin-model="Foundation">
+     <component name="locationtrail" long-name="Location Trail" origin-model="foundation">
       <unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
      </component>
-     <component name="locationmanager_server" long-name="Server" origin-model="Foundation">
+     <component name="locationmanager_server" long-name="Server" origin-model="foundation">
       <unit bldFile="mw/mds/locationmanager/server/group"/>
      </component>
-     <component name="locationmanager_client" long-name="Client" origin-model="Foundation">
+     <component name="locationmanager_client" long-name="Client" origin-model="foundation">
       <unit bldFile="mw/mds/locationmanager/client/group"/>
      </component>
-     <component unofficial="yes" name="locationmanager_build" long-name="Location Manager Build" origin-model="Foundation">
+     <component unofficial="yes" name="locationmanager_build" long-name="Location Manager Build" origin-model="foundation">
       <unit bldFile="mw/mds/locationmanager/group"/>
      </component>
     </collection>
     <collection name="metadataengine" long-name="Metadata Engine" level="eng">
-     <component name="metadataengine_common" long-name="Common" origin-model="Foundation">
+     <component name="metadataengine_common" long-name="Common" origin-model="foundation">
       <unit bldFile="mw/mds/metadataengine/common/group"/>
      </component>
-     <component name="metadataengine_server" long-name="Server" origin-model="Foundation">
+     <component name="metadataengine_server" long-name="Server" origin-model="foundation">
       <unit bldFile="mw/mds/metadataengine/server/group"/>
      </component>
-     <component name="metadataengine_client" long-name="Client" origin-model="Foundation">
+     <component name="metadataengine_client" long-name="Client" origin-model="foundation">
       <unit bldFile="mw/mds/metadataengine/client/group"/>
      </component>
-     <component unofficial="yes" name="metadataengine_build" long-name="Metadata Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="metadataengine_build" long-name="Metadata Engine Build" origin-model="foundation">
       <unit bldFile="mw/mds/metadataengine/group"/>
      </component>
     </collection>
     <collection name="watchdog" long-name="Watchdog" level="server">
-     <component name="mdswatchdog.exe=binary" origin-model="Foundation">
+     <component name="mdswatchdog" origin-model="foundation">
       <unit bldFile="mw/mds/watchdog/group"/>
      </component>
     </collection>
     <collection name="iadstoprestart" long-name="IAD Stop Restart" level="server">
-     <component unofficial="yes" name="iadstoprestart_build" long-name="IAD Stop Restart Build" origin-model="Foundation">
+     <component unofficial="yes" name="iadstoprestart_build" long-name="IAD Stop Restart Build" origin-model="foundation">
       <!-- <unit bldFile="mw/mds/iadstoprestart/group"/> -->
      </component>
     </collection>
-    <collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-     <component unofficial="yes" name="content_listing_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="mds_pub_build" long-name="Metadata Services Public API Build" origin-model="Foundation">
-      <unit bldFile="mw/mds/mds_pub/group"/>
-     </component>
-    </collection>
     <collection name="mds_info" long-name="Metadata Services Info" level="int">
-     <component unofficial="yes" name="mds_build" long-name="Metadata Services Build" origin-model="Foundation">
-      <unit bldFile="mw/mds/group"/>
-     </component>
-    </collection>
-    <collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-     <component unofficial="yes" name="mds_plat_build" long-name="Metadata Services Platform API Build" origin-model="Foundation">
+     <component unofficial="yes" name="mds_pub" long-name="Metadata Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/mds/mds_pub/group"/>
+     </component>
+     <component unofficial="yes" name="mds_plat" long-name="Metadata Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
       <unit bldFile="mw/mds/mds_plat/group"/>
-     </component>
-     <component unofficial="yes" name="location_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/mds/mds_plat/location_manager_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="harvester_framework_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
-      <unit bldFile="mw/mds/mds_plat/harvester_framework_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
       <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
       <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="content_listing_framework_extended_api" origin-model="Foundation">
-      <unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_collection_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="metadata_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/mds/mds_plat/metadata_engine_api/group"/>
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="context_engine_plugin_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group"/>
+     <component unofficial="yes" name="mds_build" long-name="Metadata Services Build" origin-model="foundation">
+      <unit bldFile="mw/mds/group"/>
      </component>
     </collection>
    </block>
    <block name="mmuifw" long-name="Multimedia UI Framework" tech_domain="mm" level="specific" levels="mgr mdl util ui">
     <collection name="alfwidgetutils" long-name="ALF Widget Utils" level="ui">
-     <component name="alfwidgetutils.dll=binary" long-name="ALF Widget Utils Component" origin-model="Foundation">
+     <component name="alfwidgetutils_build" long-name="ALF Widget Utils Component" origin-model="foundation">
       <unit bldFile="mw/mmuifw/alfwidgetutils/group"/>
      </component>
     </collection>
     <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
-     <component name="mullogging" long-name="Mul Logging" origin-model="Foundation">
+     <component name="mullogging" long-name="Mul Logging" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
      </component>
-     <component name="muldatamodel" long-name="Mul Data Model" origin-model="Foundation">
+     <component name="muldatamodel" long-name="Mul Data Model" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
      </component>
-     <component name="mulwidgets_common" long-name="Common" origin-model="Foundation">
+     <component name="mulwidgets_common" long-name="Common" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
      </component>
-     <component name="gesturehelper" long-name="Gesture Helper" origin-model="Foundation">
+     <component name="gesturehelper" long-name="Gesture Helper" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
      </component>
-     <component name="mulcoverflowwidget" long-name="MUL Coverflow Widget" origin-model="Foundation">
+     <component name="mulcoverflowwidget" long-name="MUL Coverflow Widget" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
      </component>
-     <component name="mulsliderwidget" long-name="Mul Slider Widget" origin-model="Foundation">
+     <component name="mulsliderwidget" long-name="Mul Slider Widget" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
      </component>
-     <component name="alfviewwidget" long-name="ALF View Widget" origin-model="Foundation">
+     <component name="alfviewwidget" long-name="ALF View Widget" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
      </component>
-     <component name="alfcontainerwidget" long-name="ALF Container Widget" origin-model="Foundation">
+     <component name="alfcontainerwidget" long-name="ALF Container Widget" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
      </component>
-     <component name="alfscrollbarwidget" long-name="ALF Scrollbar Widget" origin-model="Foundation">
+     <component name="alfscrollbarwidget" long-name="ALF Scrollbar Widget" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
      </component>
-     <component unofficial="yes" name="mulwidgets_build" long-name="MUL Widgets Build" origin-model="Foundation">
+     <component unofficial="yes" name="mulwidgets_build" long-name="MUL Widgets Build" origin-model="foundation">
       <unit bldFile="mw/mmuifw/mulwidgets/group"/>
      </component>
     </collection>
     <collection name="osncore" long-name="OSN Core" level="util">
-     <component name="osncore" long-name="OSN Core" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/osncore/osncore/group"/>
-     </component>
-     <component unofficial="yes" name="osncore_build" long-name="OSN Core Build" origin-model="Foundation">
+     <component name="osncore_build" long-name="OSN Core" origin-model="foundation">
       <unit bldFile="mw/mmuifw/osncore/group"/>
      </component>
+     
     </collection>
     <collection name="resourcepool" long-name="Resource Pool" level="util">
-     <component name="alfresourcepool.dll=binary" long-name="ALF Resource Pool" origin-model="Foundation">
+     <component name="alfresourcepool" long-name="ALF Resource Pool" origin-model="foundation">
       <unit bldFile="mw/mmuifw/resourcepool/group"/>
      </component>
     </collection>
     <collection name="widgetmodel" long-name="Widget Model" level="mdl">
-     <component name="alfwidgetmodel" long-name="ALF Widget Model" origin-model="Foundation">
+     <component name="alfwidgetmodel" long-name="ALF Widget Model" origin-model="foundation">
       <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetmodel/group"/> -->
      </component>
-     <component name="alfwidgetfactory" long-name="ALF Widget Factory" origin-model="Foundation">
+     <component name="alfwidgetfactory" long-name="ALF Widget Factory" origin-model="foundation">
       <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetfactory/group"/> -->
      </component>
-     <component unofficial="yes" name="widgetmodel_build" long-name="Widget Model Build" origin-model="Foundation">
+     <component unofficial="yes" name="widgetmodel_build" long-name="Widget Model Build" origin-model="foundation">
       <unit bldFile="mw/mmuifw/widgetmodel/group"/>
      </component>
     </collection>
     <collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
-     <component unofficial="yes" name="mmuifw_build" long-name="Multimedia UI Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/group"/>
+     </component>
+     <component unofficial="yes" name="mmuifw_build" long-name="Multimedia UI Framework Build" origin-model="foundation">
       <unit bldFile="mw/mmuifw/group"/>
      </component>
     </collection>
-    <collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="ui">
-     <component unofficial="yes" name="alf_containerwidget_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="gesturehelper_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_resourcepool_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_customlayoutmanagers_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_sliderwidget_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_widgetmodel_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_widgetutils_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_widget_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_scrollbarwidget_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_widgetfactory_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_string_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_global_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_datamodel_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_container_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_coverflowwidget_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_viewwidget_api" origin-model="Foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videoutils" long-name="Video Utils" tech_domain="mm" level="specific" levels="empty eng util">
     <collection name="dvrengine" long-name="DVR Engine" level="eng">
-     <component name="CommonRecordingEngine" long-name="Common Recording Engine" origin-model="Foundation">
+     <component name="commonrecordingengine" long-name="Common Recording Engine" origin-model="foundation">
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliphandler/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliprecognizer/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtputils/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/group"/>
      </component>
-     <component name="CommonRecordingEngineClient" long-name="Common Recording Engine Client" origin-model="Foundation">
+     <component name="commonrecordingengineclient" long-name="Common Recording Engine Client" origin-model="foundation">
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengineclient/group"/>
      </component>
-     <component unofficial="yes" name="dvrengine_build" long-name="DVR Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="dvrengine_build" long-name="DVR Engine Build" origin-model="foundation">
       <unit bldFile="mw/videoutils/dvrengine/group"/>
      </component>
     </collection>
     <collection name="videoconnutility" long-name="Video Conn Utility" level="util">
-     <component name="connutilpsworker" long-name="Conn Util Ps Worker" origin-model="Foundation">
+     <component name="connutilpsworker" long-name="Conn Util Ps Worker" origin-model="foundation">
       <unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
      </component>
-     <component unofficial="yes" name="videoconnutility_build" long-name="Video Conn Utility Build" origin-model="Foundation">
+     <component unofficial="yes" name="videoconnutility_build" long-name="Video Conn Utility Build" origin-model="foundation">
       <unit bldFile="mw/videoutils/videoconnutility/group"/>
      </component>
     </collection>
     <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-     <component name="SchedulerClient" long-name="Scheduler Client" origin-model="Foundation">
+     <component name="schedulerclient" long-name="Scheduler Client" origin-model="foundation">
       <unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
      </component>
-     <component name="SchedulerServer" long-name="Scheduler Server" origin-model="Foundation">
+     <component name="schedulerserver" long-name="Scheduler Server" origin-model="foundation">
       <unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
      </component>
-     <component unofficial="yes" name="videoscheduler_build" long-name="Video Scheduler Build" origin-model="Foundation">
+     <component unofficial="yes" name="videoscheduler_build" long-name="Video Scheduler Build" origin-model="foundation">
       <unit bldFile="mw/videoutils/videoscheduler/group"/>
      </component>
     </collection>
-    <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="util">
-     <component unofficial="yes" name="dvrengine_api" origin-model="Foundation">
-      <unit bldFile="mw/videoutils/videoutils_plat/dvrengine_api/group"/>
-     </component>
-     <component unofficial="yes" name="videoscheduler_api" origin-model="Foundation">
-      <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="videoutils_plat_build" long-name="Video Utils Platform API Build" origin-model="Foundation">
+    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
+     <component unofficial="yes" name="videoutils_plat" long-name="Video Utils Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="mw/videoutils/videoutils_plat/group"/>
-     </component>
-     <component unofficial="yes" name="videoconnutility_api" origin-model="Foundation">
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
-      <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
-     <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build" origin-model="Foundation">
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build" origin-model="foundation">
       <unit bldFile="mw/videoutils/group"/>
      </component>
     </collection>
    </block>
    <block name="mmmw" long-name="Multimedia Middleware" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
     <collection name="radioutility" long-name="Radio Utility" level="generic">
-     <component name="radioserver" long-name="Radio Server" origin-model="Foundation">
+     <component name="radioserver" long-name="Radio Server" origin-model="foundation">
       <unit bldFile="mw/mmmw/radioutility/radioserver/group"/>
       <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/server/group"/> -->
       <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/session/group"/> -->
      </component>
-     <component name="radio_utility" long-name="Radio Utility" origin-model="Foundation">
+     <component name="radio_utility" long-name="Radio Utility" origin-model="foundation">
       <unit bldFile="mw/mmmw/radioutility/radio_utility/group"/>
      </component>
-     <component name="fmpresetutility" long-name="FM Preset Utility" origin-model="Foundation">
+     <component name="fmpresetutility" long-name="FM Preset Utility" origin-model="foundation">
       <unit bldFile="mw/mmmw/radioutility/fmpresetutility/group"/>
      </component>
-     <component unofficial="yes" name="radioutility_build" long-name="Radio Utility Build" origin-model="Foundation">
+     <component unofficial="yes" name="radioutility_build" long-name="Radio Utility Build" origin-model="foundation">
       <unit bldFile="mw/mmmw/radioutility/group"/>
      </component>
     </collection>
     <collection name="mtp" long-name="MTP" level="framework">
-     <component name="mtpserver" long-name="Mtp Server" origin-model="Foundation"/>
-     <component name="mtpusbclass" long-name="MTP USB Class" origin-model="Foundation"/>
-     <component name="install" long-name="Install" origin-model="Foundation"/>
+     <component name="mtpserver" long-name="Mtp Server" origin-model="foundation"/>
+     <component name="mtpusbclass" long-name="MTP USB Class" origin-model="foundation"/>
+     <component name="install" long-name="Install" origin-model="foundation"/>
     </collection>
     <collection name="audioeffectsui" long-name="Audio Effects UI" level="specific">
-     <component name="equalizer" long-name="Equalizer" origin-model="Foundation">
+     <component name="equalizer" long-name="Equalizer" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioeffectsui/equalizer/group"/>
      </component>
-     <component unofficial="yes" name="audioeffectsui_build" long-name="Audio Effects UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="audioeffectsui_build" long-name="Audio Effects UI Build" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioeffectsui/group"/>
      </component>
     </collection>
     <collection name="audioenhancements" long-name="Audio Enhancements" level="generic">
-     <component name="enhancedaudioplayerutility" long-name="Enhanced Media Client" origin-model="Foundation">
+     <component name="enhancedaudioplayerutility" long-name="Enhanced Media Client" origin-model="foundation">
       <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/audioplayer/group"/> -->
       <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/audiostreaming/group"/> -->
       <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/group"/>
@@ -7489,44 +5542,44 @@
       <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosourcefactory/group"/> -->
       <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audioutility/group"/> -->
      </component>
-     <component name="progressivedownload" long-name="Progressive Download" origin-model="Foundation">
+     <component name="progressivedownload" long-name="Progressive Download" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/group"/>
       <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/progressivedownloadsource/group"/> -->
       <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/progressivedownloadutility/group"/> -->
      </component>
-     <component name="enhancedmediaclient" long-name="Enhanced Media Client" origin-model="Foundation">
+     <component name="enhancedmediaclient" long-name="Enhanced Media Client" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/group"/>
      </component>
-     <component name="profilesettingsmonitor" long-name="Profile Settings Monitor" origin-model="Foundation">
+     <component name="profilesettingsmonitor" long-name="Profile Settings Monitor" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioenhancements/profilesettingsmonitor/group"/>
      </component>
-     <component name="voipaudioservices" long-name="VoIP Audio Services" origin-model="Foundation">
+     <component name="voipaudioservices" long-name="VoIP Audio Services" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/group"/>
      </component>
-     <component name="configurationcomponentsfactory" long-name="Configuration Components Factory" origin-model="Foundation">
+     <component name="configurationcomponentsfactory" long-name="Configuration Components Factory" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioenhancements/configurationcomponentsfactory/group"/>
      </component>
-     <component name="audiooutputcontrolutility" long-name="Audio Output Control Utility" origin-model="Foundation">
+     <component name="audiooutputcontrolutility" long-name="Audio Output Control Utility" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioenhancements/audiooutputcontrolutility/group"/>
      </component>
-     <component name="callaudiocontrol" long-name="Call Audio Control" origin-model="Foundation">
+     <component name="callaudiocontrol" long-name="Call Audio Control" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioenhancements/callaudiocontrol/group"/>
      </component>
-     <component unofficial="yes" name="audioenhancements_build" long-name="Audio Enhancements Build" origin-model="Foundation">
+     <component unofficial="yes" name="audioenhancements_build" long-name="Audio Enhancements Build" origin-model="foundation">
       <unit bldFile="mw/mmmw/audioenhancements/group"/>
      </component>
     </collection>
     <collection name="metadatautility" long-name="Metadata Utility" level="generic">
-     <component name="3GPExtParserLib" origin-model="Foundation"/>
-     <component name="3GPExtParserLib_stub" origin-model="Foundation">
+     <component name="3gpextparserlib" origin-model="foundation"/>
+     <component name="3gpextparserlib_stub" origin-model="foundation">
       <unit bldFile="mw/mmmw/metadatautility/3gpextparserlib_stub/group"/>
      </component>
-     <component unofficial="yes" name="metadatautility_build" long-name="Metadata Utility Build" origin-model="Foundation">
+     <component name="metadatautility_build" origin-model="foundation">
       <unit bldFile="mw/mmmw/metadatautility/group"/>
      </component>
     </collection>
     <collection name="advancedaudiocontroller" long-name="Advanced Audio Controller" level="plugin">
-     <component name="audiocontrollerpluginsvariant" long-name="Audio Controller Plugins Variant" origin-model="Foundation">
+     <component name="audiocontrollerpluginsvariant" long-name="Audio Controller Plugins Variant" origin-model="foundation">
       <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/group"/> -->
       <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/group"/> -->
       <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpdatasourceadapter/group"/> -->
@@ -7545,27 +5598,27 @@
       <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/metadatawrite/group"/> -->
       <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/group"/> -->
      </component>
-     <component name="wavplaycontrollerplugin" long-name="WAV Play Controller Plugin" origin-model="Foundation">
+     <component name="wavplaycontrollerplugin" long-name="WAV Play Controller Plugin" origin-model="foundation">
       <unit bldFile="mw/mmmw/advancedaudiocontroller/wavplaycontrollerplugin/group"/>
      </component>
-     <component unofficial="yes" name="advancedaudiocontroller_test" long-name="Advanced Audio Controller Test" origin-model="Foundation">
+     <component unofficial="yes" name="advancedaudiocontroller_test" long-name="Advanced Audio Controller Test" origin-model="foundation">
       <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/> -->
      </component>
-     <component unofficial="yes" name="advancedaudiocontroller_build" long-name="Advanced Audio Controller Build" origin-model="Foundation">
+     <component unofficial="yes" name="advancedaudiocontroller_build" long-name="Advanced Audio Controller Build" origin-model="foundation">
       <unit bldFile="mw/mmmw/advancedaudiocontroller/group"/>
      </component>
     </collection>
     <collection name="thumbnailengine" long-name="Thumbnail Engine" level="server">
-     <component name="TNEEngine.dll=binary" long-name="TNE Engine" origin-model="Foundation">
+     <component name="tneengine" long-name="TNE Engine" origin-model="foundation">
       <unit bldFile="mw/mmmw/thumbnailengine/group"/>
      </component>
     </collection>
     <collection name="mmfw" long-name="Multimedia Framework" level="framework">
-     <component name="gstreamer" long-name="GStreamer" origin-model="Foundation"/>
-     <component name="helix_stub" long-name="Helix Stub" origin-model="Foundation">
+     <component name="gstreamer" long-name="GStreamer" origin-model="foundation"/>
+     <component name="helix_stub" long-name="Helix Stub" origin-model="foundation">
       <unit bldFile="mw/mmmw/mmfw/helix_stub/group"/>
      </component>
-     <component unofficial="yes" name="mmfw_build" long-name="Multimedia Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmfw_build" long-name="Multimedia Framework Build" origin-model="foundation">
       <unit bldFile="mw/mmmw/mmfw/group"/>
      </component>
     </collection>
@@ -7602,342 +5655,211 @@
      </component>
     </collection>
     <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-     <component unofficial="yes" name="mmmw_build" long-name="Multimedia Middleware Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmmw_build" long-name="Multimedia Middleware Build" origin-model="foundation">
       <unit bldFile="mw/mmmw/group"/>
      </component>
-     <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test" origin-model="Foundation">
+     <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test" origin-model="foundation">
       <!-- <unit bldFile="mw/mmmw/tsrc/group"/> -->
      </component>
+     <component unofficial="yes" name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/tsrc/group"/>
+     </component>
     <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-     <component unofficial="yes" name="enhanced_media_client_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="progressive_download_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_buffer_source_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_audio_control_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_descriptor_source_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_balance_effect_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-     </component>
-     <component unofficial="yes" name="stream_control_custom_command_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_volume_effect_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_file_source_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_progressive_download_source_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_audio_effects_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-     </component>
-     <component unofficial="yes" name="mtp_keys_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/mtp_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="configuration_components_factory_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="mtp_wmdrm_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/mtp_wmdrm_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_metadata_reader_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-     </component>
-     <component unofficial="yes" name="voip_audio_services_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="thumbnail_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_drm_config_intfc_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-     </component>
-     <component unofficial="yes" name="equalizer_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_data_source_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_preset_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_output_control_utility_proxy_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_monitor_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_output_control_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="helix" long-name="Helix" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
     <collection name="helix_ren" long-name="Helix" level="framework">
-     <component name="helixrfsplugin" long-name="Helix RFS Plugin" origin-model="Foundation"/>
-     <component name="helix_binary" long-name="Helix Binary" origin-model="Foundation"/>
-     <component name="src" long-name="Src" origin-model="Foundation"/>
+     <component name="helixrfsplugin" long-name="Helix RFS Plugin" origin-model="foundation"/>
+     <component name="helix_binary" long-name="Helix Binary" origin-model="foundation"/>
+     <component name="src" long-name="Src" origin-model="foundation"/>
     </collection>
    </block>
    <block name="camerasrv" long-name="Camera Services" tech_domain="mm" level="specific" levels="plugin fw api">
     <collection name="camappengine" long-name="Camera App Engine" level="fw">
-     <component name="StillConverter" long-name="Still Converter" origin-model="Foundation">
+     <component name="stillconverter" long-name="Still Converter" origin-model="foundation">
       <!-- <unit bldFile="mw/camerasrv/camappengine/stillconverter/group"/> -->
      </component>
-     <component name="Engine" origin-model="Foundation">
+     <component name="camappengine_engine" origin-model="foundation">
       <!-- <unit bldFile="mw/camerasrv/camappengine/engine/group"/> -->
      </component>
-     <component name="asynchfilesavequeue" long-name="Asynch File Save Queue" origin-model="Foundation">
+     <component name="asynchfilesavequeue" long-name="Asynch File Save Queue" origin-model="foundation">
       <unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
       <!-- <unit bldFile="mw/camerasrv/camappengine/asynchfilesavequeue/tsrc/public/basic/group"/> -->
      </component>
-     <component unofficial="yes" name="camappengine_build" origin-model="Foundation">
+     <component unofficial="yes" name="camappengine_build" origin-model="foundation">
       <unit bldFile="mw/camerasrv/camappengine/build"/>
      </component>
     </collection>
     <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-     <component name="mediarecorder" long-name="Media Recorder" origin-model="Foundation">
+     <component name="mediarecorder" long-name="Media Recorder" origin-model="foundation">
       <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/mediarecorder/group"/> -->
      </component>
-     <component name="filecomposer" long-name="File Composer" origin-model="Foundation">
+     <component name="filecomposer" long-name="File Composer" origin-model="foundation">
       <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/filecomposer/group"/> -->
      </component>
-     <component name="camcordermmfplugin_controller" long-name="Controller" origin-model="Foundation">
+     <component name="camcordermmfplugin_controller" long-name="Controller" origin-model="foundation">
       <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/controller/group"/> -->
      </component>
-     <component unofficial="yes" name="camcordermmfplugin_test" long-name="Camcorder MMF Plugin Test" origin-model="Foundation">
+     <component unofficial="yes" name="camcordermmfplugin_test" long-name="Camcorder MMF Plugin Test" origin-model="foundation">
       <!-- <unit bldFile="mw/camerasrv/camcordermmfplugin/tsrc/public/basic/group"/> -->
      </component>
-     <component unofficial="yes" name="camcordermmfplugin_build" origin-model="Foundation">
+     <component unofficial="yes" name="camcordermmfplugin_build" origin-model="foundation">
       <unit bldFile="mw/camerasrv/camcordermmfplugin/build"/>
      </component>
     </collection>
     <collection name="configmanagers" long-name="Config Managers" level="api">
-     <component name="imagingconfigmanager" long-name="Imaging Config Manager" origin-model="Foundation">
+     <component name="imagingconfigmanager" long-name="Imaging Config Manager" origin-model="foundation">
       <unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
       <!-- <unit bldFile="mw/camerasrv/configmanagers/imagingconfigmanager/tsrc/public/basic/group"/> -->
      </component>
     </collection>
     <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-     <component unofficial="yes" name="camerasrv_build" long-name="Camera Services Build" origin-model="Foundation">
-      <unit bldFile="mw/camerasrv/group"/>
-     </component>
-    </collection>
-    <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-     <component unofficial="yes" name="media_recorder_api" origin-model="Foundation">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group"/>
+     <component unofficial="yes" name="camerasrv_plat" long-name="Camera Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
+      <unit bldFile="mw/camerasrv/camerasrv_plat/group"/>
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="custom_onboard_camera_api" origin-model="Foundation">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_recorder_sink_api" origin-model="Foundation">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-     </component>
-     <component unofficial="yes" name="asynchronous_file_saving_queue_api" origin-model="Foundation">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="3gp_file_composer_api" origin-model="Foundation">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-     </component>
-     <component unofficial="yes" name="camera_application_engine_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="cae_extentension_api" origin-model="Foundation">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-     </component>
-     <component unofficial="yes" name="imaging_configuration_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
+     <component unofficial="yes" name="camerasrv_build" long-name="Camera Services Build" origin-model="foundation">
+      <unit bldFile="mw/camerasrv/group"/>
      </component>
     </collection>
    </block>
    <block name="mmappfw" long-name="Multimedia App Framework" tech_domain="mm" level="specific" levels="empty fw utils">
     <collection name="mmappcomponents" long-name="MM App Components" level="utils">
-     <component name="collectionhelper" long-name="Collection Helper" origin-model="Foundation">
+     <component name="collectionhelper" long-name="Collection Helper" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
      </component>
-     <component name="playlistengine" long-name="Playlist Engine" origin-model="Foundation">
+     <component name="playlistengine" long-name="Playlist Engine" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
      </component>
-     <component name="harvester" long-name="Harvester" origin-model="Foundation">
+     <component name="mmappfwharvester" long-name="Harvester" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
      </component>
-     <component name="mmappcommonui" long-name="MM App Common UI" origin-model="Foundation">
+     <component name="mmappcommonui" long-name="MM App Common UI" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
      </component>
-     <component name="mediaplayersettingsengine" long-name="Media Player Settings Engine" origin-model="Foundation">
+     <component name="mediaplayersettingsengine" long-name="Media Player Settings Engine" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
      </component>
-     <component name="audiofetcher" long-name="UUDIO Fetcher" origin-model="Foundation">
+     <component name="audiofetcher" long-name="UUDIO Fetcher" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mmappcomponents/audiofetcher/group"/>
      </component>
-     <component name="asxparser" long-name="ASX Parser" origin-model="Foundation">
+     <component name="asxparser" long-name="ASX Parser" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/>
       <!-- <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/test"/> -->
      </component>
     </collection>
     <collection name="mpx" long-name="MPX" level="fw">
-     <component name="commonframework" long-name="Common Framework" origin-model="Foundation">
+     <component name="commonframework" long-name="Common Framework" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
      </component>
-     <component name="playbackframework" long-name="Playback Framework" origin-model="Foundation">
+     <component name="playbackframework" long-name="Playback Framework" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
      </component>
-     <component name="collectionframework" long-name="Collection Framework" origin-model="Foundation">
+     <component name="mpxcollectionfw" long-name="Collection Framework" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
      </component>
-     <component name="viewframework" long-name="View Framework" origin-model="Foundation">
+     <component name="mpxviewfw" long-name="View Framework" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
      </component>
-     <component unofficial="yes" name="mpx_build" long-name="MPX Build" origin-model="Foundation">
+     <component unofficial="yes" name="mpx_build" long-name="MPX Build" origin-model="foundation">
       <unit bldFile="mw/mmappfw/mpx/group"/>
      </component>
     </collection>
     <collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="utils">
-     <component unofficial="yes" name="mmappfw_build" long-name="Multimedia App Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmappfw_build" long-name="Multimedia App Framework Build" origin-model="foundation">
       <unit bldFile="mw/mmappfw/group"/>
      </component>
-     <component unofficial="yes" name="mmappfw_test" long-name="Multimedia App Framework Test" origin-model="Foundation">
+     <component unofficial="yes" name="mmappfw_test" long-name="Multimedia App Framework Test" origin-model="foundation">
       <!-- <unit bldFile="mw/mmappfw/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="utils">
-     <component unofficial="yes" name="mpx_albumart_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="asx_parser_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="collection_helper_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-     </component>
-     <component unofficial="yes" name="mmappfw_plat_build" long-name="Multimedia App Framework Platform API Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/tsrc/group"/>
       <unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_playback_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_player_settings_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_metadata_extractor_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_collection_mediator_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_common_definition_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="playlist_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_playback_common_definition_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_backstepping_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_server_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_base_view_plugins_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_collection_common_definition_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_view_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_collection_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/tsrc/group"/>
      </component>
     </collection>
    </block>
    <block name="inputmethods" long-name="Input Methods" tech_domain="ui" level="generic" levels="plugin engine framework">
     <collection name="textinput" long-name="Text Input" level="framework">
-     <component name="ptienginev2" long-name="PTI Engine V2" origin-model="Foundation">
+     <component name="ptienginev2" long-name="PTI Engine V2" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
      </component>
-     <component name="AknInputLanguage" long-name="Akn Input Language" origin-model="Foundation">
+     <component name="akninputlanguage" long-name="Akn Input Language" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
      </component>
-     <component name="peninputarc" long-name="Pen Input Arc" origin-model="Foundation">
+     <component name="peninputarc" long-name="Pen Input Arc" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
       <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/src/peninputserverapp"/> -->
       <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/utils/group"/> -->
      </component>
-     <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls" origin-model="Foundation">
+     <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
      </component>
-     <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn" origin-model="Foundation">
+     <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
      </component>
-     <component name="peninputvkbcn" long-name="Pen Input Vkbcn" origin-model="Foundation">
+     <component name="peninputvkbcn" long-name="Pen Input Vkbcn" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
      </component>
-     <component name="peninputcommonlayout" long-name="Pen Input Common Layout" origin-model="Foundation">
+     <component name="peninputcommonlayout" long-name="Pen Input Common Layout" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
      </component>
-     <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr" origin-model="Foundation">
+     <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
      </component>
-     <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb" origin-model="Foundation">
+     <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
      </component>
-     <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp" origin-model="Foundation">
+     <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
      </component>
-     <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp" origin-model="Foundation">
+     <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
      </component>
-     <component name="peninputvkbjp" long-name="Pen Input Vkbjp" origin-model="Foundation">
+     <component name="peninputvkbjp" long-name="Pen Input Vkbjp" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
      </component>
-     <component name="peninputgenericitut" long-name="Pen Input Generici Tut" origin-model="Foundation">
+     <component name="peninputgenericitut" long-name="Pen Input Generici Tut" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
      </component>
-     <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI" origin-model="Foundation">
+     <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
      </component>
-     <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn" origin-model="Foundation">
+     <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
      </component>
-     <component name="Matsutake" long-name="Matsutake" origin-model="Foundation"/>
-     <component unofficial="yes" name="textinput_build" long-name="Text Input Build" origin-model="Foundation">
+     <component name="matsutake" long-name="Matsutake" origin-model="foundation"/>
+     <component unofficial="yes" name="textinput_build" long-name="Text Input Build" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/group"/>
      </component>
-     <component unofficial="yes" name="gslangplugin" origin-model="Foundation">
+     <component unofficial="yes" name="gslangplugin" origin-model="foundation">
       <unit bldFile="mw/inputmethods/textinput/gslangplugin"/>
      </component>
     </collection>
     <collection name="fep" long-name="FEP" level="engine">
-     <component name="aknfep" long-name="AKN FEP" origin-model="Foundation">
+     <component name="aknfep" long-name="AKN FEP" origin-model="foundation">
       <unit bldFile="mw/inputmethods/fep/aknfep/group"/>
       <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugincn/group"/> -->
       <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/> -->
@@ -7955,105 +5877,71 @@
      </component>
     </collection>
     <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
-     <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build" origin-model="Foundation">
+     <component unofficial="yes" name="inputmethods_plat" long-name="Input Methods Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
+      <unit bldFile="mw/inputmethods/inputmethods_plat/group"/>
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build" origin-model="foundation">
       <unit bldFile="mw/inputmethods/group"/>
      </component>
+     <component unofficial="yes" name="inputmethods_pub" long-name="Input Methods Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/inputmethods_pub/group"/>
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
+     </component>
     <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="framework">
-     <component unofficial="yes" name="aknfep_status_api" origin-model="Foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptiengine_indic_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptiengine_key_definations_api" origin-model="Foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ptiengine_hwr_api" origin-model="Foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="aknfep_uiinterface_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="pen_input_server_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_pen_support_api" origin-model="Foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-     </component>
-    </collection>
-    <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="framework">
-     <component unofficial="yes" name="input_language_info_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="optical_character_recognition_api" origin-model="Foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ptiengine_iti_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="classicui" long-name="Classic UI" tech_domain="ui" level="generic" levels="base support server generic specific">
     <collection name="psln" long-name="Personalization" level="specific">
-     <component name="pslnengine" long-name="Personalization Engine" origin-model="Foundation">
+     <component name="pslnengine" long-name="Personalization Engine" origin-model="foundation">
       <!-- <unit bldFile="mw/classicui/psln/pslnengine/group"/> -->
      </component>
-     <component name="PslnFramework" long-name="Personalization Framework" origin-model="Foundation">
+     <component name="pslnframework" long-name="Personalization Framework" origin-model="foundation">
       <!-- <unit bldFile="mw/classicui/psln/pslnframework"/> -->
      </component>
-     <component name="PslnLibraryLoaders" long-name="Personalization Library Loaders" origin-model="Foundation"/>
-     <component name="pslnslidesetdialog" long-name="Personalization Slideset Dialog" origin-model="Foundation">
+     <component name="pslnlibraryloaders" long-name="Personalization Library Loaders" origin-model="foundation"/>
+     <component name="pslnslidesetdialog" long-name="Personalization Slideset Dialog" origin-model="foundation">
       <!-- <unit bldFile="mw/classicui/psln/pslnslidesetdialog/group"/> -->
      </component>
-     <component name="PslnGSPlugin" long-name="Personalizaion GS Plugin" origin-model="Foundation">
+     <component name="pslngsplugin" long-name="Personalizaion GS Plugin" origin-model="foundation">
       <unit bldFile="mw/classicui/psln/pslngsplugin/group"/>
      </component>
-     <component name="psln_help" long-name="Help" origin-model="Foundation">
+     <component name="psln_help" long-name="Help" origin-model="foundation">
       <unit bldFile="mw/classicui/psln/help/group"/>
      </component>
-     <component unofficial="yes" name="psln_build" long-name="Personalization Build" origin-model="Foundation">
+     <component name="psln_build" long-name="Psln" origin-model="foundation">
       <unit bldFile="mw/classicui/psln/group"/>
      </component>
     </collection>
     <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-     <component name="ServiceHandler" long-name="Service Handler" origin-model="Foundation">
+     <component name="aifwservicehandler" long-name="Service Handler" origin-model="foundation">
       <unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
      </component>
     </collection>
     <collection name="commonuis" long-name="Common UIs" level="specific">
-     <component name="CommonUi" long-name="Common UI" origin-model="Foundation">
+     <component name="commonui" long-name="Common UI" origin-model="foundation">
       <unit bldFile="mw/classicui/commonuis/commonui/group"/>
      </component>
-     <component name="CommonDialogs" long-name="Common Dialogs" origin-model="Foundation">
+     <component name="commondialogs" long-name="Common Dialogs" origin-model="foundation">
       <unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
       <!-- <unit bldFile="mw/classicui/commonuis/commondialogs/group_test"/> -->
      </component>
     </collection>
     <collection name="uifw" long-name="UI Framework" level="server">
-     <component name="uiklaf" long-name="UIKLAF" origin-model="Foundation">
+     <component name="uiklaf" long-name="UIKLAF" origin-model="foundation">
       <unit bldFile="mw/classicui/uifw/uiklaf/group"/>
      </component>
-     <component name="eikctl" long-name="Eikctl" origin-model="Foundation">
+     <component name="eikctl" long-name="Eikctl" origin-model="foundation">
       <unit bldFile="mw/classicui/uifw/eikctl/group"/>
      </component>
-     <component name="AvKon" long-name="AvKon" origin-model="Foundation">
+     <component name="avkon" long-name="AvKon" origin-model="foundation">
       <!-- <unit bldFile="mw/classicui/uifw/avkon/aknhlist/group"/> -->
       <!-- <unit bldFile="mw/classicui/uifw/avkon/aknkeyrotator/group"/> -->
       <unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
@@ -8062,26 +5950,26 @@
       <!-- <unit bldFile="mw/classicui/uifw/avkon/prebuilder"/> -->
       <!-- <unit bldFile="mw/classicui/uifw/avkon/tsrc/bc/s60_sdkmcl/bctestmixmcl/group"/> -->
      </component>
-     <component name="EikStd" long-name="EikStd" origin-model="Foundation">
+     <component name="eikstd" long-name="EikStd" origin-model="foundation">
       <unit bldFile="mw/classicui/uifw/eikstd/group"/>
      </component>
-     <component name="AknGlobalUI" long-name="Avkon Global UI" origin-model="Foundation">
+     <component name="aknglobalui" long-name="Avkon Global UI" origin-model="foundation">
       <unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
      </component>
-     <component name="ganes" long-name="Ganes" origin-model="Foundation">
+     <component name="ganes" long-name="Ganes" origin-model="foundation">
       <unit bldFile="mw/classicui/uifw/ganes/group"/>
      </component>
-     <component unofficial="yes" name="uifw_test" long-name="UI Framework Test" origin-model="Foundation">
+     <component unofficial="yes" name="uifw_test" long-name="UI Framework Test" origin-model="foundation">
       <!-- <unit bldFile="mw/classicui/uifw/tsrc/group"/> -->
      </component>
     </collection>
-    <collection name="CommonAdapter" long-name="Common Adapter" level="support">
-     <component name="commonadapter.dll=binary" origin-model="Foundation">
+    <collection name="commonadapter" long-name="Common Adapter" level="support">
+     <component name="commonadapter_build" origin-model="foundation">
       <unit bldFile="mw/classicui/commonadapter/group"/>
      </component>
     </collection>
     <collection name="ode" long-name="Open Dynamics Engine" level="support">
-     <component name="ode.dll=binary" origin-model="Foundation">
+     <component name="ode_build" origin-model="foundation">
       <unit bldFile="mw/classicui/ode/group"/>
      </component>
     </collection>
@@ -8123,504 +6011,171 @@
      </component>
     </collection>
     <collection name="classicui_info" long-name="Classic UI Info" level="specific">
-     <component unofficial="yes" name="classicui_build" long-name="Classic UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="classicui_build" long-name="Classic UI Build" origin-model="foundation">
       <unit bldFile="mw/classicui/group"/>
      </component>
-     <component unofficial="yes" name="classicui_test" long-name="Classic UI Test" origin-model="Foundation">
-      <!-- <unit bldFile="mw/classicui/tsrc/group"/> -->
+     <component unofficial="yes" name="classicui_pub" long-name="Classic UI Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/application_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/base_controls_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/buttons_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/choice_list_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/context_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/dialogs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/document_handler_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/editors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/error_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/fonts_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/form_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/generic_button_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/grids_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/images_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/indicators_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/initialization_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/input_frame_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/keylock_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/labels_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/misc_controls_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/notes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/notifiers_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/options_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/popups_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/queries_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_mode_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/scroller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/searchfield_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/server_application_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/setting_pages_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/slider_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/sounds_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/status_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/tabs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/title_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/toolbar_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/group"/> -->
+      <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/volume_control_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="classicui_plat" long-name="Classic UI Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/alarm_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/application_switching_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
+      <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/tsrc/group"/> -->
+      <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/ganes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/input_block_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/item_finder_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/list_effects_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/physics_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/popup_form_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/task_list_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/touch_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/tsrc/group"/>
      </component>
     <component name="classicui_metadata" long-name="Classic UI Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-     <component unofficial="yes" name="global_window_priorities_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_provider_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/alarm_api/group"/>
-     </component>
-     <component unofficial="yes" name="signal_pane_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="long_tap_animation_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_file_dialogs_filter_factory_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="volume_popup_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group"/>
-     </component>
-     <component unofficial="yes" name="touch_pane_observer_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="indicator_touch_observer_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_cursors_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group"/>
-     </component>
-     <component unofficial="yes" name="special_character_table_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="battery_pane_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_sounds_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/tsrc/group"/> -->
-      <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-     </component>
-     <component unofficial="yes" name="generic_parameter_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="ode_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_scroller_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_anim_dll_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-     </component>
-     <component unofficial="yes" name="stylus_activated_popup_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group"/>
-     </component>
-     <component unofficial="yes" name="pointer_event_modifier_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="text_scroller_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group"/>
-     </component>
-     <component unofficial="yes" name="number_grouping_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_localised_texts_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_secondary_display_support_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_ui_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_shared_document_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_notifiers_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_input_capabilities_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="find_item_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_configuration_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_localised_texts_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-     </component>
-     <component unofficial="yes" name="server_application_services_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="japanese_reading_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_notes_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_buttons_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group"/>
-     </component>
-     <component unofficial="yes" name="transition_effect_parameters_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_indicators_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_popup_priority_controller_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_runtime_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-     </component>
-     <component unofficial="yes" name="list_effects_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/list_effects_api/group"/>
-     </component>
-     <component unofficial="yes" name="emergency_call_support_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_service_interface_menu_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_animation_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group"/>
-     </component>
-     <component unofficial="yes" name="input_block_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/input_block_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_lists_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_number_text_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="touch_pane_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="themes_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="ganes_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-     </component>
-     <component unofficial="yes" name="task_list_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/task_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_ui_framework_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="uikon_status_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="application_switching_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/application_switching_api/group"/>
-     </component>
-     <component unofficial="yes" name="physics_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-     </component>
-     <component unofficial="yes" name="memory_card_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="transition_effect_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="item_finder_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/item_finder_api/group"/>
-     </component>
-     <component unofficial="yes" name="eikon_server_extension_client_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_dialogs_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="fep_document_navigation_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_editors_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_aiw_criteria_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_animation_plugin_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_queries_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_slide_show_dialog_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_status_pane_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_setting_pages_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group"/>
-     </component>
-     <component unofficial="yes" name="skinnable_clock_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group"/>
-     </component>
-     <component unofficial="yes" name="indicator_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_application_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_ui_server_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_status_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_testability_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
-      <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_rotator_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_fonts_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group"/>
-     </component>
-     <component unofficial="yes" name="legacy_ui_framework_headers_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_initialization_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_grids_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_service_interface_base_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="popup_form_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_plat/popup_form_api/group"/>
-     </component>
-    </collection>
-    <collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-     <component unofficial="yes" name="window_server_event_observer_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="info_popup_note_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group"/>
-     </component>
-     <component unofficial="yes" name="labels_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/labels_api/group"/>
-     </component>
-     <component unofficial="yes" name="uikon_core_controls" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group"/>
-     </component>
-     <component unofficial="yes" name="intermediate_state_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_file_dialogs_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="buttons_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/buttons_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_service_handler_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="screen_saver_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group"/>
-     </component>
-     <component unofficial="yes" name="form_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/form_api/group"/>
-     </component>
-     <component unofficial="yes" name="generic_button_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/generic_button_api/group"/>
-     </component>
-     <component unofficial="yes" name="keylock_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/keylock_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialog_shutter_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group"/>
-     </component>
-     <component unofficial="yes" name="navigation_pane_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_pane_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/context_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="ui_framework_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_generic_parameter_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="slider_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/slider_api/group"/>
-     </component>
-     <component unofficial="yes" name="application_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/application_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="base_controls_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/base_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="touch_ui_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="document_handler_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="ui_framework_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="tabs_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/tabs_api/group"/>
-     </component>
-     <component unofficial="yes" name="input_frame_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/input_frame_api/group"/>
-     </component>
-     <component unofficial="yes" name="indicators_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/indicators_api/group"/>
-     </component>
-     <component unofficial="yes" name="classicui_pub_test" origin-model="Foundation">
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
-     </component>
-     <component unofficial="yes" name="initialization_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/initialization_api/group"/>
-     </component>
-     <component unofficial="yes" name="scroller_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/scroller_api/group"/>
-     </component>
-     <component unofficial="yes" name="setting_pages_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group"/>
-     </component>
-     <component unofficial="yes" name="volume_control_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/volume_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="hotkeys_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group"/>
-     </component>
-     <component unofficial="yes" name="notifiers_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/notifiers_api/group"/>
-     </component>
-     <component unofficial="yes" name="information_preview_popup_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/error_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="screen_mode_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_criteria_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group"/>
-     </component>
-     <component unofficial="yes" name="popups_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/popups_api/group"/>
-     </component>
-     <component unofficial="yes" name="choice_list_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/choice_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="notes_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/notes_api/group"/>
-     </component>
-     <component unofficial="yes" name="screen_clearer_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group"/>
-     </component>
-     <component unofficial="yes" name="grids_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/grids_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialogs_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="images_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/images_api/group"/>
-     </component>
-     <component unofficial="yes" name="fonts_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/fonts_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-     </component>
-     <component unofficial="yes" name="searchfield_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/searchfield_api/group"/>
-     </component>
-     <component unofficial="yes" name="private_ui_framework_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="sounds_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/sounds_api/group"/>
-     </component>
-     <component unofficial="yes" name="editors_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/editors_api/group"/>
-     </component>
-     <component unofficial="yes" name="misc_controls_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="stylus_popup_menu_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group"/>
-     </component>
-     <component unofficial="yes" name="queries_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/queries_api/group"/>
-     </component>
-     <component unofficial="yes" name="title_pane_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/title_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="toolbar_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/toolbar_api/group"/>
-     </component>
-     <component unofficial="yes" name="animation_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/animation_api/group"/>
-     </component>
-     <component unofficial="yes" name="options_menu_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/options_menu_api/group"/>
-     </component>
-     <component unofficial="yes" name="lists_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/lists_api/group"/>
-     </component>
-     <component unofficial="yes" name="server_application_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="status_pane_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/status_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="title_pane_touch_observer_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="hierarchical_lists_api" origin-model="Foundation">
-      <unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="svgt" long-name="SVG Tiny" tech_domain="ui" level="generic" levels="util ui">
     <collection name="svgtopt" long-name="SVGT Opt" level="util">
-     <component name="SVG" origin-model="Foundation">
+     <component name="svg" origin-model="foundation">
       <!-- <unit bldFile="mw/svgt/svgtopt/svg/svgrecog/group"/> -->
      </component>
-     <component name="nvgdecoder" long-name="NVG Decoder" origin-model="Foundation"/>
-     <component name="SVGEngineJI" long-name="SVG Engine JI" origin-model="Foundation"/>
-     <component name="SVGTPlugin" long-name="SVGT Plugin" origin-model="Foundation">
+     <component name="nvgdecoder" long-name="NVG Decoder" origin-model="foundation"/>
+     <component name="svgengineji" long-name="SVG Engine JI" origin-model="foundation"/>
+     <component name="svgtplugin" long-name="SVGT Plugin" origin-model="foundation">
       <unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
      </component>
-     <component unofficial="yes" name="svgtopt_build" long-name="SVGT Opt Build" origin-model="Foundation">
+     <component unofficial="yes" name="svgtopt_build" long-name="SVGT Opt Build" origin-model="foundation">
       <unit bldFile="mw/svgt/svgtopt/group"/>
      </component>
     </collection>
     <collection name="svgt_info" long-name="SVG Tiny Info" level="ui">
-     <component unofficial="yes" name="svgt_build" long-name="SVG Tiny Build" origin-model="Foundation">
+     <component unofficial="yes" name="svgt_build" long-name="SVG Tiny Build" origin-model="foundation">
       <unit bldFile="mw/svgt/group"/>
      </component>
-    </collection>
-    <collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-     <component unofficial="yes" name="nvg_api" origin-model="Foundation">
-      <unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_api" long-name="SVG Tiny API" origin-model="Foundation">
-      <unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
+     <component unofficial="yes" name="svgt_plat" long-name="SVG Tiny Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/svgt/svgt_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="uiaccelerator" long-name="UI Accelerator" tech_domain="ui" level="generic" levels="plugin framework server generic specific">
     <collection name="uiacceltk" long-name="UI Accelerator TK" level="framework">
-     <component name="hitchcock" long-name="Hitchcock" origin-model="Foundation">
+     <component name="hitchcock" long-name="Hitchcock" origin-model="foundation">
       <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/coretoolkit/group"/> -->
       <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/group"/>
       <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/group"/> -->
@@ -8628,64 +6183,45 @@
       <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/tracer/traceextclient/group"/> -->
       <!-- <unit bldFile="mw/uiaccelerator/uiacceltk/hitchcock/tracer/traceextplugin/group"/> -->
      </component>
-     <component name="widgeteditors" long-name="Widget Editors" origin-model="Foundation">
+     <component name="widgeteditors" long-name="Widget Editors" origin-model="foundation">
       <unit bldFile="mw/uiaccelerator/uiacceltk/widgeteditors/group"/>
      </component>
-     <component unofficial="yes" name="uiacceltk_build" long-name="UI Accelerator TK Build" origin-model="Foundation">
+     <component unofficial="yes" name="uiacceltk_build" long-name="UI Accelerator TK Build" origin-model="foundation">
       <unit bldFile="mw/uiaccelerator/uiacceltk/group"/>
      </component>
     </collection>
     <collection name="uiaccelexampleapps" long-name="UI Accelerator Example Apps" level="specific">
-     <component name="alfexanalogdialer" long-name="ALF Ex Analog Dialer" origin-model="Foundation">
+     <component name="alfexanalogdialer" long-name="ALF Ex Analog Dialer" origin-model="foundation">
       <!-- <unit bldFile="mw/uiaccelerator/uiaccelexampleapps/alfexanalogdialer/group"/> -->
      </component>
-     <component name="alfexstickers" long-name="ALF Ex Stickers" origin-model="Foundation">
+     <component name="alfexstickers" long-name="ALF Ex Stickers" origin-model="foundation">
       <!-- <unit bldFile="mw/uiaccelerator/uiaccelexampleapps/alfexstickers/group"/> -->
      </component>
     </collection>
     <collection name="uiaccelerator_info" long-name="UI Accelerator Info" level="specific">
-     <component unofficial="yes" name="inc" origin-model="Foundation">
+     <component unofficial="yes" name="inc" origin-model="foundation">
       <!-- <unit bldFile="mw/uiaccelerator/inc/group"/> -->
      </component>
-     <component unofficial="yes" name="uiaccelerator_test" long-name="UI Accelerator Test" origin-model="Foundation">
-      <!-- <unit bldFile="mw/uiaccelerator/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="specific">
-     <component unofficial="yes" name="alf_tracing_api" origin-model="Foundation">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-     </component>
-     <component unofficial="yes" name="uiaccelerator_plat_build" long-name="UI Accelerator Platform API Build" origin-model="Foundation">
+     <component unofficial="yes" name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_editors_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/tsrc/group"/>
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/group"/>
      </component>
-     <component unofficial="yes" name="alf_extension_api" origin-model="Foundation">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_extended_visual_api" origin-model="Foundation">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_client_server_api" origin-model="Foundation">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_editors_api" origin-model="Foundation">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_editors_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_core_toolkit_api" origin-model="Foundation">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_visual_api" origin-model="Foundation">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="uiresources" long-name="UI Resources" tech_domain="ui" level="generic" levels="compile plugin framework server generic data">
     <collection name="layouts" long-name="Layouts" level="plugin">
-     <component name="cdl" long-name="Cdl" origin-model="Foundation">
+     <component name="cdl" long-name="Cdl" origin-model="foundation">
       <unit bldFile="mw/uiresources/layouts/cdl/cdlengine/group"/>
       <unit bldFile="mw/uiresources/layouts/cdl/cdlserver/group"/>
       <!-- <unit bldFile="mw/uiresources/layouts/cdl/cdlutils/cdlexplorer/group"/> -->
      </component>
-     <component name="aknlayout2" long-name="AKN Layout 2" origin-model="Foundation">
+     <component name="aknlayout2" long-name="AKN Layout 2" origin-model="foundation">
       <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated"/> -->
       <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/nhd_akn_app"/> -->
       <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/nhd_uiaccel"/> -->
@@ -8704,424 +6240,284 @@
      </component>
     </collection>
     <collection name="locales" long-name="Locales" level="framework">
-     <component unofficial="yes" name="loce32" origin-model="Foundation">
+     <component name="locales_build" long-name="Locales Component" origin-model="foundation">
       <unit bldFile="mw/uiresources/locales/loce32"/>
      </component>
     </collection>
     <collection name="pictographs" long-name="Pictographs" level="data">
-     <component name="AknPictograph" long-name="AKN Picto Graph" origin-model="Foundation">
+     <component name="aknpictograph" long-name="AKN Picto Graph" origin-model="foundation">
       <unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
       <!-- <unit bldFile="mw/uiresources/pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
      </component>
     </collection>
     <collection name="skins" long-name="Skins" level="data">
-     <component name="AknSkinContent" long-name="AKN Skin Content" origin-model="Foundation">
+     <component name="aknskincontent" long-name="AKN Skin Content" origin-model="foundation">
       <unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
       <!-- <unit bldFile="mw/uiresources/skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
      </component>
-     <component name="AknSkins" long-name="AKN Skins" origin-model="Foundation">
+     <component name="aknskins" long-name="AKN Skins" origin-model="foundation">
       <unit bldFile="mw/uiresources/skins/aknskins/group"/>
      </component>
     </collection>
     <collection name="uiconfig" long-name="UI Config" level="server">
-     <component name="s60config" long-name="S60 Config" origin-model="Foundation">
+     <component name="s60config" long-name="S60 Config" origin-model="foundation">
       <unit bldFile="mw/uiresources/uiconfig/s60config/group"/>
      </component>
     </collection>
     <collection name="fontsupport" long-name="Font Support" level="generic">
-     <component name="fontprovider" long-name="Font Provider" origin-model="Foundation">
+     <component name="fontprovider" long-name="Font Provider" origin-model="foundation">
       <unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
      </component>
-     <component name="fontutils" long-name="Font Utils" origin-model="Foundation">
+     <component name="fontutils" long-name="Font Utils" origin-model="foundation">
       <unit bldFile="mw/uiresources/fontsupport/fontutils/fontutils/group"/>
       <!-- <unit bldFile="mw/uiresources/fontsupport/fontutils/group"/> -->
      </component>
     </collection>
     <collection name="uigraphics" long-name="UI Graphics" level="generic">
-     <component name="Bitmaps2" long-name="Bitmaps 2" origin-model="Foundation">
+     <component name="bitmaps2" long-name="Bitmaps 2" origin-model="foundation">
       <unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
      </component>
-     <component name="Icons" origin-model="Foundation">
+     <component name="icons" origin-model="foundation">
       <unit bldFile="mw/uiresources/uigraphics/icons/group"/>
      </component>
-     <component name="VariatedBitmaps" long-name="Variated Bitmaps" origin-model="Foundation">
+     <component name="variatedbitmaps" long-name="Variated Bitmaps" origin-model="foundation">
       <unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
      </component>
-     <component name="AknIcon" long-name="AKN Icon" origin-model="Foundation">
+     <component name="aknicon" long-name="AKN Icon" origin-model="foundation">
       <unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
      </component>
-     <component name="palette" long-name="Palette" origin-model="Foundation">
+     <component name="palette" long-name="Palette" origin-model="foundation">
       <!-- <unit bldFile="mw/uiresources/uigraphics/palette/group"/> -->
      </component>
     </collection>
     <collection name="helpthemes" long-name="Help Themes" level="data">
-     <component name="helpthemes compo" origin-model="Foundation">
+     <component name="helpthemes_build" origin-model="foundation">
       <unit bldFile="mw/uiresources/helpthemes/group"/>
      </component>
     </collection>
     <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-     <component name="aknlayoutcompiler compo" long-name="AKN Layout Compiler Component" origin-model="Foundation"/>
+     <component name="aknlayoutcompiler_build" long-name="AKN Layout Compiler Component" origin-model="foundation">
+      <unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
+     </component>
     </collection>
     <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-     <component name="cdlcompiler compo" long-name="CDL Compiler Component" origin-model="Foundation"/>
+     <component name="cdlcompiler_build" long-name="CDL Compiler Component" origin-model="foundation">
+      <unit bldFile="mw/uitools/cdlcompiler/group"/>
+     </component>
     </collection>
     <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-     <component name="cdlcompilertoolkit compo" long-name="CDL Compiler Toolkit Component" origin-model="Foundation"/>
+     <component name="cdlcompilertoolkit_build" long-name="CDL Compiler Toolkit Component" origin-model="foundation">
+      <unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
+     </component>
     </collection>
     <collection name="skincompiler" long-name="Skin Compiler" level="compile">
-     <component name="AknSkinDescCompiler" long-name="AKN Skin Desc Compiler" origin-model="Foundation">
+     <component name="aknskindesccompiler" long-name="AKN Skin Desc Compiler" origin-model="foundation">
       <unit bldFile="mw/uitools/skincompiler/aknskindesccompiler/group"/>
      </component>
     </collection>
     <collection name="uiresources_info" long-name="UI Resources Info" level="data">
-     <component unofficial="yes" name="uiresources_test" long-name="UI Resources Test" origin-model="Foundation">
-      <!-- <unit bldFile="mw/uiresources/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="uiresources_build" long-name="UI Resources Build" origin-model="Foundation">
+     <component unofficial="yes" name="uiresources_plat" long-name="UI Resources Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="uiresources_build" long-name="UI Resources Build" origin-model="foundation">
       <unit bldFile="mw/uiresources/group"/>
      </component>
-    </collection>
-    <collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-     <component unofficial="yes" name="skins_image_attributes_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group"/>
-     </component>
-     <component unofficial="yes" name="mifconv_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="wallpaper_configuration_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="cdl_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group"/>
-     </component>
-     <component unofficial="yes" name="graphic_configuration_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_skins_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group"/>
-     </component>
-     <component unofficial="yes" name="mif_header_cdl_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_server_plugin_ids_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_system_private_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_and_skins_settings_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="language_code_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="private_user_area_code_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_effect_setup_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_fonts_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_data_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_server_controller_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-     <component unofficial="yes" name="scalable_icons_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-     </component>
-     <component unofficial="yes" name="graphics_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group"/>
-     </component>
-     <component unofficial="yes" name="skins_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_pub/skins_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_id_definitions_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="font_definition_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="pictograph_api" origin-model="Foundation">
-      <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="specific" levels="fw api">
+     <component unofficial="yes" name="uiresources_pub" long-name="UI Resources Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/skins_api/tsrc/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="generic" levels="fw api">
     <collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-     <component name="tactilearearegistry" long-name="Tactile Area Registry" origin-model="Foundation">
+     <component name="tactilearearegistry" long-name="Tactile Area Registry" origin-model="foundation">
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
      </component>
-     <component name="tactilefeedbackclient" long-name="Tactile Feedback Client" origin-model="Foundation">
+     <component name="tactilefeedbackclient" long-name="Tactile Feedback Client" origin-model="foundation">
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
      </component>
-     <component name="tactileactionplugin" long-name="TactilE Action Plugin" origin-model="Foundation"/>
-     <component name="tactileclickplugin" long-name="Tactile Click Plugin" origin-model="Foundation"/>
-     <component name="tactilefeedbackresolver" long-name="Tactile Feedback Resolver" origin-model="Foundation"/>
-     <component unofficial="yes" name="tactilefeedback_build" long-name="Tactile Feedback Build" origin-model="Foundation">
+     <component name="tactileactionplugin" long-name="TactilE Action Plugin" origin-model="foundation"/>
+     <component name="tactileclickplugin" long-name="Tactile Click Plugin" origin-model="foundation"/>
+     <component name="tactilefeedbackresolver" long-name="Tactile Feedback Resolver" origin-model="foundation"/>
+     <component unofficial="yes" name="tactilefeedback_build" long-name="Tactile Feedback Build" origin-model="foundation">
       <unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
      </component>
     </collection>
-    <collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-     <component unofficial="yes" name="tactile_feedback_client_api" origin-model="Foundation">
-      <unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-     </component>
-    </collection>
-    <collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-     <component unofficial="yes" name="tactile_feedback_server_api" origin-model="Foundation">
-      <unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+    <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
+     <component unofficial="yes" name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/hapticsservices/hapticsservices_pub/group"/>
+     </component>
+     <component unofficial="yes" name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/hapticsservices/hapticsservices_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="homescreensrv" long-name="Home Screen Services" tech_domain="ui" level="specific" levels="plugin framework server generic specific">
     <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-     <component name="contentpublishingutils" long-name="Content Publishing Utils" origin-model="Foundation">
+     <component name="contentpublishingutils" long-name="Content Publishing Utils" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/>
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
      </component>
-     <component name="contentpublishingserver" long-name="Content Publishing Server" origin-model="Foundation">
+     <component name="contentpublishingserver" long-name="Content Publishing Server" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
      </component>
-     <component name="contentharvester" long-name="Content Harvester" origin-model="Foundation">
+     <component name="contentharvester" long-name="Content Harvester" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
      </component>
-     <component unofficial="yes" name="contentpublishingsrv_build" long-name="Content Publishing Service Build" origin-model="Foundation">
+     <component unofficial="yes" name="contentpublishingsrv_build" long-name="Content Publishing Service Build" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
      </component>
     </collection>
     <collection name="backsteppingsrv" long-name="Backstepping Service" level="server">
-     <component name="bsengine.exe=binary" origin-model="Foundation">
+     <component name="bsengine" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
      </component>
     </collection>
     <collection name="xcfw" long-name="XCFW" level="framework">
-     <component name="XCFW.dll=binary" long-name="XCFW" origin-model="Foundation">
+     <component name="xcfw_build" long-name="XCFW" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/xcfw/group"/>
      </component>
     </collection>
     <collection name="homescreenpluginsrv" long-name="Homescreen Plugin Service" level="plugin">
-     <component name="hspsdefinitionengine" long-name="Homescreen Plugin Server Definition Engine" origin-model="Foundation">
+     <component name="hspsdefinitionengine" long-name="Homescreen Plugin Server Definition Engine" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdefinitionengine/group"/>
      </component>
-     <component name="hspsdom" long-name="Homescreen Plugin Server DOM" origin-model="Foundation">
+     <component name="hspsdom" long-name="Homescreen Plugin Server DOM" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdom/group"/>
      </component>
-     <component name="hspspluginregistry" long-name="Homescreen Plugin Registry" origin-model="Foundation">
+     <component name="hspspluginregistry" long-name="Homescreen Plugin Registry" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspspluginregistry/group"/>
      </component>
-     <component name="hspsmanager" long-name="Homescreen Plugin Server Manager" origin-model="Foundation">
+     <component name="hspsmanager" long-name="Homescreen Plugin Server Manager" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsmanager/group"/>
      </component>
-     <component name="hspsodt" long-name="Homescreen Plugin Server ODT" origin-model="Foundation">
+     <component name="hspsodt" long-name="Homescreen Plugin Server ODT" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsodt/group"/>
      </component>
-     <component name="hspsresource" long-name="Homescreen Plugin Server Resource" origin-model="Foundation">
+     <component name="hspsresource" long-name="Homescreen Plugin Server Resource" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresource/group"/>
      </component>
-     <component name="hspsresult" long-name="Homescreen Plugin Server Result" origin-model="Foundation">
+     <component name="hspsresult" long-name="Homescreen Plugin Server Result" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresult/group"/>
      </component>
-     <component name="hspstools" long-name="Homescreen Plugin Server Tools" origin-model="Foundation">
+     <component name="hspstools" long-name="Homescreen Plugin Server Tools" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspstools/group"/>
      </component>
-     <component unofficial="yes" name="homescreenpluginsrv_build" long-name="Homescreen Plugin Service Build" origin-model="Foundation">
+     <component unofficial="yes" name="homescreenpluginsrv_build" long-name="Homescreen Plugin Service Build" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
      </component>
     </collection>
     <collection name="idlefw" long-name="Idle Framework" level="framework">
-     <component name="idlefw_plugins" long-name="Plugins" origin-model="Foundation">
+     <component name="idlefw_plugins" long-name="Plugins" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/idlefw/plugins/group"/>
       <!-- <unit bldFile="mw/homescreensrv/idlefw/plugins/pslnactiveidleplugin/group"/> -->
      </component>
-     <component unofficial="yes" name="idlefw_build" long-name="Idle Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="idlefw_build" long-name="Idle Framework Build" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/idlefw/group"/>
      </component>
     </collection>
     <collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-     <component name="menusatinterface" long-name="Menu SAT Interface" origin-model="Foundation">
+     <component name="menusatinterface" long-name="Menu SAT Interface" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
      </component>
-     <component unofficial="yes" name="menucontentsrv_build" long-name="Menu Content Service Build" origin-model="Foundation">
+     <component unofficial="yes" name="menucontentsrv_build" long-name="Menu Content Service Build" origin-model="foundation">
       <unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
      </component>
     </collection>
-    <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="sapi_backstepping" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-     </component>
-     <component unofficial="yes" name="idlefw_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-     </component>
-     <component unofficial="yes" name="ai_content_model_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="action_handler_plugin_api" origin-model="Foundation">
+    <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
+     <component unofficial="yes" name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" class="api" origin-model="foundation">
       <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_menucontent" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-     </component>
-     <component unofficial="yes" name="ai_plugin_management_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="menu_sat_interface_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_harvester_plugin_api" origin-model="Foundation">
       <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="external_home_screen_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_actionhandler" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-     </component>
-     <component unofficial="yes" name="ai_utilities_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="xcfw_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-     </component>
-     <component unofficial="yes" name="hs_widget_publisher_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/group"/>
       <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="menu_model_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ai_plugin_information_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="menu_content_service_api" origin-model="Foundation">
       <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="ai_variation_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_homescreenplugin" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group"/>
-     </component>
-     <component unofficial="yes" name="ai_shortcut_command_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_shortcut_command_api/group"/>
-     </component>
-     <component unofficial="yes" name="shortcutplugin_extension_api" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/shortcutplugin_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_contentpublishing" origin-model="Foundation">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
    <block name="appinstall" long-name="Application Installation" tech_domain="rt" level="generic" levels="tool framework generic api">
     <collection name="appinstaller" long-name="App Installer" level="generic">
-     <component name="AppMngr2" long-name="App Mngr2" origin-model="Foundation">
+     <component name="appmngr2" long-name="App Mngr2" origin-model="foundation">
       <unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
      </component>
-     <component name="AppinstUi" long-name="App Installer UI" origin-model="Foundation">
+     <component name="appinstui" long-name="App Installer UI" origin-model="foundation">
       <unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
      </component>
-     <component unofficial="yes" name="appinstaller_build" long-name="App Installer Build" origin-model="Foundation">
+     <component unofficial="yes" name="appinstaller_build" long-name="App Installer Build" origin-model="foundation">
       <unit bldFile="mw/appinstall/appinstaller/group"/>
      </component>
     </collection>
     <collection name="ncdengine" long-name="NCD Engine" level="framework">
-     <component name="ncdengine_engine" long-name="Engine" origin-model="Foundation">
+     <component name="ncdengine_engine" long-name="Engine" origin-model="foundation">
       <unit bldFile="mw/appinstall/ncdengine/engine/group"/>
      </component>
-     <component name="debuglogger" long-name="Debug Logger" origin-model="Foundation">
+     <component name="debuglogger" long-name="Debug Logger" origin-model="foundation">
       <!-- <unit bldFile="mw/appinstall/ncdengine/debuglogger/group"/> -->
      </component>
-     <component unofficial="yes" name="ncdengine_build" long-name="NCD Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="ncdengine_build" long-name="NCD Engine Build" origin-model="foundation">
       <unit bldFile="mw/appinstall/ncdengine/group"/>
      </component>
     </collection>
     <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-     <component name="iaupdateapi_stub compo" origin-model="Foundation">
+     <component name="iaupdateapi_stub_build" origin-model="foundation">
       <unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
      </component>
     </collection>
     <collection name="iaupdate" long-name="IA Update" level="api">
-     <component name="IAD" origin-model="Foundation">
+     <component name="iad" origin-model="foundation">
       <unit bldFile="mw/appinstall/iaupdate/iad/group"/>
      </component>
-     <component name="iaupdate_help" long-name="Help" origin-model="Foundation">
+     <component name="iaupdate_help" long-name="Help" origin-model="foundation">
       <unit bldFile="mw/appinstall/iaupdate/help/group"/>
      </component>
-     <component unofficial="yes" name="iaupdate_build" long-name="IA Update Build" origin-model="Foundation">
+     <component unofficial="yes" name="iaupdate_build" long-name="IA Update Build" origin-model="foundation">
       <unit bldFile="mw/appinstall/iaupdate/group"/>
      </component>
     </collection>
     <collection name="appinstall_info" long-name="Application Installation Info" level="api">
-     <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test" origin-model="Foundation">
+     <component unofficial="yes" name="appinstall_pub" long-name="Application Installation Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/appinstall/appinstall_pub/group"/>
+      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
+      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
+     </component>
+     <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test" origin-model="foundation">
       <!-- <unit bldFile="mw/appinstall/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="appinstall_build" long-name="Application Installation Build" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/group"/>
+     <component unofficial="yes" name="appinstall_plat" long-name="Application Installation Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
+      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
+      <unit bldFile="mw/appinstall/appinstall_plat/group"/>
      </component>
     <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-     <component unofficial="yes" name="iaupdate_api" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-     </component>
-     <component unofficial="yes" name="appmngr2runtimeapi" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
-      <!-- <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
-     </component>
-     <component unofficial="yes" name="sw_installer_common_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="task_management_api" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="task_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_launcher_api" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_cr_keys" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_ps_keys" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_ui_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-     <component unofficial="yes" name="startup_list_management_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
-      <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
-     </component>
-    </collection>
-    <collection name="installationservices" long-name="Installation Services" level="generic">
-     <component name="swi" long-name="Secure Software Install" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-     </component>
-     <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-     </component>
-     <component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/appinstall/installationservices/switestfw/group" mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
-     </component>
-     <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-     </component>
-    </collection>
+	<!-- Collection manually added due to faulty merge XSLT -->
+	<collection name="installationservices" long-name="Installation Services" level="generic">
+	 <component name="swi" long-name="Secure Software Install" purpose="optional">
+	  <unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+	 </component>
+	 <component name="swidevicetools" long-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 name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
+	  <unit bldFile="mw/appinstall/installationservices/switestfw/group" mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
+	 </component>
+	 <component name="swiconfig" long-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 name="secureswitools" long-name="Secure Software Install Tools" level="tool">
      <!--Component manually removed and merged to OS-->
      <!--<component name="swisistools">
@@ -9140,119 +6536,95 @@
    </block>
    <block name="serviceapifw" long-name="Service API Framework" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
     <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-     <component name="servicehandler" long-name="Service Handler" origin-model="Foundation">
+     <component name="lifwservicehandler" long-name="Service Handler" origin-model="foundation">
       <unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
      </component>
     </collection>
     <collection name="rtsecuritymanager" long-name="RT Security Manager" level="server">
-     <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util" origin-model="Foundation">
+     <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util" origin-model="foundation">
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
      </component>
-     <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver" origin-model="Foundation">
+     <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver" origin-model="foundation">
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
      </component>
-     <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client" origin-model="Foundation">
+     <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client" origin-model="foundation">
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
      </component>
-     <component unofficial="yes" name="rtsecuritymanager_build" long-name="RT Security Manager Build" origin-model="Foundation">
+     <component unofficial="yes" name="rtsecuritymanager_build" long-name="RT Security Manager Build" origin-model="foundation">
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
      </component>
     </collection>
-    <collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-     <component unofficial="yes" name="liw_criteria_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_generic_parameter_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_service_handler_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_common_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
-      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="liw_service_interface_base_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_client_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_provider_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_utility_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
-      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="liw_service_interface_menu_api" origin-model="Foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-     </component>
-    </collection>
     <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
-     <component unofficial="yes" name="serviceapifw_test" long-name="Service API Framework Test" origin-model="Foundation">
-      <!-- <unit bldFile="mw/serviceapifw/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/serviceapifw_pub/group"/>
+     </component>
+     <component unofficial="yes" name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/group"/>
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build" origin-model="foundation">
       <unit bldFile="mw/serviceapifw/group"/>
      </component>
     </collection>
    </block>
    <block name="serviceapi" long-name="Service API" tech_domain="rt" level="specific" levels="os mw1 mw2 app">
     <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
-     <component name="appmanagerservice" long-name="App Manager Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build" origin-model="Foundation">
+     <component name="appmanagerservice" long-name="App Manager Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build" origin-model="foundation">
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
      </component>
     </collection>
     <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
-     <component name="calendarservice" long-name="Calendar Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_calendar_build" long-name="SAPI Calendar Build" origin-model="Foundation">
+     <component name="calendarservice" long-name="Calendar Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_calendar_build" long-name="SAPI Calendar Build" origin-model="foundation">
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
      </component>
     </collection>
     <collection name="sapi_contacts_vpbk" long-name="SAPI Contacts Vpbk" level="app">
-     <component name="contactservice" long-name="Contact Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_contacts_vpbk_build" long-name="SAPI Contacts Vpbk Build" origin-model="Foundation">
+     <component name="contactservice" long-name="Contact Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_contacts_vpbk_build" long-name="SAPI Contacts Vpbk Build" origin-model="foundation">
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
      </component>
     </collection>
     <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
-     <component name="landmarksservice" long-name="Landmarks Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build" origin-model="Foundation">
+     <component name="landmarksservice" long-name="Landmarks Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build" origin-model="foundation">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
      </component>
     </collection>
     <collection name="sapi_location" long-name="SAPI Location" level="mw2">
-     <component name="locationservice" long-name="Location Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_location_build" long-name="SAPI Location Build" origin-model="Foundation">
+     <component name="locationservice" long-name="Location Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_location_build" long-name="SAPI Location Build" origin-model="foundation">
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
      </component>
     </collection>
     <collection name="sapi_logging" long-name="SAPI Logging" level="app">
-     <component name="loggingservice" long-name="Logging Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_logging_build" long-name="SAPI Logging Build" origin-model="Foundation">
+     <component name="loggingservice" long-name="Logging Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_logging_build" long-name="SAPI Logging Build" origin-model="foundation">
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/tsrc/dev/group"/> -->
      </component>
     </collection>
     <collection name="sapi_mediamanagement" long-name="SAPI Media Management" level="mw2">
-     <component name="mediamanagementservice" long-name="Media Management Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_mediamanagement_build" long-name="SAPI Media Management Build" origin-model="Foundation">
+     <component name="mediamanagementservice" long-name="Media Management Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_mediamanagement_build" long-name="SAPI Media Management Build" origin-model="foundation">
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
@@ -9260,100 +6632,100 @@
      </component>
     </collection>
     <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
-     <component name="messagingservice" long-name="Messaging Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build" origin-model="Foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
+     <component name="messagingservice" long-name="Messaging Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build" origin-model="foundation">
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
      </component>
     </collection>
     <collection name="sapi_sensor" long-name="SAPI Sensor" level="mw1">
-     <component name="sensorservice" long-name="Sensor Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_sensor_build" long-name="SAPI Sensor Build" origin-model="Foundation">
+     <component name="sensorservice" long-name="Sensor Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_sensor_build" long-name="SAPI Sensor Build" origin-model="foundation">
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
      </component>
     </collection>
     <collection name="sapi_sysinfo" long-name="SAPI Sysinfo" level="mw1">
-     <component name="sysinfoservice" long-name="Sysinfo Service" origin-model="Foundation"/>
-     <component unofficial="yes" name="sapi_sysinfo_build" long-name="SAPI Sysinfo Build" origin-model="Foundation">
+     <component name="sysinfoservice" long-name="Sysinfo Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_sysinfo_build" long-name="SAPI Sysinfo Build" origin-model="foundation">
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
      </component>
     </collection>
     <collection name="sapi_serviceregistry" long-name="SAPI Service Registry" level="os">
-     <component name="serviceregistryprovider.dll=binary" origin-model="Foundation">
+     <component name="serviceregistryprovider" origin-model="foundation">
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
      </component>
     </collection>
     <collection name="serviceapi_info" long-name="Service API Info" level="app">
-     <component unofficial="yes" name="serviceproviders" origin-model="Foundation">
+     <component unofficial="yes" name="serviceproviders" origin-model="foundation">
       <unit bldFile="mw/serviceapi/serviceproviders/group"/>
      </component>
-     <component unofficial="yes" name="serviceapi_test" long-name="Service API Test" origin-model="Foundation">
+     <component unofficial="yes" name="serviceapi_test" long-name="Service API Test" origin-model="foundation">
       <!-- <unit bldFile="mw/serviceapi/tsrc/group"/> -->
      </component>
     </collection>
    </block>
    <block name="web" long-name="Web" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
     <collection name="browserutilities" long-name="Browser Utilities" level="generic">
-     <component name="browserdialogsprovider" long-name="Browser Dialogs Provider" origin-model="Foundation">
+     <component name="browserdialogsprovider" long-name="Browser Dialogs Provider" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/browserdialogsprovider/group"/>
      </component>
-     <component name="recenturlstore" long-name="Recent URL Store" origin-model="Foundation">
+     <component name="recenturlstore" long-name="Recent URL Store" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/recenturlstore/group"/>
      </component>
-     <component name="xmlparser" long-name="XML Parser" origin-model="Foundation">
+     <component name="xmlparser" long-name="XML Parser" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/xmlparser/group"/>
      </component>
-     <component name="cxmllibrary" long-name="CXml Library" origin-model="Foundation">
+     <component name="cxmllibrary" long-name="CXml Library" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/cxmllibrary/group"/>
      </component>
-     <component name="downloadmgr" long-name="Download Manager" origin-model="Foundation">
+     <component name="downloadmgr" long-name="Download Manager" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/downloadmgr/group"/>
      </component>
-     <component name="connectionmanager" long-name="Connection Manager" origin-model="Foundation">
+     <component name="connectionmanager" long-name="Connection Manager" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/connectionmanager/group"/>
      </component>
-     <component name="browsertelservice" long-name="Browser Tel Service" origin-model="Foundation">
+     <component name="browsertelservice" long-name="Browser Tel Service" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/browsertelservice/group"/>
      </component>
-     <component name="favouritesengine" long-name="Favourites Engine" origin-model="Foundation">
+     <component name="favouritesengine" long-name="Favourites Engine" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/favouritesengine/group"/>
      </component>
-     <component name="feedsengine" long-name="Feeds Engine" origin-model="Foundation">
+     <component name="feedsengine" long-name="Feeds Engine" origin-model="foundation">
       <!-- <unit bldFile="mw/web/browserutilities/feedsengine/feedsserver/reconizer/group"/> -->
       <unit bldFile="mw/web/browserutilities/feedsengine/group"/>
      </component>
-     <component name="multipartparser" long-name="Multipart Parser" origin-model="Foundation">
+     <component name="multipartparser" long-name="Multipart Parser" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/multipartparser/group"/>
      </component>
-     <component name="schemehandler" long-name="Scheme Handler" origin-model="Foundation">
+     <component name="schemehandler" long-name="Scheme Handler" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/schemehandler/group"/>
      </component>
-     <component name="webutils" long-name="Web Utils" origin-model="Foundation">
+     <component name="webutils" long-name="Web Utils" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/webutils/group"/>
       <!-- <unit bldFile="mw/web/browserutilities/webutils/tsrc/public/adv/group"/> -->
      </component>
-     <component name="aiwbrowserprovider" long-name="AIW Browser Provider" origin-model="Foundation">
+     <component name="aiwbrowserprovider" long-name="AIW Browser Provider" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/aiwbrowserprovider/group"/>
      </component>
-     <component unofficial="yes" name="browserutilities_build" long-name="Browser Utilities Build" origin-model="Foundation">
+     <component unofficial="yes" name="browserutilities_build" long-name="Browser Utilities Build" origin-model="foundation">
       <unit bldFile="mw/web/browserutilities/group"/>
      </component>
     </collection>
     <collection name="webengine" long-name="Web Engine" level="server">
-     <component name="osswebengine" long-name="OSS Web Engine" origin-model="Foundation">
+     <component name="osswebengine" long-name="OSS Web Engine" origin-model="foundation">
       <unit bldFile="mw/web/webengine/osswebengine/cache/group"/>
       <unit bldFile="mw/web/webengine/osswebengine/memorymanager/group"/>
       <unit bldFile="mw/web/webengine/osswebengine/npscript/group"/>
@@ -9362,1146 +6734,951 @@
       <!-- <unit bldFile="mw/web/webengine/osswebengine/webkit/s60/webview/webview_api_test/group"/> -->
       <!-- <unit bldFile="mw/web/webengine/osswebengine/webkit/s60/webview/webview_api_test/tsrc/group"/> -->
      </component>
-     <component name="webkitutils" long-name="WebKit Utils" origin-model="Foundation">
+     <component name="webkitutils" long-name="WebKit Utils" origin-model="foundation">
       <unit bldFile="mw/web/webengine/webkitutils/group"/>
      </component>
-     <component name="pagescaler" long-name="Page Scaler" origin-model="Foundation">
+     <component name="pagescaler" long-name="Page Scaler" origin-model="foundation">
       <unit bldFile="mw/web/webengine/pagescaler/group"/>
      </component>
-     <component name="widgetinstaller" long-name="Widget Installer" origin-model="Foundation">
+     <component name="webwidgetinstaller" long-name="Widget Installer" origin-model="foundation">
       <unit bldFile="mw/web/webengine/widgetinstaller/group"/>
      </component>
-     <component name="widgetregistry" long-name="Widget Registry" origin-model="Foundation">
+     <component name="widgetregistry" long-name="Widget Registry" origin-model="foundation">
       <unit bldFile="mw/web/webengine/widgetregistry/group"/>
       <!-- <unit bldFile="mw/web/webengine/widgetregistry/tsrc/public/basic/group"/> -->
      </component>
-     <component name="wmlengine" long-name="WML Engine" origin-model="Foundation">
+     <component name="wmlengine" long-name="WML Engine" origin-model="foundation">
       <unit bldFile="mw/web/webengine/wmlengine/group"/>
      </component>
-     <component name="device" long-name="Device" origin-model="Foundation">
+     <component name="device" long-name="Device" origin-model="foundation">
       <unit bldFile="mw/web/webengine/device/group"/>
      </component>
-     <component name="widgetengine" long-name="Widget Engine" origin-model="Foundation">
+     <component name="widgetengine" long-name="Widget Engine" origin-model="foundation">
       <unit bldFile="mw/web/webengine/widgetengine/group"/>
      </component>
      <!--Component manually removed as empty and name conflicts with another component-->
      <!--<component name="memoryplugin" long-name="Memory Plugin">
        <unit bldFile="mw/web/webengine/memoryplugin/group"/>
      </component>-->
-     <component name="widgetmemoryplugin" long-name="Widget Memory Plugin" origin-model="Foundation">
+     <component name="widgetmemoryplugin" long-name="Widget Memory Plugin" origin-model="foundation">
       <unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
      </component>
-     <component name="widgetbackuprestore" long-name="Widget Backup Restore" origin-model="Foundation">
+     <component name="widgetbackuprestore" long-name="Widget Backup Restore" origin-model="foundation">
       <unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
      </component>
-     <component name="browserrecognizers" long-name="Browser Recognizers" origin-model="Foundation">
+     <component name="browserrecognizers" long-name="Browser Recognizers" origin-model="foundation">
       <unit bldFile="mw/web/webengine/browserrecognizers/group"/>
      </component>
-     <component name="wrtharvester" long-name="WRT Harvester" origin-model="Foundation">
+     <component name="wrtharvester" long-name="WRT Harvester" origin-model="foundation">
       <unit bldFile="mw/web/webengine/wrtharvester/group"/>
      </component>
-     <component unofficial="yes" name="webengine_build" long-name="Web Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="webengine_build" long-name="Web Engine Build" origin-model="foundation">
       <unit bldFile="mw/web/webengine/group"/>
      </component>
     </collection>
     <collection name="widgets" long-name="Widgets" level="generic">
-     <component name="widgetrecognizer" long-name="Widget Recognizer" origin-model="Foundation">
+     <component name="widgetrecognizer" long-name="Widget Recognizer" origin-model="foundation">
       <unit bldFile="mw/web/widgets/widgetrecognizer/group"/>
      </component>
-     <component name="widgetinstaller" long-name="Widget Installer" origin-model="Foundation">
+     <component name="widgetinstaller" long-name="Widget Installer" origin-model="foundation">
       <unit bldFile="mw/web/widgets/widgetinstaller/group"/>
      </component>
-     <component name="widgetlauncher" long-name="Widget Launcher" origin-model="Foundation">
+     <component name="widgetlauncher" long-name="Widget Launcher" origin-model="foundation">
       <unit bldFile="mw/web/widgets/widgetlauncher/group"/>
      </component>
-     <component name="widgetapp" long-name="Widget App" origin-model="Foundation">
+     <component name="widgetapp" long-name="Widget App" origin-model="foundation">
       <unit bldFile="mw/web/widgets/widgetapp/group"/>
      </component>
-     <component name="widgetpreinstaller" long-name="Widget Pre Installer" origin-model="Foundation">
+     <component name="widgetpreinstaller" long-name="Widget Pre Installer" origin-model="foundation">
       <unit bldFile="mw/web/widgets/widgetpreinstaller/group"/>
      </component>
-     <component name="widgetstartup" long-name="Widget Startup" origin-model="Foundation">
+     <component name="widgetstartup" long-name="Widget Startup" origin-model="foundation">
       <unit bldFile="mw/web/widgets/widgetstartup/group"/>
      </component>
-     <component unofficial="yes" name="widgets_build" long-name="Widgets Build" origin-model="Foundation">
+     <component unofficial="yes" name="widgets_build" long-name="Widgets Build" origin-model="foundation">
       <unit bldFile="mw/web/widgets/group"/>
      </component>
     </collection>
     <collection name="codhandler" long-name="COD Handler" level="specific">
-     <component name="codeng" long-name="COD Engine" origin-model="Foundation">
+     <component name="codeng" long-name="COD Engine" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/codeng/group"/>
      </component>
-     <component name="codui" long-name="COD UI" origin-model="Foundation">
+     <component name="codui" long-name="COD UI" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/codui/group"/>
      </component>
-     <component name="codrecog" long-name="COD Recogniser" origin-model="Foundation">
+     <component name="codrecog" long-name="COD Recogniser" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/codrecog/group"/>
      </component>
-     <component name="codviewer" long-name="COD Viewer" origin-model="Foundation">
+     <component name="codviewer" long-name="COD Viewer" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/codviewer/group"/>
      </component>
-     <component name="ddrecog" long-name="DD Recogniser" origin-model="Foundation">
+     <component name="ddrecog" long-name="DD Recogniser" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/ddrecog/group"/>
      </component>
-     <component name="ddviewer" long-name="DD Viewer" origin-model="Foundation">
+     <component name="ddviewer" long-name="DD Viewer" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/ddviewer/group"/>
      </component>
-     <component name="coddownload" long-name="COD Download" origin-model="Foundation">
+     <component name="coddownload" long-name="COD Download" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/coddownload/group"/>
      </component>
-     <component name="roapapp" long-name="ROAP Application" origin-model="Foundation">
+     <component name="roapapp" long-name="ROAP Application" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/roapapp/group"/>
      </component>
-     <component unofficial="yes" name="codhandler_build" long-name="COD Handler Build" origin-model="Foundation">
+     <component unofficial="yes" name="codhandler_build" long-name="COD Handler Build" origin-model="foundation">
       <unit bldFile="mw/web/codhandler/group"/>
      </component>
     </collection>
-    <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-     <component unofficial="yes" name="favourites_engine_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/web/web_pub/favourites_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_pub/settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_control_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-      <!-- <unit bldFile="mw/web/web_pub/browser_control_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="web_pub_build" long-name="Web Public API Build" origin-model="Foundation">
-      <unit bldFile="mw/web/web_pub/group"/>
-     </component>
-     <component unofficial="yes" name="download_mgr_client_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
-      <unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="download_mgr_ui_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-     </component>
-    </collection>
     <collection name="web_info" long-name="Web Info" level="specific">
-     <component unofficial="yes" name="web_build" long-name="Web Build" origin-model="Foundation">
+     <component unofficial="yes" name="web_pub" long-name="Web Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/web/web_pub/browser_control_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/web/web_pub/favourites_engine_api/tsrc/group"/> -->
+      <unit bldFile="mw/web/web_pub/group"/>
+     </component>
+     <component unofficial="yes" name="web_build" long-name="Web Build" origin-model="foundation">
       <unit bldFile="mw/web/group"/>
      </component>
-    </collection>
-    <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-     <component unofficial="yes" name="launcher_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_dialogs_provider_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_manager_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_parser_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="cxml_library_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-     </component>
-     <component unofficial="yes" name="cod_handler_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_plat_build" long-name="Web Platform API Build" origin-model="Foundation">
+     <component unofficial="yes" name="web_plat" long-name="Web Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="mw/web/web_plat/group"/>
      </component>
-     <component unofficial="yes" name="feeds_engine_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_platform_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-     </component>
-     <component unofficial="yes" name="webutils_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/webutils_api/group"/>
-     </component>
-     <component unofficial="yes" name="download_mgr_client_api_extn" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-     </component>
-     <component unofficial="yes" name="recent_url_store_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="scheme_handler_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="scriptable_plugin_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="widget_registry_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-     </component>
-     <component unofficial="yes" name="rt_gesturehelper_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/rt_gesturehelper_api/group"/>
-     </component>
-     <component unofficial="yes" name="multipart_parser_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_browser_provider_api" origin-model="Foundation">
-      <unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="websrv" long-name="Web Services" tech_domain="rt" level="generic" levels="plugin framework server generic specific">
     <collection name="webservices" long-name="Web Services" level="generic">
-     <component name="wsnotifierplugins" long-name="WS Notifier Plugins" origin-model="Foundation">
+     <component name="wsnotifierplugins" long-name="WS Notifier Plugins" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsnotifierplugins/group"/>
      </component>
-     <component name="wslogger" long-name="WS Logger" origin-model="Foundation">
+     <component name="wslogger" long-name="WS Logger" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wslogger/group"/>
      </component>
-     <component name="wsxml" long-name="WS XML" origin-model="Foundation">
+     <component name="wsxml" long-name="WS XML" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsxml/group"/>
      </component>
-     <component name="wsutils" long-name="WS Utils" origin-model="Foundation">
+     <component name="wsutils" long-name="WS Utils" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsutils/group"/>
      </component>
-     <component name="wsfragment" long-name="WS Fragment" origin-model="Foundation">
+     <component name="wsfragment" long-name="WS Fragment" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsfragment/group"/>
      </component>
-     <component name="wsdescription" long-name="WS Description" origin-model="Foundation">
+     <component name="wsdescription" long-name="WS Description" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsdescription/group"/>
      </component>
-     <component name="wshttpchanneltransportplugin" long-name="WS HTTP Channel Transport Plugin" origin-model="Foundation">
+     <component name="wshttpchanneltransportplugin" long-name="WS HTTP Channel Transport Plugin" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
      </component>
-     <component name="wsconnection" long-name="WS Connection" origin-model="Foundation">
+     <component name="wsconnection" long-name="WS Connection" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsconnection/group"/>
      </component>
-     <component name="wshostletconnection" long-name="WS Hostlet Connection" origin-model="Foundation">
+     <component name="wshostletconnection" long-name="WS Hostlet Connection" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wshostletconnection/group"/>
      </component>
-     <component name="wscredentialmanager" long-name="WS Credential Manager" origin-model="Foundation">
+     <component name="wscredentialmanager" long-name="WS Credential Manager" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wscredentialmanager/group"/>
      </component>
-     <component name="wsmanager" long-name="WS Manager" origin-model="Foundation">
+     <component name="wsmanager" long-name="WS Manager" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsmanager/group"/>
      </component>
-     <component name="wsidentitymanager" long-name="WS Identity Manager" origin-model="Foundation">
+     <component name="wsidentitymanager" long-name="WS Identity Manager" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsidentitymanager/group"/>
      </component>
-     <component name="wsframework" long-name="WS Framework" origin-model="Foundation">
+     <component name="wsframework" long-name="WS Framework" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsframework/group"/>
      </component>
-     <component name="wsmessages" long-name="WS Messages" origin-model="Foundation">
+     <component name="wsmessages" long-name="WS Messages" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsmessages/group"/>
      </component>
-     <component name="wsconnectionagent" long-name="WS Connection Agent" origin-model="Foundation">
+     <component name="wsconnectionagent" long-name="WS Connection Agent" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsconnectionagent/group"/>
      </component>
-     <component name="idwsfplugin" long-name="IDWSF Plugin" origin-model="Foundation">
+     <component name="idwsfplugin" long-name="IDWSF Plugin" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/idwsfplugin/group"/>
      </component>
-     <component name="wsibasicplugin" long-name="WSI Basic Plugin" origin-model="Foundation">
+     <component name="wsibasicplugin" long-name="WSI Basic Plugin" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsibasicplugin/group"/>
      </component>
-     <component name="wsrestplugin" long-name="WS Rest Plugin" origin-model="Foundation">
+     <component name="wsrestplugin" long-name="WS Rest Plugin" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsrestplugin/group"/>
      </component>
-     <component name="idwsfsecuritymechanism" long-name="IDWSF Security Mechanism" origin-model="Foundation">
+     <component name="idwsfsecuritymechanism" long-name="IDWSF Security Mechanism" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/idwsfsecuritymechanism/group"/>
      </component>
-     <component name="wspasswordtransforms" long-name="WS Password Transforms" origin-model="Foundation">
+     <component name="wspasswordtransforms" long-name="WS Password Transforms" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wspasswordtransforms/group"/>
      </component>
-     <component name="wscore" long-name="WS Core" origin-model="Foundation">
+     <component name="wscore" long-name="WS Core" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wscore/group"/>
      </component>
-     <component name="wsprovider" long-name="WS Provider" origin-model="Foundation">
+     <component name="wsprovider" long-name="WS Provider" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsprovider/group"/>
      </component>
-     <component name="wslocaltransportplugin" long-name="WS Local Transport Plugin" origin-model="Foundation">
+     <component name="wslocaltransportplugin" long-name="WS Local Transport Plugin" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wslocaltransportplugin/group"/>
      </component>
-     <component name="wshostlettransportplugin" long-name="WS Hostlet Transport Plugin" origin-model="Foundation">
+     <component name="wshostlettransportplugin" long-name="WS Hostlet Transport Plugin" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wshostlettransportplugin/group"/>
      </component>
-     <component name="wsstar" long-name="WS Star" origin-model="Foundation">
+     <component name="wsstar" long-name="WS Star" origin-model="foundation">
       <!-- <unit bldFile="mw/websrv/webservices/wsstar/group"/> -->
      </component>
-     <component name="wsoviplugin" long-name="WS Ovi Plugin" origin-model="Foundation">
+     <component name="wsoviplugin" long-name="WS Ovi Plugin" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
      </component>
-     <component unofficial="yes" name="webservices_build" long-name="Web Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="webservices_build" long-name="Web Services Build" origin-model="foundation">
       <unit bldFile="mw/websrv/webservices/group"/>
      </component>
     </collection>
-    <collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="web_service_description_api" origin-model="Foundation">
+    <collection name="websrv_info" long-name="Web Services Info" level="specific">
+     <component unofficial="yes" name="websrv_build" long-name="Web Services Build" origin-model="foundation">
+      <unit bldFile="mw/websrv/group"/>
+     </component>
+     <component unofficial="yes" name="websrv_pub" long-name="Web Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/websrv/websrv_pub/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_extensions_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_fragment_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
-     </component>
-     <component unofficial="yes" name="web_service_manager_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
-     </component>
-     <component unofficial="yes" name="hostlet_connection_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_service_messaging_api" origin-model="Foundation">
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_service_connection_api" origin-model="Foundation">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
-     </component>
-    </collection>
-    <collection name="websrv_info" long-name="Web Services Info" level="specific">
-     <component unofficial="yes" name="websrv_build" long-name="Web Services Build" origin-model="Foundation">
-      <unit bldFile="mw/websrv/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
      </component>
     </collection>
    </block>
    <block name="conntools" long-name="Conn Tools" tech_domain="to" level="generic" levels="1 2">
     <collection name="nettools" long-name="Net Tools" level="2">
-     <component name="conntest" long-name="Connection Test" origin-model="Foundation">
+     <component name="conntest" long-name="Connection Test" origin-model="foundation">
       <unit bldFile="app/conntools/nettools/conntest/group"/>
      </component>
-     <component unofficial="yes" name="nettools_build" long-name="Net Tools Build" origin-model="Foundation">
+     <component unofficial="yes" name="nettools_build" long-name="Net Tools Build" origin-model="foundation">
       <unit bldFile="app/conntools/nettools/group"/>
      </component>
     </collection>
     <collection name="emulatorlan" long-name="Emulator Lan" level="1">
-     <component name="emulatorlan compo" long-name="Emulator LAN Component" origin-model="Foundation">
+     <component name="emulatorlan_build" long-name="Emulator LAN Component" origin-model="foundation">
       <unit bldFile="app/conntools/emulatorlan/group"/>
      </component>
     </collection>
     <collection name="conntools_info" long-name="Conn Tools Info" level="2">
-     <component unofficial="yes" name="conntools_build" long-name="Conn Tools Build" origin-model="Foundation">
+     <component unofficial="yes" name="conntools_build" long-name="Conn Tools Build" origin-model="foundation">
       <unit bldFile="app/conntools/group"/>
      </component>
     </collection>
    </block>
    <block name="platformtools" long-name="Platform Tools" tech_domain="to" level="generic">
     <collection name="gfxconversion" long-name="Graphics Conversion">
-     <component name="bmconv_s60" long-name="Bm Conv S60" origin-model="Foundation">
+     <component name="bmconv_s60" long-name="Bm Conv S60" origin-model="foundation">
       <unit bldFile="tools/platformtools/gfxconversion/bmconv_s60/group"/>
      </component>
-     <component name="mifconv" long-name="Mifconv" origin-model="Foundation">
+     <component name="mifconv" long-name="Mifconv" origin-model="foundation">
       <unit bldFile="tools/platformtools/gfxconversion/mifconv/group"/>
      </component>
     </collection>
     <collection name="platformtools_info" long-name="Platform Tools Info">
-     <component unofficial="yes" name="platformtools_build" long-name="Platform Tools Build" origin-model="Foundation">
+     <component unofficial="yes" name="platformtools_build" long-name="Platform Tools Build" origin-model="foundation">
       <unit bldFile="tools/platformtools/group"/>
      </component>
     </collection>
    </block>
    <block name="uitools" long-name="UI Tools" tech_domain="to" level="specific" levels="compile encode tool">
     <collection name="gfxtools" long-name="Graphics Tools" level="tool">
-     <component name="gditools" long-name="GDI Tools" origin-model="Foundation">
+     <component name="gditools" long-name="GDI Tools" origin-model="foundation">
       <unit bldFile="mw/uitools/gfxtools/gditools/group"/>
      </component>
-     <component name="Color" origin-model="Foundation">
+     <component name="color" origin-model="foundation">
       <unit bldFile="mw/uitools/gfxtools/color/group"/>
      </component>
     </collection>
     <collection name="reszip" long-name="Reszip" level="encode">
-     <component name="reszip.exe=binary" origin-model="Foundation">
+     <component name="reszip_build" origin-model="foundation">
       <unit bldFile="mw/uitools/reszip/group"/>
      </component>
     </collection>
     <collection name="toollibraries" long-name="Tool Libraries" level="tool">
-     <component name="Arabica" origin-model="Foundation"/>
-     <component name="XercesC" long-name="Xerces C" origin-model="Foundation"/>
-     <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build" origin-model="Foundation">
+     <component name="arabica" origin-model="foundation"/>
+     <component name="xercesc" long-name="Xerces C" origin-model="foundation"/>
+     <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build" origin-model="foundation">
       <!-- <unit bldFile="mw/uitools/toollibraries/group"/> -->
      </component>
     </collection>
     <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-     <component name="svgtenc" long-name="SVGT Enc" origin-model="Foundation">
+     <component name="svgtenc" long-name="SVGT Enc" origin-model="foundation">
       <unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
      </component>
-     <component unofficial="yes" name="svgtencoder_build" long-name="SVGT Encoder Build" origin-model="Foundation">
+     <component unofficial="yes" name="svgtencoder_build" long-name="SVGT Encoder Build" origin-model="foundation">
       <unit bldFile="mw/uitools/svgtencoder/group"/>
      </component>
     </collection>
     <collection name="uitools_info" long-name="UI Tools Info" level="tool">
-     <component unofficial="yes" name="aknlayoutcompiler" origin-model="Foundation">
-      <unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-     </component>
-     <component unofficial="yes" name="cdlcompiler" origin-model="Foundation">
-      <unit bldFile="mw/uitools/cdlcompiler/group"/>
-     </component>
-     <component unofficial="yes" name="uitools_build" long-name="UI Tools Build" origin-model="Foundation">
+     <component unofficial="yes" name="uitools_plat" long-name="UI Tools Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/uitools/uitools_plat/group"/>
+     </component>
+     <component unofficial="yes" name="uitools_pub" long-name="UI Tools Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/uitools/uitools_pub/group"/>
+     </component>
+     <component unofficial="yes" name="uitools_build" long-name="UI Tools Build" origin-model="foundation">
       <unit bldFile="mw/uitools/group"/>
      </component>
-     <component unofficial="yes" name="cdlcompilertoolkit" origin-model="Foundation">
-      <unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="tool">
-     <component unofficial="yes" name="layout_system_private_api" origin-model="Foundation">
-      <unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-     </component>
-     <component unofficial="yes" name="cdl_api" origin-model="Foundation">
-      <unit bldFile="mw/uitools/uitools_plat/cdl_api/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="tool">
-     <component unofficial="yes" name="third_party_bitmap_palette_api" origin-model="Foundation">
-      <unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-     </component>
     </collection>
    </block>
   </layer>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="location" long-name="Location Apps" tech_domain="lo" level="apps" levels="engine ui apps">
     <collection name="landmarksui" long-name="Landmarks UI" level="ui">
-     <component name="landmarksui_help" long-name="Help" origin-model="Foundation">
+     <component name="landmarksui_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/location/landmarksui/help/group"/>
      </component>
-     <component name="landmarksui_engine" long-name="Engine" origin-model="Foundation">
+     <component name="landmarksui_engine" long-name="Engine" origin-model="foundation">
       <unit bldFile="app/location/landmarksui/engine/group"/>
      </component>
-     <component name="uicontrols" long-name="UI Controls" origin-model="Foundation">
+     <component name="uicontrols" long-name="UI Controls" origin-model="foundation">
       <unit bldFile="app/location/landmarksui/uicontrols/group"/>
      </component>
-     <component name="landmarksui_commonui" long-name="Common UI" origin-model="Foundation">
+     <component name="landmarksui_commonui" long-name="Common UI" origin-model="foundation">
       <unit bldFile="app/location/landmarksui/commonui/group"/>
      </component>
-     <component name="landmarksui_app" long-name="Application" origin-model="Foundation">
+     <component name="landmarksui_app" long-name="Application" origin-model="foundation">
       <unit bldFile="app/location/landmarksui/app/group"/>
      </component>
-     <component name="msgviewer" long-name="Message Viewer" origin-model="Foundation">
+     <component name="msgviewer" long-name="Message Viewer" origin-model="foundation">
       <unit bldFile="app/location/landmarksui/msgviewer/group"/>
      </component>
-     <component unofficial="yes" name="landmarksui_build" long-name="Landmarks UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="landmarksui_build" long-name="Landmarks UI Build" origin-model="foundation">
       <unit bldFile="app/location/landmarksui/group"/>
      </component>
     </collection>
     <collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-     <component name="blid" long-name="Blid" origin-model="Foundation">
+     <component name="blid" long-name="Blid" origin-model="foundation">
       <unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
      </component>
-     <component unofficial="yes" name="basiclocationinfodisplay_build" long-name="Basic Location Info Display Build" origin-model="Foundation">
+     <component unofficial="yes" name="basiclocationinfodisplay_build" long-name="Basic Location Info Display Build" origin-model="foundation">
       <unit bldFile="app/location/basiclocationinfodisplay/group"/>
      </component>
     </collection>
     <collection name="eventsui" long-name="Events UI" level="ui">
-     <component name="eventsui_help" long-name="Help" origin-model="Foundation">
+     <component name="eventsui_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/location/eventsui/help/group"/>
      </component>
-     <component name="eventsutils" long-name="Events Utils" origin-model="Foundation">
+     <component name="eventsutils" long-name="Events Utils" origin-model="foundation">
       <unit bldFile="app/location/eventsui/eventsutils/group"/>
      </component>
-     <component name="eventsengine" long-name="Events Engine" origin-model="Foundation">
+     <component name="eventsengine" long-name="Events Engine" origin-model="foundation">
       <unit bldFile="app/location/eventsui/eventsengine/group"/>
      </component>
-     <component name="eventshandlerui" long-name="Events Handler UI" origin-model="Foundation">
+     <component name="eventshandlerui" long-name="Events Handler UI" origin-model="foundation">
       <unit bldFile="app/location/eventsui/eventshandlerui/group"/>
      </component>
-     <component name="eventseditor" long-name="Events Editor" origin-model="Foundation">
+     <component name="eventseditor" long-name="Events Editor" origin-model="foundation">
       <unit bldFile="app/location/eventsui/eventseditor/group"/>
      </component>
-     <component name="eventsmgmtui" long-name="Events Mgmt UI" origin-model="Foundation">
+     <component name="eventsmgmtui" long-name="Events Mgmt UI" origin-model="foundation">
       <unit bldFile="app/location/eventsui/eventsmgmtui/group"/>
      </component>
-     <component unofficial="yes" name="eventsui_build" long-name="Events UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="eventsui_build" long-name="Events UI Build" origin-model="foundation">
       <unit bldFile="app/location/eventsui/group"/>
      </component>
     </collection>
     <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-     <component name="lmrefapp.exe=binary" origin-model="Foundation">
+     <component name="lmrefapp" origin-model="foundation">
       <unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
      </component>
     </collection>
     <collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-     <component name="LmUiRefApp.exe=binary" origin-model="Foundation">
+     <component name="lmuirefapp" origin-model="foundation">
       <unit bldFile="app/location/locationlandmarksuirefapp/group"/>
      </component>
     </collection>
     <collection name="locationsatviewrefapp" long-name="Location Sat View Reference App" level="apps">
-     <component name="SatelliteReference.exe=binary" origin-model="Foundation">
+     <component name="satellitereference" origin-model="foundation">
       <unit bldFile="app/location/locationsatviewrefapp/group"/>
      </component>
     </collection>
     <collection name="simpsyconfigurator" long-name="SIM PSY Configurator" level="engine">
-     <component name="simpsyui.exe=binary" origin-model="Foundation">
+     <component name="simpsyui" origin-model="foundation">
       <unit bldFile="app/location/simpsyconfigurator/group"/>
      </component>
     </collection>
     <collection name="mapnavproviderrefapp" long-name="Map Nav Provider Reference App" level="apps">
-     <component unofficial="yes" name="mapnavproviderrefapp_build" long-name="Map Nav Provider Reference App Build" origin-model="Foundation">
+     <component unofficial="yes" name="mapnavproviderrefapp_build" long-name="Map Nav Provider Reference App Build" origin-model="foundation">
       <unit bldFile="app/location/mapnavproviderrefapp/group"/>
      </component>
     </collection>
     <collection name="location_info" long-name="Location Apps Info" level="apps">
-     <component unofficial="yes" name="landmarks_ui_selector_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
-      <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/group"/>
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="landmarks_ui_addedit_api" origin-model="Foundation">
+     <component unofficial="yes" name="location_build" long-name="Location Apps Build" origin-model="foundation">
+      <unit bldFile="app/location/group"/>
+     </component>
+     <component unofficial="yes" name="location_test" long-name="Location Apps Test" origin-model="foundation">
+      <!-- <unit bldFile="app/location/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="loc_pub" class="api" origin-model="foundation">
+      <unit bldFile="app/location/loc_pub/group"/>
       <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
       <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="location_build" long-name="Location Apps Build" origin-model="Foundation">
-      <unit bldFile="app/location/group"/>
-     </component>
-     <component unofficial="yes" name="location_test" long-name="Location Apps Test" origin-model="Foundation">
-      <!-- <unit bldFile="app/location/tsrc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
    <block name="mmsharinguis" long-name="Multimedia Sharing UIs" tech_domain="vc" level="services" levels="base plugin">
     <collection name="mmsharing" long-name="MM Sharing" level="base">
-     <component name="mmshavailability" long-name="Multimedia Sharing Availability" origin-model="Foundation">
+     <component name="mmshavailability" long-name="Multimedia Sharing Availability" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
      </component>
-     <component name="mmshindicator" long-name="Multimedia Sharing Indicator" origin-model="Foundation">
+     <component name="mmshindicator" long-name="Multimedia Sharing Indicator" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
       <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
      </component>
-     <component name="mmshmanagercli" long-name="Multimedia Sharing Manager Client" origin-model="Foundation">
+     <component name="mmshmanagercli" long-name="Multimedia Sharing Manager Client" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
      </component>
-     <component name="mmshmanagersrv" long-name="Multimedia Sharing Manager Server" origin-model="Foundation">
+     <component name="mmshmanagersrv" long-name="Multimedia Sharing Manager Server" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
      </component>
-     <component name="mmshengine" long-name="Multimedia Sharing Engine" origin-model="Foundation">
+     <component name="mmshengine" long-name="Multimedia Sharing Engine" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
      </component>
-     <component name="mmshui" long-name="Multimedia Sharing UI" origin-model="Foundation">
+     <component name="mmshui" long-name="Multimedia Sharing UI" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
       <unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshui/tsrc/ut_ui/group"/> -->
      </component>
-     <component unofficial="yes" name="mmsharing_build" long-name="MM Sharing Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmsharing_build" long-name="MM Sharing Build" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmsharing/group"/>
      </component>
     </collection>
     <collection name="mmshplugins" long-name="MM Sharing Plugins" level="plugin">
-     <component name="mmshaoplugin" long-name="Multimedia Sharing Always Online Plugin" origin-model="Foundation">
+     <component name="mmshaoplugin" long-name="Multimedia Sharing Always Online Plugin" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
      </component>
-     <component name="mmshaiwplugin" long-name="Multimedia Sharing AIW Plugin" origin-model="Foundation">
+     <component name="mmshaiwplugin" long-name="Multimedia Sharing AIW Plugin" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group"/> -->
      </component>
-     <component name="mmshsipcrplugin" long-name="Multimedia Sharing SIP Client Resolver Plugin" origin-model="Foundation">
+     <component name="mmshsipcrplugin" long-name="Multimedia Sharing SIP Client Resolver Plugin" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
      </component>
-     <component name="mmshsettingsuiplugin" long-name="Multimedia Sharing Settings UI Plugin" origin-model="Foundation">
+     <component name="mmshsettingsuiplugin" long-name="Multimedia Sharing Settings UI Plugin" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
      </component>
-     <component name="mmshwpadapterplugin" long-name="Multimedia Sharing WP Adapter Plugin" origin-model="Foundation">
+     <component name="mmshwpadapterplugin" long-name="Multimedia Sharing WP Adapter Plugin" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
      </component>
-     <component name="mmcctranscoder" long-name="MMCC Transcoder" origin-model="Foundation">
+     <component name="mmcctranscoder" long-name="MMCC Transcoder" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/group"/>
       <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
       <!-- <unit bldFile="app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group"/> -->
      </component>
-     <component unofficial="yes" name="mmshplugins_build" long-name="MM Sharing Plugins Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmshplugins_build" long-name="MM Sharing Plugins Build" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/mmshplugins/group"/>
      </component>
     </collection>
     <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="plugin">
-     <component unofficial="yes" name="scripts" origin-model="Foundation">
+     <component unofficial="yes" name="scripts" origin-model="foundation">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/scripts"/> -->
      </component>
-     <component unofficial="yes" name="mceclientstub" origin-model="Foundation">
+     <component unofficial="yes" name="mceclientstub" origin-model="foundation">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/mceclientstub/group"/> -->
      </component>
-     <component unofficial="yes" name="mmsharinguis_build" long-name="Multimedia Sharing UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmsharinguis_build" long-name="Multimedia Sharing UIs Build" origin-model="foundation">
       <unit bldFile="app/mmsharinguis/group"/>
      </component>
-     <component unofficial="yes" name="musenginestub" origin-model="Foundation">
+     <component unofficial="yes" name="musenginestub" origin-model="foundation">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/musenginestub/group"/> -->
      </component>
-     <component unofficial="yes" name="ututils" origin-model="Foundation">
+     <component unofficial="yes" name="ututils" origin-model="foundation">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/ututils/group"/> -->
      </component>
-     <component unofficial="yes" name="cenrepeditor" origin-model="Foundation">
+     <component unofficial="yes" name="cenrepeditor" origin-model="foundation">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/cenrepeditor/group"/> -->
      </component>
-     <component unofficial="yes" name="mustestapp" origin-model="Foundation">
+     <component unofficial="yes" name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="mustestapp" origin-model="foundation">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/mustestapp/group"/> -->
      </component>
     </collection>
-    <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="multimedia_sharing_resource_api" origin-model="Foundation">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_sharing_manager_api" origin-model="Foundation">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="multimedia_sharing_settings_api" origin-model="Foundation">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="phone" long-name="Phone Apps" tech_domain="vc" level="apps" span="2" levels="engine plugin ui apps">
     <collection name="phoneapp" long-name="Phone App" level="apps">
-     <component name="Blacklist" origin-model="Foundation">
+     <component name="blacklist" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/blacklist/group"/>
      </component>
-     <component name="phoneui" long-name="Phone UI" origin-model="Foundation">
+     <component name="phoneui" long-name="Phone UI" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/phoneui/group"/>
       <!-- <unit bldFile="app/phone/phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group"/> -->
       <!-- <unit bldFile="app/phone/phoneapp/phoneui/tsrc/public/basic/group"/> -->
      </component>
-     <component name="phoneuicontrol" long-name="Phone UI Control" origin-model="Foundation">
+     <component name="phoneuicontrol" long-name="Phone UI Control" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
      </component>
-     <component name="phoneuistates" long-name="Phone UI States" origin-model="Foundation">
+     <component name="phoneuistates" long-name="Phone UI States" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/phoneuistates/group"/>
      </component>
-     <component name="phoneuiutils" long-name="Phone UI Utils" origin-model="Foundation">
+     <component name="phoneuiutils" long-name="Phone UI Utils" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/phoneuiutils/group"/>
      </component>
-     <component name="phoneuiview" long-name="Phone UI View" origin-model="Foundation">
+     <component name="phoneuiview" long-name="Phone UI View" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/phoneuiview/group"/>
      </component>
-     <component name="phoneuivoipextension" long-name="Phone UI VOIP Extension" origin-model="Foundation">
+     <component name="phoneuivoipextension" long-name="Phone UI VOIP Extension" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/phoneuivoipextension/group"/>
      </component>
-     <component name="silenceactionplugin" long-name="Silence Action Plugin" origin-model="Foundation">
+     <component name="silenceactionplugin" long-name="Silence Action Plugin" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/silenceactionplugin/group"/>
      </component>
-     <component name="phonemediatorcenter" long-name="Phone Mediator Center" origin-model="Foundation">
+     <component name="phonemediatorcenter" long-name="Phone Mediator Center" origin-model="foundation">
       <unit bldFile="app/phone/phoneapp/phonemediatorcenter/group"/>
      </component>
     </collection>
     <collection name="phoneengine" long-name="Phone Engine" level="engine">
-     <component name="PhoneCntFinder" long-name="Phone Contact Finder" origin-model="Foundation">
+     <component name="phonecntfinder" long-name="Phone Contact Finder" origin-model="foundation">
       <unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
      </component>
-     <component name="audiohandling" long-name="Audio Handling" origin-model="Foundation">
+     <component name="audiohandling" long-name="Audio Handling" origin-model="foundation">
       <unit bldFile="app/phone/phoneengine/audiohandling/group"/>
      </component>
-     <component name="callhandling" long-name="Call Handling" origin-model="Foundation">
+     <component name="callhandling" long-name="Call Handling" origin-model="foundation">
       <unit bldFile="app/phone/phoneengine/callhandling/group"/>
      </component>
-     <component name="contacthandling" long-name="Contact Handling" origin-model="Foundation">
+     <component name="contacthandling" long-name="Contact Handling" origin-model="foundation">
       <unit bldFile="app/phone/phoneengine/contacthandling/group"/>
      </component>
-     <component name="loghandling" long-name="Log Handling" origin-model="Foundation">
+     <component name="loghandling" long-name="Log Handling" origin-model="foundation">
       <unit bldFile="app/phone/phoneengine/loghandling/group"/>
      </component>
-     <component name="engineinfo" long-name="Engine Info" origin-model="Foundation">
+     <component name="engineinfo" long-name="Engine Info" origin-model="foundation">
       <unit bldFile="app/phone/phoneengine/engineinfo/group"/>
      </component>
-     <component name="phonemodel" long-name="Phone Model" origin-model="Foundation">
+     <component name="phonemodel" long-name="Phone Model" origin-model="foundation">
       <unit bldFile="app/phone/phoneengine/phonemodel/group"/>
      </component>
-     <component name="servicehandling" long-name="Service Handling" origin-model="Foundation">
+     <component name="servicehandling" long-name="Service Handling" origin-model="foundation">
       <unit bldFile="app/phone/phoneengine/servicehandling/group"/>
      </component>
     </collection>
     <collection name="phonesettings" long-name="Phone Settings" level="ui">
-     <component name="aiwcallimageplugin" long-name="Aiw Call Image Plugin" origin-model="Foundation">
+     <component name="aiwcallimageplugin" long-name="Aiw Call Image Plugin" origin-model="foundation">
       <unit bldFile="app/phone/phonesettings/aiwcallimageplugin/group"/>
      </component>
-     <component name="pslncallimageplugin" long-name="Personalization Call Image Plugin" origin-model="Foundation">
+     <component name="pslncallimageplugin" long-name="Personalization Call Image Plugin" origin-model="foundation">
       <unit bldFile="app/phone/phonesettings/pslncallimageplugin/group"/>
      </component>
     </collection>
     <collection name="phoneuis" long-name="Phone UIs" level="ui">
-     <component name="dialer" long-name="Dialer" origin-model="Foundation">
+     <component name="dialer" long-name="Dialer" origin-model="foundation">
       <unit bldFile="app/phone/phoneuis/dialer/group"/>
       <!-- <unit bldFile="app/phone/phoneuis/dialer/tsrc/public/basic/group"/> -->
      </component>
-     <component name="BubbleManager" long-name="Bubble Manager" origin-model="Foundation">
+     <component name="bubblemanager" long-name="Bubble Manager" origin-model="foundation">
       <unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
      </component>
-     <component name="ConnectUtil" long-name="Connect Util" origin-model="Foundation">
+     <component name="connectutil" long-name="Connect Util" origin-model="foundation">
       <unit bldFile="app/phone/phoneuis/connectutil/group"/>
      </component>
-     <component name="SFIUtils" long-name="SFI Utils" origin-model="Foundation">
+     <component name="sfiutils" long-name="SFI Utils" origin-model="foundation">
       <unit bldFile="app/phone/phoneuis/sfiutils/group"/>
       <!-- <unit bldFile="app/phone/phoneuis/sfiutils/tsrc/public/basic/group"/> -->
      </component>
-     <component name="Ussd" long-name="USSD" origin-model="Foundation">
+     <component name="ussd" long-name="USSD" origin-model="foundation">
       <unit bldFile="app/phone/phoneuis/ussd/group"/>
      </component>
-     <component name="vmbx" long-name="Vmbx" origin-model="Foundation">
+     <component name="vmbx" long-name="Vmbx" origin-model="foundation">
       <unit bldFile="app/phone/phoneuis/vmbx/group"/>
      </component>
-     <component name="TelephonyDeviceMode" long-name="Telephony Device Mode" origin-model="Foundation">
+     <component name="telephonydevicemode" long-name="Telephony Device Mode" origin-model="foundation">
       <unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
      </component>
     </collection>
     <collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-     <component name="telbranding" long-name="Tel Branding" origin-model="Foundation">
+     <component name="telbranding" long-name="Tel Branding" origin-model="foundation">
       <unit bldFile="app/phone/phoneplugins/telbranding/group"/>
      </component>
     </collection>
     <collection name="phone_info" long-name="Phone Apps Info" level="apps">
-     <component unofficial="yes" name="phone_build" long-name="Phone Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="phone_build" long-name="Phone Apps Build" origin-model="foundation">
       <unit bldFile="app/phone/group"/>
      </component>
-    </collection>
-    <collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="telephony_microphone_mute_status_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="3d_ringing_tone_enabler_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_device_mode_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_video_mailbox_settings_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_comms_information_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialer_keypad_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_application_voip_commands_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_matching_extension_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="sfi_utility_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/sfi_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_information_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_menu_extension_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_bubble_extension_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_logging_extension_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_mediator_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_telephony_mediator_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_configuration_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_application_commands_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_remote_party_information_api" origin-model="Foundation">
-      <unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+     <component unofficial="yes" name="phone_plat" long-name="Phone Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/phone/phone_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="videotelephony" long-name="Video Telephony Apps" tech_domain="vc" level="apps" levels="engine plugin prot ui">
     <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
-     <component name="PacketVideoEngineBinaries" long-name="Packet Video Engine Binaries" origin-model="Foundation"/>
+     <component name="packetvideoenginebinaries" long-name="Packet Video Engine Binaries" origin-model="foundation"/>
     </collection>
     <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-     <component name="videoteleng" long-name="Videotel Engine" origin-model="Foundation">
+     <component name="videoteleng" long-name="Videotel Engine" origin-model="foundation">
       <!-- <unit bldFile="app/videotelephony/vtengines/videoteleng/callctrl/group"/> -->
       <unit bldFile="app/videotelephony/vtengines/videoteleng/group"/>
       <!-- <unit bldFile="app/videotelephony/vtengines/videoteleng/logger/group"/> -->
      </component>
-     <component name="vtmediatorplugin" long-name="VT Mediator Plugin" origin-model="Foundation">
+     <component name="vtmediatorplugin" long-name="VT Mediator Plugin" origin-model="foundation">
       <unit bldFile="app/videotelephony/vtengines/vtmediatorplugin/group"/>
      </component>
-     <component unofficial="yes" name="vtengines_build" long-name="Video Telephony Engines Build" origin-model="Foundation">
+     <component unofficial="yes" name="vtengines_build" long-name="Video Telephony Engines Build" origin-model="foundation">
       <unit bldFile="app/videotelephony/vtengines/group"/>
      </component>
     </collection>
     <collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-     <component name="videotelui" long-name="Video Telephony UI" origin-model="Foundation">
+     <component name="videotelui" long-name="Video Telephony UI" origin-model="foundation">
       <unit bldFile="app/videotelephony/vtuis/videotelui/group"/>
      </component>
-     <component unofficial="yes" name="vtuis_build" long-name="Video Telephony UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="vtuis_build" long-name="Video Telephony UIs Build" origin-model="foundation">
       <unit bldFile="app/videotelephony/vtuis/group"/>
      </component>
     </collection>
     <collection name="vtprotocolplugins" long-name="Video Telephony Protocol Plugins" level="plugin">
-     <component name="DisplaySink" long-name="Display Sink" origin-model="Foundation">
+     <component name="displaysink" long-name="Display Sink" origin-model="foundation">
       <unit bldFile="app/videotelephony/vtprotocolplugins/displaysink/group"/>
      </component>
-     <component name="VideoSource" long-name="Video Source" origin-model="Foundation">
+     <component name="videosource" long-name="Video Source" origin-model="foundation">
       <unit bldFile="app/videotelephony/vtprotocolplugins/videosource/group"/>
      </component>
-     <component unofficial="yes" name="vtprotocolplugins_build" long-name="Video Telephony Protocol Plugins Build" origin-model="Foundation">
+     <component unofficial="yes" name="vtprotocolplugins_build" long-name="Video Telephony Protocol Plugins Build" origin-model="foundation">
       <unit bldFile="app/videotelephony/vtprotocolplugins/group"/>
      </component>
     </collection>
     <collection name="vtprotocols" long-name="Video Telephony Protocols" level="prot">
-     <component name="videotelproto.dll=binary" origin-model="Foundation"/>
+     <!-- Empty duplicate component videotelproto.dll=binary removed -->
     </collection>
     <collection name="vtprotocolsstub" long-name="Video Telephony Protocols Stub" level="prot">
-     <component name="videotelproto.dll=binary" origin-model="Foundation">
+     <component name="videotelproto" origin-model="foundation">
       <unit bldFile="app/videotelephony/vtprotocolsstub/group"/>
      </component>
     </collection>
-    <collection name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="video_telephony_media_configuration_api" origin-model="Foundation">
-      <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_telephony_control_mediator_api" origin-model="Foundation">
-      <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+    <collection name="videotelephony_info" long-name="Video Telephony Apps Info" level="ui">
+     <component unofficial="yes" name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/videotelephony/videotelephony_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="poc" long-name="PoC" tech_domain="vc" level="apps" levels="engine ui">
     <collection name="pocengine" long-name="PoC Engine" level="engine">
-     <component name="sipclientresolver" long-name="SIP Client Resolver" origin-model="Foundation">
+     <component name="sipclientresolver" long-name="SIP Client Resolver" origin-model="foundation">
       <!-- <unit bldFile="app/poc/pocengine/sipclientresolver/group"/> -->
      </component>
-     <component unofficial="yes" name="pocengine_build" long-name="PoC Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="pocengine_build" long-name="PoC Engine Build" origin-model="foundation">
       <unit bldFile="app/poc/pocengine/group"/>
      </component>
-     <component unofficial="yes" name="pocengine_test" long-name="PoC Engine Test" origin-model="Foundation">
+     <component unofficial="yes" name="pocengine_test" long-name="PoC Engine Test" origin-model="foundation">
       <!-- <unit bldFile="app/poc/pocengine/tsrc/public/basic/group"/> -->
      </component>
     </collection>
     <collection name="pocui" long-name="PoC Ui" level="ui">
-     <component name="PoCUiIntgr" long-name="PoC UI Intgr" origin-model="Foundation">
+     <component name="pocuiintgr" long-name="PoC UI Intgr" origin-model="foundation">
       <unit bldFile="app/poc/pocui/pocuiintgr/group"/>
       <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
       <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiecomplugin/group"/> -->
       <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiintegrationservices/group"/> -->
      </component>
-     <component name="pocui_app" long-name="Application" origin-model="Foundation">
+     <component name="pocui_app" long-name="Application" origin-model="foundation">
       <unit bldFile="app/poc/pocui/app/group"/>
      </component>
-     <component unofficial="yes" name="pocui_build" long-name="PoC Ui Build" origin-model="Foundation">
+     <component unofficial="yes" name="pocui_build" long-name="PoC Ui Build" origin-model="foundation">
       <unit bldFile="app/poc/pocui/group"/>
      </component>
     </collection>
     <collection name="poc_info" long-name="PoC Info" level="ui">
-     <component unofficial="yes" name="poc_build" long-name="PoC Build" origin-model="Foundation">
+     <component unofficial="yes" name="poc_build" long-name="PoC Build" origin-model="foundation">
       <unit bldFile="app/poc/group"/>
      </component>
-     <component unofficial="yes" name="poc_help" long-name="PoC Help" origin-model="Foundation">
+     <component unofficial="yes" name="poc_plat" long-name="PoC Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/poc/poc_plat/group"/>
+     </component>
+     <component unofficial="yes" name="poc_help" long-name="PoC Help" origin-model="foundation">
       <unit bldFile="app/poc/help/group"/>
      </component>
     </collection>
-    <collection name="poc_plat" long-name="PoC Platform Interfaces" level="ui">
-     <component unofficial="yes" name="poc_sessions_api" origin-model="Foundation">
-      <unit bldFile="app/poc/poc_plat/poc_sessions_api/group"/>
-     </component>
-     <component unofficial="yes" name="poc_ui_integration_services_api" origin-model="Foundation">
-      <unit bldFile="app/poc/poc_plat/poc_ui_integration_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="poc_api" long-name="PoC API" origin-model="Foundation">
-      <unit bldFile="app/poc/poc_plat/poc_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="iptelephony" long-name="IP Telephony" tech_domain="vc" level="apps" levels="plugin eng ui">
-    <collection name="commsconfig" long-name="Comms Config" level="ui">
-     <component name="cscgsplugin" long-name="CSCGS Plugin" origin-model="Foundation">
+    <!-- Collection renamed to avoid duplicates -->
+    <collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
+     <component name="cscgsplugin" long-name="CSCGS Plugin" origin-model="foundation">
       <unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
      </component>
-     <component name="cscsipvoipcleanupplugin" long-name="CSC SIP VOIP Cleanup Plugin" origin-model="Foundation">
+     <component name="cscsipvoipcleanupplugin" long-name="CSC SIP VOIP Cleanup Plugin" origin-model="foundation">
       <unit bldFile="app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
      </component>
-     <component name="cscengine" long-name="CSC Engine" origin-model="Foundation">
+     <component name="cscengine" long-name="CSC Engine" origin-model="foundation">
       <unit bldFile="app/iptelephony/commsconfig/cscengine/group"/>
      </component>
-     <component name="cscsettingsui" long-name="CSC Settings UI" origin-model="Foundation">
+     <component name="cscsettingsui" long-name="CSC Settings UI" origin-model="foundation">
       <unit bldFile="app/iptelephony/commsconfig/cscsettingsui/group"/>
      </component>
-     <component name="cscapplicationui" long-name="CSC Application UI" origin-model="Foundation">
+     <component name="cscapplicationui" long-name="CSC Application UI" origin-model="foundation">
       <unit bldFile="app/iptelephony/commsconfig/cscapplicationui/group"/>
      </component>
-     <component unofficial="yes" name="commsconfig_build" long-name="Comms Config Build" origin-model="Foundation">
+     <component unofficial="yes" name="commsconfig_build" long-name="Comms Config Build" origin-model="foundation">
       <unit bldFile="app/iptelephony/commsconfig/group"/>
      </component>
     </collection>
     <collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="ui">
-     <component name="cchserver" long-name="CCH Server" origin-model="Foundation">
+     <component name="cchserver" long-name="CCH Server" origin-model="foundation">
       <unit bldFile="app/iptelephony/convergedconnectionhandler/cchserver/group"/>
      </component>
-     <component name="cchclient" long-name="CCH Client" origin-model="Foundation">
+     <component name="cchclient" long-name="CCH Client" origin-model="foundation">
       <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclient/group"/>
      </component>
-     <component name="cchclientapi" long-name="CCH Clientapi" origin-model="Foundation">
+     <component name="cchclientapi" long-name="CCH Clientapi" origin-model="foundation">
       <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
      </component>
-     <component unofficial="yes" name="convergedconnectionhandler_build" long-name="Converged Connection Handler Build" origin-model="Foundation">
+     <component unofficial="yes" name="convergedconnectionhandler_build" long-name="Converged Connection Handler Build" origin-model="foundation">
       <unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
      </component>
     </collection>
     <collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-     <component name="rcse2" long-name="Rcse2" origin-model="Foundation">
+     <component name="rcse2" long-name="Rcse2" origin-model="foundation">
       <unit bldFile="app/iptelephony/richcallsettingsengine/rcse2/group"/>
      </component>
     </collection>
     <collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="eng">
-     <component name="svp.dll=binary" origin-model="Foundation">
+     <component name="svp" origin-model="foundation">
       <unit bldFile="app/iptelephony/sipvoipprovider/group"/>
      </component>
     </collection>
     <collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-     <component name="sipmxresolver" long-name="SIP MX Resolver" origin-model="Foundation">
+     <component name="sipmxresolver" long-name="SIP MX Resolver" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/sipmxresolver/group"/>
      </component>
-     <component name="sipconnectionprovider" long-name="SIP Connection Provider" origin-model="Foundation">
+     <component name="sipconnectionprovider" long-name="SIP Connection Provider" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/group"/>
       <unit bldFile="app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
      </component>
-     <component name="ipapputils" long-name="IP App Utils" origin-model="Foundation">
+     <component name="ipapputils" long-name="IP App Utils" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/ipapputils/group"/>
      </component>
-     <component name="voipadapters" long-name="VOIP Adapters" origin-model="Foundation">
+     <component name="voipadapters" long-name="VOIP Adapters" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/voipadapters/group"/>
      </component>
-     <component name="accountcreationplugin" long-name="Account Creation Plugin" origin-model="Foundation">
+     <component name="accountcreationplugin" long-name="Account Creation Plugin" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/accountcreationplugin/group"/>
      </component>
-     <component name="dhcppositionprovider" long-name="DHCP Position Provider" origin-model="Foundation">
+     <component name="dhcppositionprovider" long-name="DHCP Position Provider" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/dhcppositionprovider/group"/>
      </component>
-     <component name="svtmatching" long-name="SVT Matching" origin-model="Foundation">
+     <component name="svtmatching" long-name="SVT Matching" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/svtmatching/group"/>
      </component>
-     <component name="svtlogging" long-name="SVT Logging" origin-model="Foundation">
+     <component name="svtlogging" long-name="SVT Logging" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/svtlogging/group"/>
      </component>
-     <component name="svtcallmenu" long-name="SVT Call Menu" origin-model="Foundation">
+     <component name="svtcallmenu" long-name="SVT Call Menu" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/svtcallmenu/group"/>
      </component>
-     <component unofficial="yes" name="voipplugins_build" long-name="VoIP Plugins Build" origin-model="Foundation">
+     <component unofficial="yes" name="voipplugins_build" long-name="VoIP Plugins Build" origin-model="foundation">
       <unit bldFile="app/iptelephony/voipplugins/group"/>
      </component>
     </collection>
     <collection name="callcontinuity" long-name="Call Continuity" level="eng">
-     <component name="vccutils" long-name="VCC Utils" origin-model="Foundation">
+     <component name="vccutils" long-name="VCC Utils" origin-model="foundation">
       <unit bldFile="app/iptelephony/callcontinuity/vccutils/group"/>
      </component>
-     <component name="nsmldmvccadapter" long-name="NSML DM VCC Adapter" origin-model="Foundation">
+     <component name="nsmldmvccadapter" long-name="NSML DM VCC Adapter" origin-model="foundation">
       <unit bldFile="app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
      </component>
-     <component name="vccclientprovisioningadapter" long-name="VCC Client Provisioning Adapter" origin-model="Foundation">
+     <component name="vccclientprovisioningadapter" long-name="VCC Client Provisioning Adapter" origin-model="foundation">
       <unit bldFile="app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
      </component>
-     <component name="vccpropertyhandler" long-name="VCC Property Handler" origin-model="Foundation">
+     <component name="vccpropertyhandler" long-name="VCC Property Handler" origin-model="foundation">
       <unit bldFile="app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
      </component>
-     <component name="vcchotrigger" long-name="VCC Hotrigger" origin-model="Foundation">
+     <component name="vcchotrigger" long-name="VCC Hotrigger" origin-model="foundation">
       <unit bldFile="app/iptelephony/callcontinuity/vcchotrigger/group"/>
      </component>
-     <component name="vcc" long-name="VCC" origin-model="Foundation">
+     <component name="vcc" long-name="VCC" origin-model="foundation">
       <unit bldFile="app/iptelephony/callcontinuity/vcc/group"/>
      </component>
-     <component name="settingsreader" long-name="Settings Reader" origin-model="Foundation">
+     <component name="settingsreader" long-name="Settings Reader" origin-model="foundation">
       <!-- <unit bldFile="app/iptelephony/callcontinuity/settingsreader/group"/> -->
      </component>
-     <component unofficial="yes" name="callcontinuity_build" long-name="Call Continuity Build" origin-model="Foundation">
+     <component unofficial="yes" name="callcontinuity_build" long-name="Call Continuity Build" origin-model="foundation">
       <unit bldFile="app/iptelephony/callcontinuity/group"/>
      </component>
     </collection>
     <collection name="iptelephony_info" long-name="IP Telephony Info" level="ui">
-     <component unofficial="yes" name="cch_server_api" origin-model="Foundation">
-      <unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="cch_client_api" origin-model="Foundation">
-      <unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="vcc_api" origin-model="Foundation">
-      <unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-     </component>
-     <component unofficial="yes" name="iptelephony_build" long-name="IP Telephony Build" origin-model="Foundation">
+     <component unofficial="yes" name="iptelephony_build" long-name="IP Telephony Build" origin-model="foundation">
       <unit bldFile="app/iptelephony/group"/>
      </component>
-     <component unofficial="yes" name="richcallsettingsengine_api" origin-model="Foundation">
-      <unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-     </component>
-     <component unofficial="yes" name="csc_settingsui_api" origin-model="Foundation">
-      <unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-     </component>
-     <component unofficial="yes" name="vccpropertyhandler_api" origin-model="Foundation">
-      <unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+     <component unofficial="yes" name="iptel_plat" class="api" origin-model="foundation">
+      <unit bldFile="app/iptelephony/iptel_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="settingsuis" long-name="Settings UIs" tech_domain="dm" level="services" levels="empty rsc ui">
     <collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-     <component name="services_db" long-name="Services Db" origin-model="Foundation">
+     <component name="services_db" long-name="Services Db" origin-model="foundation">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
      </component>
-     <component name="defaultapplicationsettings_server" long-name="Server" origin-model="Foundation">
+     <component name="defaultapplicationsettings_server" long-name="Server" origin-model="foundation">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/server/group"/>
      </component>
-     <component name="service" long-name="Service" origin-model="Foundation">
+     <component name="service" long-name="Service" origin-model="foundation">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
      </component>
-     <component name="gsplugin" long-name="GS Plugin" origin-model="Foundation">
+     <component name="dasgsplugin" long-name="GS Plugin" origin-model="foundation">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
      </component>
-     <component unofficial="yes" name="defaultapplicationsettings_build" long-name="Default Application Settings Build" origin-model="Foundation">
+     <component unofficial="yes" name="defaultapplicationsettings_build" long-name="Default Application Settings Build" origin-model="foundation">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/group"/>
      </component>
     </collection>
     <collection name="systemswuis" long-name="System SW UIs" level="ui">
-     <component name="touchscreencalib" long-name="Touchscreen Calib" origin-model="Foundation">
+     <component name="touchscreencalib" long-name="Touchscreen Calib" origin-model="foundation">
       <unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
      </component>
     </collection>
     <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
-     <component unofficial="yes" name="settingsuis_build" long-name="Settings UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="devmngt_pub" class="api" origin-model="foundation">
+      <unit bldFile="app/settingsuis/devmngt_pub/group"/>
+     </component>
+     <component unofficial="yes" name="settingsuis_build" long-name="Settings UIs Build" origin-model="foundation">
       <unit bldFile="app/settingsuis/group"/>
      </component>
-     <component unofficial="yes" name="default_app_client_api" origin-model="Foundation">
+     <component unofficial="yes" name="settingsuis_test" long-name="Settings UIs Test" origin-model="foundation">
+      <!-- <unit bldFile="app/settingsuis/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="devmngt_plat" class="api" origin-model="foundation">
       <!-- <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
-      <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="settingsuis_test" long-name="Settings UIs Test" origin-model="Foundation">
-      <!-- <unit bldFile="app/settingsuis/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="services_db_api" origin-model="Foundation">
-      <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group"/>
+      <unit bldFile="app/settingsuis/devmngt_plat/group"/>
       <!-- <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/tsrc/servicesdbapitest/group"/> -->
      </component>
     </collection>
    </block>
    <block name="contentcontrol" long-name="Content Control Daemons" tech_domain="dm" level="services" levels="1 2">
     <collection name="applicationmanagement" long-name="Application Management" level="1">
-     <component name="options" long-name="Options" origin-model="Foundation">
+     <component name="options" long-name="Options" origin-model="foundation">
       <unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
      </component>
-     <component name="applicationmanagement_client" long-name="Client" origin-model="Foundation">
+     <component name="applicationmanagement_client" long-name="Client" origin-model="foundation">
       <unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
      </component>
-     <component name="applicationmanagement_server" long-name="Server" origin-model="Foundation">
+     <component name="applicationmanagement_server" long-name="Server" origin-model="foundation">
       <unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
      </component>
-     <component name="RfsPlugin" origin-model="Foundation">
+     <component name="rfsplugin" origin-model="foundation">
       <unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
      </component>
-     <component name="amadapter2" long-name="AM Adapter2" origin-model="Foundation">
+     <component name="amadapter2" long-name="AM Adapter2" origin-model="foundation">
       <unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
      </component>
     </collection>
     <collection name="customization" long-name="Customization" level="2">
-     <component name="DMUtils" origin-model="Foundation">
+     <component name="dmutils" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
      </component>
-     <component name="UISettingsSrv" origin-model="Foundation">
+     <component name="uisettingssrv" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
      </component>
-     <component name="isadapter" long-name="IS Adapter" origin-model="Foundation">
+     <component name="isadapter" long-name="IS Adapter" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
      </component>
-     <component name="supadapter" long-name="SUPAdapter" origin-model="Foundation">
+     <component name="supadapter" long-name="SUPAdapter" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
      </component>
-     <component name="WallpaperAdapter" origin-model="Foundation">
+     <component name="wallpaperadapter" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
      </component>
-     <component name="OperatorLogoAdapter" origin-model="Foundation">
+     <component name="operatorlogoadapter" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
      </component>
-     <component name="ScreenSaverAdapter" origin-model="Foundation">
+     <component name="screensaveradapter" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
      </component>
-     <component name="ThemesAdapter" origin-model="Foundation">
+     <component name="themesadapter" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
      </component>
-     <component name="EmbeddedLinkAdapter" origin-model="Foundation">
+     <component name="embeddedlinkadapter" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
      </component>
     </collection>
     <collection name="omads" long-name="OMA DS" level="1">
-     <component name="omadsappui" long-name="OMA DS App UI" origin-model="Foundation">
+     <component name="omadsappui" long-name="OMA DS App UI" origin-model="foundation">
       <unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
      </component>
-     <component name="omadsextensions" long-name="OMA DS Extensions" origin-model="Foundation">
+     <component name="omadsextensions" long-name="OMA DS Extensions" origin-model="foundation">
       <!-- <unit bldFile="app/contentcontrol/omads/omadsextensions/dsutils/emailxmlutils/bld"/> -->
       <unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
      </component>
     </collection>
     <collection name="contentcontrol_info" long-name="Content Control Daemons Info" level="2">
-     <component unofficial="yes" name="contentcontrol_build" long-name="Content Control Daemons Build" origin-model="Foundation">
+     <component unofficial="yes" name="contentcontrol_build" long-name="Content Control Daemons Build" origin-model="foundation">
       <unit bldFile="app/contentcontrol/group"/>
      </component>
-     <component unofficial="yes" name="oma_ds_presync_plugin_api" origin-model="Foundation">
-      <unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+     <component unofficial="yes" name="contentctrl_plat" class="api" origin-model="foundation">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="devicecontrol" long-name="Device Control Daemons" tech_domain="dm" level="services" levels="oma mid app">
     <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
-     <component name="devdiagapp" long-name="Dev Diag App" origin-model="Foundation">
+     <component name="devdiagapp" long-name="Dev Diag App" origin-model="foundation">
       <unit bldFile="app/devicecontrol/devicediagnostics/devdiagapp/group"/>
      </component>
-     <component name="devdiaggsplugin" long-name="Dev Diag GS Plugin" origin-model="Foundation">
+     <component name="devdiaggsplugin" long-name="Dev Diag GS Plugin" origin-model="foundation">
       <unit bldFile="app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
      </component>
-     <component name="diagplugins" long-name="Diag Plugins" origin-model="Foundation">
+     <component name="diagplugins" long-name="Diag Plugins" origin-model="foundation">
       <unit bldFile="app/devicecontrol/devicediagnostics/diagplugins/group"/>
      </component>
-     <component name="diagsuites" long-name="Diag Suites" origin-model="Foundation">
+     <component name="diagsuites" long-name="Diag Suites" origin-model="foundation">
       <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
      </component>
-     <component unofficial="yes" name="devicediagnostics_build" long-name="Device Diagnostics Build" origin-model="Foundation">
+     <component unofficial="yes" name="devicediagnostics_build" long-name="Device Diagnostics Build" origin-model="foundation">
       <unit bldFile="app/devicecontrol/devicediagnostics/group"/>
      </component>
     </collection>
     <collection name="fotaapplication" long-name="FOTA Application" level="app">
-     <component name="fotaserver" long-name="FOTA Server" origin-model="Foundation">
+     <component name="fotaserver" long-name="FOTA Server" origin-model="foundation">
       <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmsclient/group"/> -->
       <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmserver/group"/> -->
       <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotarfsplugin/group"/> -->
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
      </component>
+     <component unofficial="yes" name="fotaapp" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
+     </component>
     </collection>
     <collection name="omadm" long-name="OMA Device Management" level="oma">
-     <component name="omadmappui" long-name="OMA DM App UI" origin-model="Foundation">
+     <component name="omadmappui" long-name="OMA DM App UI" origin-model="foundation">
       <unit bldFile="app/devicecontrol/omadm/omadmappui/group"/>
       <!-- <unit bldFile="app/devicecontrol/omadm/omadmappui/tsrc/group"/> -->
      </component>
-     <component name="omadmextensions" long-name="OMA DM Extensions" origin-model="Foundation">
+     <component name="omadmextensions" long-name="OMA DM Extensions" origin-model="foundation">
       <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/email/tsrc/group"/> -->
       <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/mms/tsrc/group"/> -->
       <!-- <unit bldFile="app/devicecontrol/omadm/omadmextensions/adapters/syncmldm/tsrc/group"/> -->
@@ -10511,40 +7688,40 @@
      </component>
     </collection>
     <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-     <component name="pnpms" long-name="PnP MS" origin-model="Foundation">
+     <component name="pnpms" long-name="PnP MS" origin-model="foundation">
       <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
       <!-- <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-     <component name="omacpadapters" long-name="OMA CP Adapters" origin-model="Foundation">
+     <component name="omacpadapters" long-name="OMA CP Adapters" origin-model="foundation">
       <unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
      </component>
     </collection>
     <collection name="devicecontrol_info" long-name="Device Control Daemons Info" level="app">
-     <component unofficial="yes" name="devicecontrol_build" long-name="Device Control Daemons Build" origin-model="Foundation">
+     <component unofficial="yes" name="devicecontrol_build" long-name="Device Control Daemons Build" origin-model="foundation">
       <unit bldFile="app/devicecontrol/group"/>
      </component>
-     <component unofficial="yes" name="customization_test" origin-model="Foundation">
+     <component unofficial="yes" name="customization_test" origin-model="foundation">
       <!-- <unit bldFile="app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
      </component>
-     <component unofficial="yes" name="applicationmanagement" origin-model="Foundation">
+     <component unofficial="yes" name="applicationmanagement_build" origin-model="foundation">
       <unit bldFile="app/devicecontrol/applicationmanagement/group"/>
      </component>
-     <component unofficial="yes" name="customization" origin-model="Foundation">
+     <component unofficial="yes" name="customization_build" origin-model="foundation">
       <unit bldFile="app/devicecontrol/customization/group"/>
      </component>
-     <component unofficial="yes" name="applicationmanagement_test" origin-model="Foundation">
+     <component unofficial="yes" name="applicationmanagement_test" origin-model="foundation">
       <!-- <unit bldFile="app/devicecontrol/applicationmanagement/tsrc/tarmappmng/group"/> -->
      </component>
     </collection>
    </block>
    <block name="printing" long-name="Printing" tech_domain="de" level="services" levels="app">
-    <collection name="ImagePrint" long-name="ImagePrint" level="app">
-     <component name="clog" origin-model="Foundation">
+    <collection name="imageprint" long-name="ImagePrint" level="app">
+     <component name="clog" origin-model="foundation">
       <unit bldFile="app/printing/imageprint/clog/group"/>
      </component>
-     <component name="ImagePrintEngine" origin-model="Foundation">
+     <component name="imageprintengine" origin-model="foundation">
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
@@ -10553,96 +7730,94 @@
       <unit bldFile="app/printing/imageprint/imageprintengine/group"/>
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/imageprintserver/group"/> -->
      </component>
-     <component name="ImagePrintUI" origin-model="Foundation">
+     <component name="imageprintui" origin-model="foundation">
       <unit bldFile="app/printing/imageprint/imageprintui/group"/>
      </component>
-     <component unofficial="yes" name="imageprint_build" origin-model="Foundation">
+     <component unofficial="yes" name="imageprint_build" origin-model="foundation">
       <unit bldFile="app/printing/imageprint/group"/>
      </component>
     </collection>
     <collection name="printing_info" long-name="Printing Info" level="app">
-     <component unofficial="yes" name="printing_build" long-name="Printing Build" origin-model="Foundation">
+     <component unofficial="yes" name="printing_build" long-name="Printing Build" origin-model="foundation">
       <unit bldFile="app/printing/group"/>
      </component>
     </collection>
    </block>
    <block name="files" long-name="File Manager Apps" tech_domain="pr" level="apps" levels="support apps">
     <collection name="filemanager" long-name="File Manager" level="apps">
-     <component name="filemanager_help" long-name="Help" origin-model="Foundation">
+     <component name="filemanager_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/files/filemanager/help/group"/>
      </component>
-     <component unofficial="yes" name="filemanager_build" long-name="File Manager Build" origin-model="Foundation">
+     <component name="filemanager_build" origin-model="foundation">
       <unit bldFile="app/files/filemanager/group"/>
      </component>
     </collection>
     <collection name="filesystemuis" long-name="File System UIs" level="support">
-     <component name="memscaneng" long-name="Mem Scan Eng" origin-model="Foundation">
+     <component name="memscaneng" long-name="Mem Scan Eng" origin-model="foundation">
       <unit bldFile="app/files/filesystemuis/memscaneng/group"/>
      </component>
-     <component name="memstatepopup" long-name="Mem State Popup" origin-model="Foundation">
+     <component name="memstatepopup" long-name="Mem State Popup" origin-model="foundation">
       <unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
      </component>
-     <component unofficial="yes" name="filesystemuis_build" long-name="File System UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="filesystemuis_build" long-name="File System UIs Build" origin-model="foundation">
       <unit bldFile="app/files/filesystemuis/group"/>
      </component>
     </collection>
-    <collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="memory_scan_popup_ui_api" origin-model="Foundation">
-      <unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-     </component>
-    </collection>
     <collection name="files_info" long-name="File Manager Apps Info" level="apps">
-     <component unofficial="yes" name="files_build" long-name="File Manager Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="files_plat" long-name="File Manager Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/files/files_plat/group"/>
+     </component>
+     <component unofficial="yes" name="files_build" long-name="File Manager Apps Build" origin-model="foundation">
       <unit bldFile="app/files/group"/>
      </component>
     </collection>
    </block>
    <block name="contacts" long-name="Contacts Apps" tech_domain="pr" level="apps" span="2" levels="engine support services ui">
     <collection name="contactextensions" long-name="Contact Extensions" level="services">
-     <component name="predefinedcontacts" long-name="Predefined Contacts" origin-model="Foundation">
+     <component name="predefinedcontacts" long-name="Predefined Contacts" origin-model="foundation">
       <unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
      </component>
-     <component unofficial="yes" name="contactextensions_build" long-name="Contact Extensions Build" origin-model="Foundation">
+     <component unofficial="yes" name="contactextensions_build" long-name="Contact Extensions Build" origin-model="foundation">
       <unit bldFile="app/contacts/contactextensions/group"/>
      </component>
     </collection>
     <collection name="logsui" long-name="Logs UI" level="ui">
-     <component name="logsui_help" long-name="Help" origin-model="Foundation">
+     <component name="logsui_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/contacts/logsui/help/group"/>
      </component>
-     <component name="logsserviceextension" long-name="Logs Service Extension" origin-model="Foundation">
+     <component name="logsserviceextension" long-name="Logs Service Extension" origin-model="foundation">
       <unit bldFile="app/contacts/logsui/logsserviceextension/group"/>
      </component>
-     <component unofficial="yes" name="logsui_build" long-name="Logs UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="logsui_build" long-name="Logs UI Build" origin-model="foundation">
       <unit bldFile="app/contacts/logsui/group"/>
      </component>
     </collection>
     <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-     <component name="Phonebook" origin-model="Foundation">
+     <component name="phonebook" origin-model="foundation">
       <unit bldFile="app/contacts/phonebookui/phonebook/group"/>
      </component>
-     <component name="Speeddial" long-name="Speed Dial" origin-model="Foundation">
+     <component name="speeddial" long-name="Speed Dial" origin-model="foundation">
       <unit bldFile="app/contacts/phonebookui/speeddial/group"/>
      </component>
-     <component name="Phonebook2" long-name="Phone Book 2" origin-model="Foundation">
+     <component name="phonebook2" long-name="Phone Book 2" origin-model="foundation">
       <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group"/> -->
       <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group"/> -->
       <unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
       <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/tsrc/utilities/changepbk2cenrepkeyvaluestool/group"/> -->
       <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/tsrc/ut_addfavoritiesvisibility/group"/> -->
      </component>
-     <component unofficial="yes" name="phonebookui_build" long-name="Phonebook UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="phonebookui_build" long-name="Phonebook UI Build" origin-model="foundation">
       <!-- <unit bldFile="app/contacts/phonebookui/group"/> -->
      </component>
     </collection>
     <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-     <component name="CntFindPlugin" long-name="Cnt Find Plugin" origin-model="Foundation">
+     <component name="cntfindplugin" long-name="Cnt Find Plugin" origin-model="foundation">
       <unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
      </component>
-     <component name="CntSortPlugin" long-name="Cnt Sort Plugin" origin-model="Foundation">
+     <component name="cntsortplugin" long-name="Cnt Sort Plugin" origin-model="foundation">
       <unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
      </component>
-     <component name="VirtualPhonebook" long-name="Virtual Phonebook" origin-model="Foundation">
+     <component name="virtualphonebook" long-name="Virtual Phonebook" origin-model="foundation">
       <unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
       <!-- <unit bldFile="app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_selectorfactory/group"/> -->
       <!-- <unit bldFile="app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_strcntanalyzer/group"/> -->
@@ -10660,14 +7835,14 @@
        <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/testimpexvcard/groupsql"/>
        -  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/teststartup/group"/>  -
      </component>-->
-     <component unofficial="yes" name="phonebookengines_build" long-name="Phonebook Engines Build" origin-model="Foundation">
+     <component unofficial="yes" name="phonebookengines_build" long-name="Phonebook Engines Build" origin-model="foundation">
       <unit bldFile="app/contacts/phonebookengines/group"/>
      </component>
-     <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
+    <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="app/contacts/phonebookengines/contactsmodel/group" mrp="app/contacts/phonebookengines/contactsmodel/group/app-engines_cntmodel.mrp" version="1"/>
      </component>
     </collection>
-	<!-- Collection manually added from OS after auto-merge -->
+	<!-- Collection manually added due to faulty merge XSLT -->
 	<collection name="pimprotocols" long-name="PIM Protocols" level="services">
 	 <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
 	  <unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
@@ -10677,7 +7852,7 @@
 	 </component>
 	</collection>
     <collection name="ccservices" long-name="CC Services" level="services">
-     <component name="cmsservices" long-name="CMS Services" origin-model="Foundation">
+     <component name="cmsservices" long-name="CMS Services" origin-model="foundation">
       <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/client/group"/> -->
       <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/server/group"/> -->
       <!-- <unit bldFile="app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator/client/group"/> -->
@@ -10688,401 +7863,234 @@
      </component>
     </collection>
     <collection name="presencecache" long-name="Presence Cache" level="support">
-     <component name="presencecacheutils" long-name="Presence Cache Utils" origin-model="Foundation">
+     <component name="presencecacheutils" long-name="Presence Cache Utils" origin-model="foundation">
       <!-- <unit bldFile="app/contacts/presencecache/presencecacheutils/group"/> -->
      </component>
-     <component name="presencecacheserver2" long-name="Presence Cache Server2" origin-model="Foundation">
+     <component name="presencecacheserver2" long-name="Presence Cache Server2" origin-model="foundation">
       <!-- <unit bldFile="app/contacts/presencecache/presencecacheserver2/group"/> -->
      </component>
-     <component name="presencecacheclient2" long-name="Presence Cache Client2" origin-model="Foundation">
+     <component name="presencecacheclient2" long-name="Presence Cache Client2" origin-model="foundation">
       <!-- <unit bldFile="app/contacts/presencecache/presencecacheclient2/group"/> -->
      </component>
-     <component unofficial="yes" name="presencecache_build" long-name="Presence Cache Build" origin-model="Foundation">
+     <component unofficial="yes" name="presencecache_build" long-name="Presence Cache Build" origin-model="foundation">
       <unit bldFile="app/contacts/presencecache/group"/>
      </component>
     </collection>
     <collection name="predictivesearch" long-name="Predictive Search" level="support">
-     <component name="PcsUtils" long-name="PCS Utils" origin-model="Foundation">
+     <component name="pcsutils" long-name="PCS Utils" origin-model="foundation">
       <unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
      </component>
-     <component name="PcsServerClientAPI" long-name="PCS Server Client API" origin-model="Foundation">
+     <component name="pcsserverclientapi" long-name="PCS Server Client API" origin-model="foundation">
       <unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
      </component>
-     <component name="PcsServer" long-name="PCS Server" origin-model="Foundation">
+     <component name="pcsserver" long-name="PCS Server" origin-model="foundation">
       <unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
      </component>
-     <component name="adapters" long-name="Adapters" origin-model="Foundation">
+     <component name="adapters" long-name="Adapters" origin-model="foundation">
       <unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
      </component>
-     <component name="PcsAlgorithm" long-name="PCS Algorithm" origin-model="Foundation">
+     <component name="pcsalgorithm" long-name="PCS Algorithm" origin-model="foundation">
       <unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
      </component>
-     <component unofficial="yes" name="predictivesearch_build" long-name="Predictive Search Build" origin-model="Foundation">
+     <component unofficial="yes" name="predictivesearch_build" long-name="Predictive Search Build" origin-model="foundation">
       <unit bldFile="app/contacts/predictivesearch/group"/>
      </component>
     </collection>
     <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-     <component unofficial="yes" name="contacts_build" long-name="Contacts Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="contacts_build" long-name="Contacts Apps Build" origin-model="foundation">
       <unit bldFile="app/contacts/group"/>
      </component>
+     <component unofficial="yes" name="contacts_plat" long-name="Contacts Apps Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/contacts/contacts_plat/cca_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
+      <unit bldFile="app/contacts/contacts_plat/group"/>
+      <!-- <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/presence_cache_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="contacts_pub" long-name="Contacts Apps Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/contacts/contacts_pub/group"/>
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/> -->
+     </component>
     <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="speed_dial_dialogs_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_controls_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="logs_engine_api_extensions" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-     </component>
-     <component unofficial="yes" name="logs_timers_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_common_ui_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_image_management_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_data_management_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_plugin_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="cca_launch_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_plat/cca_launch_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_view_definition_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_configuration_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_definition_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_engine_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="predictivesearch_client_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_cache_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_plat/presence_cache_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_policy_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="contactpresence_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_ui_utilities_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_vcard_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_common_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_utilities_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_sim_services_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="predictivesearch_algorithm_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_icon_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_store_property_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_thumbnails_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_copy_policy_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_xsp_extension_manager_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_commands_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="logs_ui_command_line_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_store_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_engine_extension_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="cca_view_plugin_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="predictivesearch_adapters_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-     </component>
-     <component unofficial="yes" name="cms_contactor_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_extension_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_ui_controls_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_store_configuration_management_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_presentation_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_appfw_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_public_constants_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_thin_ui_extension_plugin_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_xsp_view_activation_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_migration_support_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="predictivesearch_utils_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-     </component>
-    </collection>
-    <collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-     <component unofficial="yes" name="phonebook_ui_utilities_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_thumbnail_operation_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_data_management_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_data_addedit_ui_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phonebook_vcard_importexport_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="speed_dial_utility_control_api" origin-model="Foundation">
-      <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phonebook_fetch_ui_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="organizer" long-name="Organizer Application Suite" tech_domain="pr" level="apps" span="2" levels="support services engine ui">
     <collection name="alarmui" long-name="Alarm UI" level="ui">
-     <component unofficial="yes" name="alarmui_build" long-name="Alarm UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="alarmui_build" long-name="Alarm UI Build" origin-model="foundation">
       <unit bldFile="app/organizer/alarmui/group"/>
      </component>
     </collection>
     <collection name="calendarui" long-name="Calendar UI" level="ui">
-     <component name="calendarui_help" long-name="Help" origin-model="Foundation">
+     <component name="calendarui_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/help/group"/>
      </component>
-     <component name="commonutils" long-name="Common Utils" origin-model="Foundation">
+     <component name="commonutils" long-name="Common Utils" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/commonutils/group"/>
      </component>
-     <component name="globaldata" long-name="Global Data" origin-model="Foundation">
+     <component name="globaldata" long-name="Global Data" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/globaldata/group"/>
      </component>
-     <component name="settings" long-name="Settings" origin-model="Foundation">
+     <component name="settings" long-name="Settings" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/settings/gsplugin/group"/>
       <unit bldFile="app/organizer/calendarui/settings/settingsui/group"/>
      </component>
-     <component name="customisation" long-name="Customisation" origin-model="Foundation">
+     <component name="customisation" long-name="Customisation" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/customisation/group"/>
      </component>
-     <component name="customisationmanager" long-name="Customisation Manager" origin-model="Foundation">
+     <component name="customisationmanager" long-name="Customisation Manager" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/customisationmanager/group"/>
      </component>
-     <component name="views" long-name="Views" origin-model="Foundation">
+     <component name="views" long-name="Views" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/views/group"/>
      </component>
-     <component name="calendarui_controller" long-name="Controller" origin-model="Foundation">
+     <component name="calendarui_controller" long-name="Controller" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/controller/group"/>
      </component>
-     <component name="editors" long-name=" Editors" origin-model="Foundation">
+     <component name="editors" long-name=" Editors" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/editors/group"/>
      </component>
-     <component name="application" long-name="Application" origin-model="Foundation">
+     <component name="application" long-name="Application" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/application/group"/>
      </component>
-     <component name="missedalarmindicatorplugin" long-name="Missed Alarm Indicator Plugin" origin-model="Foundation">
+     <component name="missedalarmindicatorplugin" long-name="Missed Alarm Indicator Plugin" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/missedalarmindicatorplugin/group"/>
      </component>
-     <component name="calendarui_server" long-name="Server" origin-model="Foundation">
+     <component name="calendarui_server" long-name="Server" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/server/calensvr/group"/>
       <unit bldFile="app/organizer/calendarui/server/calensvrclient/group"/>
      </component>
-     <component name="regionalplugins" long-name="Regional Plugins" origin-model="Foundation">
+     <component name="regionalplugins" long-name="Regional Plugins" origin-model="foundation">
       <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 name="inc" origin-model="Foundation"/>
-     <component unofficial="yes" name="calendarui_build" long-name="Calendar UI Build" origin-model="Foundation">
+     <!-- Empty duplicate component inc removed -->
+     <component unofficial="yes" name="calendarui_build" long-name="Calendar UI Build" origin-model="foundation">
       <unit bldFile="app/organizer/calendarui/group"/>
      </component>
     </collection>
     <collection name="clock2" long-name="Clock2" level="ui">
-     <component name="clockengines" long-name="Clock Engines" origin-model="Foundation">
+     <component name="clockengines" long-name="Clock Engines" origin-model="foundation">
       <unit bldFile="app/organizer/clock2/clockengines/group"/>
      </component>
-     <component name="clockui" long-name="Clock UI" origin-model="Foundation">
+     <component name="clockui" long-name="Clock UI" origin-model="foundation">
       <unit bldFile="app/organizer/clock2/clockui/group"/>
       <!-- <unit bldFile="app/organizer/clock2/clockui/plugins/datetimeviewplugin/group"/> -->
      </component>
-     <component name="clock2_help" long-name="Help" origin-model="Foundation">
+     <component name="clock2_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/organizer/clock2/help/group"/>
      </component>
-     <component unofficial="yes" name="clock2_build" long-name="Clock2 Build" origin-model="Foundation">
+     <component unofficial="yes" name="clock2_build" long-name="Clock2 Build" origin-model="foundation">
       <unit bldFile="app/organizer/clock2/group"/>
      </component>
     </collection>
     <collection name="meetingui" long-name="Meeting UI" level="ui">
-     <component name="attendeeview" long-name="Attendee View" origin-model="Foundation">
+     <component name="attendeeview" long-name="Attendee View" origin-model="foundation">
       <unit bldFile="app/organizer/meetingui/attendeeview/group"/>
      </component>
-     <component name="agnentryui" long-name="Agn Entry UI" origin-model="Foundation">
+     <component name="agnentryui" long-name="Agn Entry UI" origin-model="foundation">
       <unit bldFile="app/organizer/meetingui/agnentryui/group"/>
      </component>
-     <component name="meetingrequestutils" long-name="Meeting Request Utils" origin-model="Foundation">
+     <component name="meetingrequestutils" long-name="Meeting Request Utils" origin-model="foundation">
       <unit bldFile="app/organizer/meetingui/meetingrequestutils/group"/>
      </component>
-     <component name="meetingrequestviewers" long-name="Meeting Request Viewers" origin-model="Foundation">
+     <component name="meetingrequestviewers" long-name="Meeting Request Viewers" origin-model="foundation">
       <unit bldFile="app/organizer/meetingui/meetingrequestviewers/group"/>
      </component>
-     <component unofficial="yes" name="meetingui_build" long-name="Meeting UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="meetingui_build" long-name="Meeting UI Build" origin-model="foundation">
       <unit bldFile="app/organizer/meetingui/group"/>
      </component>
     </collection>
     <collection name="notepad" long-name="Notepad" level="ui">
-     <component name="notepad_help" long-name="Help" origin-model="Foundation">
+     <component name="notepad_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/organizer/notepad/help/group"/>
      </component>
-     <component name="notepad1" long-name="Notepad1" origin-model="Foundation">
+     <component name="notepad1" long-name="Notepad1" origin-model="foundation">
       <unit bldFile="app/organizer/notepad/notepad1/group"/>
       <!-- <unit bldFile="app/organizer/notepad/notepad1/syncmladapter/group"/> -->
      </component>
-     <component name="txtrecog" long-name="Txt Recog" origin-model="Foundation">
+     <component name="txtrecog" long-name="Txt Recog" origin-model="foundation">
       <unit bldFile="app/organizer/notepad/txtrecog/group"/>
      </component>
-     <component unofficial="yes" name="notepad_build" long-name="Notepad Build" origin-model="Foundation">
+     <component unofficial="yes" name="notepad_build" long-name="Notepad Build" origin-model="foundation">
       <unit bldFile="app/organizer/notepad/group"/>
      </component>
     </collection>
     <collection name="searchui" long-name="Search UI" level="ui">
-     <component name="searchui_help" long-name="Help" origin-model="Foundation">
+     <component name="searchui_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/organizer/searchui/help/group"/>
      </component>
-     <component name="searchapp" long-name="Search App" origin-model="Foundation">
+     <component name="searchapp" long-name="Search App" origin-model="foundation">
       <unit bldFile="app/organizer/searchui/searchapp/group"/>
       <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
       <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
      </component>
-     <component unofficial="yes" name="searchui_build" long-name="Search UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="searchui_build" long-name="Search UI Build" origin-model="foundation">
       <unit bldFile="app/organizer/searchui/group"/>
      </component>
     </collection>
     <collection name="calendarengines" long-name="Calendar Engines" level="engine">
-     <component name="versit2" long-name="Versit 2" origin-model="Foundation">
+     <component name="versit2" long-name="Versit 2" origin-model="foundation">
       <unit bldFile="app/organizer/calendarengines/versit2/group"/>
      </component>
-     <component name="agnversit2" long-name="Agenda Versit2" origin-model="Foundation">
+     <component name="agnversit2" long-name="Agenda Versit2" origin-model="foundation">
       <unit bldFile="app/organizer/calendarengines/agnversit2/group"/>
      </component>
-     <component name="caleninterimutils" long-name="Calen Interim Utils" origin-model="Foundation">
+     <component name="caleninterimutils" long-name="Calen Interim Utils" origin-model="foundation">
       <unit bldFile="app/organizer/calendarengines/caleninterimutils/group"/>
      </component>
-     <component name="calenimp" long-name="Calen Imp" origin-model="Foundation">
+     <component name="calenimp" long-name="Calen Imp" origin-model="foundation">
       <unit bldFile="app/organizer/calendarengines/calenimp/group"/>
      </component>
-     <component name="calenlauncher" long-name="Calen Launcher" origin-model="Foundation">
+     <component name="calenlauncher" long-name="Calen Launcher" origin-model="foundation">
       <unit bldFile="app/organizer/calendarengines/calenlauncher/group"/>
      </component>
-     <component unofficial="yes" name="calendarengines_build" long-name="Calendar Engines Build" origin-model="Foundation">
+     <component unofficial="yes" name="calendarengines_build" long-name="Calendar Engines Build" origin-model="foundation">
       <unit bldFile="app/organizer/calendarengines/group"/>
      </component>
     </collection>
     <collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-     <component name="mrmailbox" long-name="MR Mailbox" origin-model="Foundation">
+     <component name="mrmailbox" long-name="MR Mailbox" origin-model="foundation">
       <unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
      </component>
-     <component name="mrmailboxutils" long-name="MR Mailbox Utils" origin-model="Foundation">
+     <component name="mrmailboxutils" long-name="MR Mailbox Utils" origin-model="foundation">
       <unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
      </component>
     </collection>
     <collection name="alarmengines" long-name="Alarm Engines" level="engine">
-     <component name="missedalarmstore" long-name="Missed Alarm Store" origin-model="Foundation">
+     <component name="missedalarmstore" long-name="Missed Alarm Store" origin-model="foundation">
       <unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
      </component>
-     <component unofficial="yes" name="alarmengines_build" long-name="Alarm Engines Build" origin-model="Foundation">
+     <component unofficial="yes" name="alarmengines_build" long-name="Alarm Engines Build" origin-model="foundation">
       <unit bldFile="app/organizer/alarmengines/group"/>
      </component>
     </collection>
     <collection name="searchfw" long-name="Search Framework" level="services">
-     <component name="coresearchfw" long-name="Core Search Framework" origin-model="Foundation">
+     <component name="coresearchfw" long-name="Core Search Framework" origin-model="foundation">
       <unit bldFile="app/organizer/searchfw/coresearchfw/group"/>
      </component>
-     <component name="searchfw_plugins" long-name="Plugins" origin-model="Foundation">
+     <component name="searchfw_plugins" long-name="Plugins" origin-model="foundation">
       <unit bldFile="app/organizer/searchfw/plugins/group"/>
      </component>
-     <component unofficial="yes" name="searchfw_build" long-name="Search Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="searchfw_build" long-name="Search Framework Build" origin-model="foundation">
       <unit bldFile="app/organizer/searchfw/group"/>
      </component>
     </collection>
-    <collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="ui">
-     <component unofficial="yes" name="notepad_library_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_pub/notepad_library_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="calendar_interim_utils2_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-     </component>
-    </collection>
     <collection name="pimappservices" long-name="PIM App Services" level="services">
      <component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
@@ -11123,105 +8131,51 @@
      </component>
     </collection>
     <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
-     <component unofficial="yes" name="organizer_build" long-name="Organizer Application Suite Build" origin-model="Foundation">
+     <component unofficial="yes" name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
+      <unit bldFile="app/organizer/organizer_pub/group"/>
+      <!-- <unit bldFile="app/organizer/organizer_pub/notepad_library_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="organizer_build" long-name="Organizer Application Suite Build" origin-model="foundation">
       <unit bldFile="app/organizer/group"/>
      </component>
+     <component unofficial="yes" name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
+      <unit bldFile="app/organizer/organizer_plat/group"/>
+      <!-- <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
+     </component>
     <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
      </component>
     </collection>
-    <collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="ui">
-     <component unofficial="yes" name="calendar_importer_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_ui_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_const_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_ui_external_control_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_custamization_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-     </component>
-     <component unofficial="yes" name="searchui_launcher_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_exporter_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="meeting_request_utillities_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_alarm_editor_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="meeting_request_viewer_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-     </component>
-     <component unofficial="yes" name="searchfw_launcher_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="agenda_versit_2_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="meeting_request_mailbox_utilities_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_common_utils_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="meeting_request_uids_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-     </component>
-     <component unofficial="yes" name="agenda_entry_ui_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="clock_settings_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_launcher_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_settings_keys_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_tones_settings_keys_api" origin-model="Foundation">
-      <unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="messaging" long-name="Messaging Apps" tech_domain="pr" level="apps" span="2" levels="mail eng base ui">
     <collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-     <component name="audiomsg" long-name="Audio Message" origin-model="Foundation">
+     <component name="audiomsg" long-name="Audio Message" origin-model="foundation">
       <unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
      </component>
-     <component name="msgmedia" long-name="Message Media" origin-model="Foundation">
+     <component name="msgmedia" long-name="Message Media" origin-model="foundation">
       <unit bldFile="app/messaging/mobilemessaging/msgmedia/group"/>
      </component>
-     <component name="unieditor" long-name="Uni Editor" origin-model="Foundation">
+     <component name="unieditor" long-name="Uni Editor" origin-model="foundation">
       <unit bldFile="app/messaging/mobilemessaging/unieditor/group"/>
      </component>
-     <component name="mmsui" long-name="MMS UI" origin-model="Foundation">
+     <component name="mmsui" long-name="MMS UI" origin-model="foundation">
       <unit bldFile="app/messaging/mobilemessaging/mmsui/group"/>
      </component>
-     <component name="postcard" long-name="Postcard" origin-model="Foundation">
+     <component name="postcard" long-name="Postcard" origin-model="foundation">
       <unit bldFile="app/messaging/mobilemessaging/postcard/group"/>
      </component>
-     <component name="smilui" long-name="SMIL UI" origin-model="Foundation">
+     <component name="smilui" long-name="SMIL UI" origin-model="foundation">
       <unit bldFile="app/messaging/mobilemessaging/smilui/group"/>
      </component>
-     <component name="smum" long-name="Smum" origin-model="Foundation">
+     <component name="smum" long-name="Smum" origin-model="foundation">
       <unit bldFile="app/messaging/mobilemessaging/smum/group"/>
      </component>
-     <component name="smsui" long-name="SMS UI" origin-model="Foundation">
+     <component name="smsui" long-name="SMS UI" origin-model="foundation">
       <unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
       <!-- <unit bldFile="app/messaging/mobilemessaging/smsui/viewer"/> -->
      </component>
@@ -11235,47 +8189,47 @@
      </component>
     </collection>
     <collection name="mmsengine" long-name="MMS Engine" level="eng">
-     <component name="mmsconninit" long-name="MMS Connection Init" origin-model="Foundation">
+     <component name="mmsconninit" long-name="MMS Connection Init" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmsconninit/bld"/> -->
      </component>
-     <component name="genutils" long-name="General Utils" origin-model="Foundation">
+     <component name="genutils" long-name="General Utils" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/genutils/bld"/> -->
      </component>
-     <component name="mmsserversettings" long-name="MMS Server Aettings" origin-model="Foundation">
+     <component name="mmsserversettings" long-name="MMS Server Aettings" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmsserversettings/bld"/> -->
      </component>
-     <component name="mmsmessage" long-name="MMS Message" origin-model="Foundation">
+     <component name="mmsmessage" long-name="MMS Message" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmsmessage/bld"/> -->
      </component>
-     <component name="mmshttptransport" long-name="MMS HTTP Transport" origin-model="Foundation">
+     <component name="mmshttptransport" long-name="MMS HTTP Transport" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmshttptransport/bld"/> -->
      </component>
-     <component name="mmscodec" long-name="MMS Codec" origin-model="Foundation">
+     <component name="mmscodec" long-name="MMS Codec" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmscodec/bld"/> -->
      </component>
-     <component name="mmsserver" long-name="MMS Server" origin-model="Foundation">
+     <component name="mmsserver" long-name="MMS Server" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmsserver/bld"/> -->
      </component>
-     <component name="clientmtm" long-name="Client MTM" origin-model="Foundation">
+     <component name="clientmtm" long-name="Client MTM" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/clientmtm/bld"/> -->
      </component>
-     <component name="mmswatcher" long-name="MMS Watcher" origin-model="Foundation">
+     <component name="mmswatcher" long-name="MMS Watcher" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmswatcher/bld"/> -->
      </component>
-     <component name="mmspushhandler" long-name="MMS Push Handler" origin-model="Foundation">
+     <component name="mmspushhandler" long-name="MMS Push Handler" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmspushhandler/bld"/> -->
      </component>
-     <component name="applicationadapter" long-name="Application Adapter" origin-model="Foundation">
+     <component name="applicationadapter" long-name="Application Adapter" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/applicationadapter/bld"/> -->
      </component>
-     <component name="mmscodecclient" long-name="MMS Codec Client" origin-model="Foundation">
+     <component name="mmscodecclient" long-name="MMS Codec Client" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/mmsengine/mmscodecclient/bld"/> -->
      </component>
      <!--Component manually removed and merged to OS-->
      <!--<component name="mmssettings">
        <unit bldFile="app/messaging/mmsengine/mmssettings/test/group"/>
      </component>-->
-     <component unofficial="yes" name="mmsengine_build" long-name="MMS Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="mmsengine_build" long-name="MMS Engine Build" origin-model="foundation">
       <unit bldFile="app/messaging/mmsengine/group"/>
      </component>
     <component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
@@ -11286,43 +8240,43 @@
      </component>
     </collection>
     <collection name="messagingappbase" long-name="Messaging App Base" level="base">
-     <component name="msgavkon" long-name="Messaging Avkon" origin-model="Foundation">
+     <component name="msgavkon" long-name="Messaging Avkon" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/msgavkon/group"/>
      </component>
-     <component name="mce" long-name="MCE" origin-model="Foundation">
+     <component name="mce" long-name="MCE" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/mce/group"/>
      </component>
-     <component name="mceextraitems" long-name="Mce Extra Items" origin-model="Foundation">
+     <component name="mceextraitems" long-name="Mce Extra Items" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/mceextraitems/group"/>
      </component>
-     <component name="mcesettings" long-name="MCE Settings" origin-model="Foundation">
+     <component name="mcesettings" long-name="MCE Settings" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/mcesettings/group"/>
      </component>
-     <component name="msgerrorwatcher" long-name="Msg Error Watcher" origin-model="Foundation">
+     <component name="msgerrorwatcher" long-name="Msg Error Watcher" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/msgerrorwatcher/group"/>
      </component>
-     <component name="ncnlist" long-name="NCN List" origin-model="Foundation">
+     <component name="ncnlist" long-name="NCN List" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/ncnlist/group"/>
      </component>
-     <component name="schemeplugin" long-name="Scheme Plugin" origin-model="Foundation">
+     <component name="schemeplugin" long-name="Scheme Plugin" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/schemeplugin/group"/>
      </component>
-     <component name="sendui" long-name="Send UI" origin-model="Foundation">
+     <component name="sendui" long-name="Send UI" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/messagingappbase/sendui/drmlinksender/group"/> -->
       <!-- <unit bldFile="app/messaging/messagingappbase/sendui/genericmtmplugin/group"/> -->
       <unit bldFile="app/messaging/messagingappbase/sendui/group"/>
       <!-- <unit bldFile="app/messaging/messagingappbase/sendui/meetingrequestsender/group"/> -->
      </component>
-     <component name="smilengine" long-name="SMIL Engine" origin-model="Foundation">
+     <component name="smilengine" long-name="SMIL Engine" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/smilengine/group"/>
      </component>
-     <component name="bium" long-name="Bium" origin-model="Foundation">
+     <component name="bium" long-name="Bium" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/bium/group"/>
      </component>
-     <component name="smartmessaging" long-name="Smart Messaging" origin-model="Foundation">
+     <component name="smartmessaging" long-name="Smart Messaging" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
      </component>
-     <component name="msgeditor" long-name="Messaging Editor" origin-model="Foundation">
+     <component name="msgeditor" long-name="Messaging Editor" origin-model="foundation">
       <unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
      </component>
      <!--Component manually removed and merged to OS-->
@@ -11355,19 +8309,19 @@
      </component>
     </collection>
     <collection name="email" long-name="Email" level="mail">
-     <component name="alwaysonlineemailplugin" long-name="Always Online Mail Plugin" origin-model="Foundation">
+     <component name="alwaysonlineemailplugin" long-name="Always Online Mail Plugin" origin-model="foundation">
       <unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
      </component>
-     <component name="emailnotificationhandler" long-name="Email Notification Handler" origin-model="Foundation">
+     <component name="emailnotificationhandler" long-name="Email Notification Handler" origin-model="foundation">
       <unit bldFile="app/messaging/email/emailnotificationhandler/group"/>
      </component>
-     <component name="imum" long-name="IMUM" origin-model="Foundation">
+     <component name="imum" long-name="IMUM" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/email/imum/domainapi/group"/> -->
       <unit bldFile="app/messaging/email/imum/group"/>
       <!-- <unit bldFile="app/messaging/email/imum/mtms/group"/> -->
       <!-- <unit bldFile="app/messaging/email/imum/utils/group"/> -->
      </component>
-     <component name="mail" long-name="Mail" origin-model="Foundation">
+     <component name="mail" long-name="Mail" origin-model="foundation">
       <unit bldFile="app/messaging/email/mail/group"/>
      </component>
      <!--Component manually removed and merged to OS-->
@@ -11402,93 +8356,32 @@
      </component>
     </collection>
     <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-     <component unofficial="yes" name="mms_client_mtm_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="email_domain_utilities_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build" origin-model="Foundation">
-      <unit bldFile="app/messaging/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test" origin-model="Foundation">
+     <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test" origin-model="foundation">
       <!-- <unit bldFile="app/messaging/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="messaging_media_resolver_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_center_ui_utilities_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_message_notification_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_status_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_new_message_notification_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_mail_mtm_ui_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_engine_settings_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_integration_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_application_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="plugin_bio_control_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
+     <component unofficial="yes" name="msg_plat" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
+      <unit bldFile="app/messaging/msg_plat/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_editor_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_application_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_conformance_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/tsrc/group"/>
+      <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
+      <unit bldFile="app/messaging/msg_plat/smil_engine_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="msg_pub" class="api" origin-model="foundation">
+      <unit bldFile="app/messaging/msg_pub/group"/>
+      <!-- <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
+      <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/group"/>
       <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mms_server_settings_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_meeting_request_api" origin-model="Foundation">
-      <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
-      <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-     </component>
-     <component unofficial="yes" name="mail_ui_constants_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contact_notes_extended_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="unified_editor_video_conversion_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_secondary_display_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_editor_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_player_launch_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_codec_client_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_engine_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_transition_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_conformance_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_variables_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_editor_constants_api" origin-model="Foundation">
-      <unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
+      <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build" origin-model="foundation">
+      <unit bldFile="app/messaging/group"/>
      </component>
     <component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
@@ -11497,451 +8390,431 @@
    </block>
    <block name="commonemail" long-name="Email Apps" tech_domain="pr" level="apps" levels="service support ui app">
     <collection name="emailservices" long-name="Email Services" level="service">
-     <component name="emailframework" long-name="Email framework" origin-model="Foundation">
+     <component name="emailframework" long-name="Email framework" origin-model="foundation">
       <unit bldFile="app/commonemail/emailservices/emailframework/group"/>
      </component>
-     <component name="emailserver" long-name="Email Server" origin-model="Foundation">
+     <component name="emailserver" long-name="Email Server" origin-model="foundation">
       <unit bldFile="app/commonemail/emailservices/emailserver/group"/>
      </component>
-     <component name="psmruadapter" long-name="PSMRU Adapter" origin-model="Foundation">
+     <component name="psmruadapter" long-name="PSMRU Adapter" origin-model="foundation">
       <unit bldFile="app/commonemail/emailservices/psmruadapter/group"/>
      </component>
-     <component name="emailstore" long-name="Email Store" origin-model="Foundation">
+     <component name="emailstore" long-name="Email Store" origin-model="foundation">
       <unit bldFile="app/commonemail/emailservices/emailstore/group"/>
      </component>
-     <component name="emaildebug" long-name="Email Debug" origin-model="Foundation">
+     <component name="emaildebug" long-name="Email Debug" origin-model="foundation">
       <unit bldFile="app/commonemail/emailservices/emaildebug/group"/>
      </component>
-     <component unofficial="yes" name="emailservices_build" long-name="Email Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="emailservices_build" long-name="Email Services Build" origin-model="foundation">
       <unit bldFile="app/commonemail/emailservices/group"/>
      </component>
     </collection>
     <collection name="ipsservices" long-name="IPS Services" level="service">
-     <component name="ipssossettings" long-name="IPSSOS Settings" origin-model="Foundation">
+     <component name="ipssossettings" long-name="IPSSOS Settings" origin-model="foundation">
       <unit bldFile="app/commonemail/ipsservices/ipssossettings/group"/>
      </component>
-     <component name="ipssosplugin" long-name="IPSSOS Plugin" origin-model="Foundation">
+     <component name="ipssosplugin" long-name="IPSSOS Plugin" origin-model="foundation">
       <unit bldFile="app/commonemail/ipsservices/ipssosplugin/group"/>
      </component>
-     <component name="ipssosaoplugin" long-name="IPSSOS AO Plugin" origin-model="Foundation">
+     <component name="ipssosaoplugin" long-name="IPSSOS AO Plugin" origin-model="foundation">
       <unit bldFile="app/commonemail/ipsservices/ipssosaoplugin/group"/>
      </component>
-     <component unofficial="yes" name="ipsservices_build" long-name="IPS Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="ipsservices_build" long-name="IPS Services Build" origin-model="foundation">
       <unit bldFile="app/commonemail/ipsservices/group"/>
      </component>
     </collection>
     <collection name="emailcontacts" long-name="Email Contacts" level="support">
-     <component name="contactactionservice" long-name="Contact Action Service" origin-model="Foundation">
+     <component name="contactactionservice" long-name="Contact Action Service" origin-model="foundation">
       <unit bldFile="app/commonemail/emailcontacts/contactactionservice/group"/>
      </component>
-     <component name="contactactionmenu" long-name="Contact Action Menu" origin-model="Foundation">
+     <component name="contactactionmenu" long-name="Contact Action Menu" origin-model="foundation">
       <unit bldFile="app/commonemail/emailcontacts/contactactionmenu/group"/>
      </component>
-     <component name="remotecontactlookup" long-name="Remote Contact Lookup" origin-model="Foundation">
+     <component name="remotecontactlookup" long-name="Remote Contact Lookup" origin-model="foundation">
       <unit bldFile="app/commonemail/emailcontacts/remotecontactlookup/group"/>
      </component>
-     <component unofficial="yes" name="emailcontacts_build" long-name="Email Contacts Build" origin-model="Foundation">
+     <component unofficial="yes" name="emailcontacts_build" long-name="Email Contacts Build" origin-model="foundation">
       <unit bldFile="app/commonemail/emailcontacts/group"/>
      </component>
     </collection>
     <collection name="meetingrequest" long-name="Meeting Request" level="ui">
-     <component name="mrcommon" long-name="MR Common" origin-model="Foundation">
+     <component name="mrcommon" long-name="MR Common" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrcommon/group"/>
      </component>
-     <component name="mrdb" long-name="MR Database" origin-model="Foundation">
+     <component name="mrdb" long-name="MR Database" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrdb/group"/>
      </component>
-     <component name="mrpolicy" long-name="MR Policy" origin-model="Foundation">
+     <component name="mrpolicy" long-name="MR Policy" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrpolicy/group"/>
      </component>
-     <component name="mrservices" long-name="MR Services" origin-model="Foundation">
+     <component name="mrservices" long-name="MR Services" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrservices/group"/>
      </component>
-     <component name="mrgui" long-name="MR GUI" origin-model="Foundation">
+     <component name="mrgui" long-name="MR GUI" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrgui/group"/>
      </component>
-     <component name="mrentry" long-name="MR Entry" origin-model="Foundation">
+     <component name="mrentry" long-name="MR Entry" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrentry/group"/>
      </component>
-     <component name="mrtasks" long-name="MR Tasks" origin-model="Foundation">
+     <component name="mrtasks" long-name="MR Tasks" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrtasks/group"/>
      </component>
-     <component name="mrutils" long-name="MR Utils" origin-model="Foundation">
+     <component name="mrutils" long-name="MR Utils" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrutils/group"/>
      </component>
-     <component name="mrutilscalplugin" long-name="MR Utils Cal Plugin" origin-model="Foundation">
+     <component name="mrutilscalplugin" long-name="MR Utils Cal Plugin" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrutilscalplugin/group"/>
      </component>
-     <component name="mrviewer" long-name="MR Viewer" origin-model="Foundation">
+     <component name="mrviewer" long-name="MR Viewer" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrviewer/group"/>
      </component>
-     <component name="mrviewercalplugin" long-name="MR Viewer Cal Plugin" origin-model="Foundation">
+     <component name="mrviewercalplugin" long-name="MR Viewer Cal Plugin" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrviewercalplugin/group"/>
      </component>
-     <component name="mricalviewer" long-name="MR iCal Viewer" origin-model="Foundation">
+     <component name="mricalviewer" long-name="MR iCal Viewer" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mricalviewer/group"/>
      </component>
-     <component name="mrversit2" long-name="MR Versit2" origin-model="Foundation">
+     <component name="mrversit2" long-name="MR Versit2" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrversit2/group"/>
      </component>
-     <component name="mragnversit2" long-name="MR Agenda Versit2" origin-model="Foundation">
+     <component name="mragnversit2" long-name="MR Agenda Versit2" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mragnversit2/group"/>
      </component>
-     <component name="mrcasplugin" long-name="MR CAS Plugin" origin-model="Foundation">
+     <component name="mrcasplugin" long-name="MR CAS Plugin" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrcasplugin/group"/>
      </component>
-     <component name="mrurlparserplugin" long-name="MR URLParser Plugin" origin-model="Foundation">
+     <component name="mrurlparserplugin" long-name="MR URLParser Plugin" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
      </component>
-     <component unofficial="yes" name="meetingrequest_build" long-name="Meeting Request Build" origin-model="Foundation">
+     <component unofficial="yes" name="meetingrequest_build" long-name="Meeting Request Build" origin-model="foundation">
       <unit bldFile="app/commonemail/meetingrequest/group"/>
      </component>
     </collection>
     <collection name="emailuis" long-name="Email UIs" level="app">
-     <component name="emailui" long-name="Email UI" origin-model="Foundation">
+     <component name="emailui" long-name="Email UI" origin-model="foundation">
       <unit bldFile="app/commonemail/emailuis/emailui/group"/>
      </component>
-     <component name="gsemailsettings" long-name="GSEmail Settings" origin-model="Foundation">
+     <component name="gsemailsettings" long-name="GSEmail Settings" origin-model="foundation">
       <unit bldFile="app/commonemail/emailuis/gsemailsettings/group"/>
      </component>
-     <component name="uicomponents" long-name="UI Components" origin-model="Foundation">
+     <component name="uicomponents" long-name="UI Components" origin-model="foundation">
       <unit bldFile="app/commonemail/emailuis/uicomponents/group"/>
      </component>
-     <component name="widget" long-name="Widget" origin-model="Foundation">
+     <component name="widget" long-name="Widget" origin-model="foundation">
       <unit bldFile="app/commonemail/emailuis/widget/group"/>
      </component>
-     <component unofficial="yes" name="emailuis_build" long-name="Email UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="emailuis_build" long-name="Email UIs Build" origin-model="foundation">
       <unit bldFile="app/commonemail/emailuis/group"/>
      </component>
     </collection>
     <collection name="emailhelp" long-name="Email Help" level="support">
-     <component name="emailhelp compo" origin-model="Foundation">
+     <component name="emailhelp_build" origin-model="foundation">
       <!-- <unit bldFile="app/commonemail/emailhelp/group"/> -->
      </component>
     </collection>
     <collection name="legacy" long-name="Legacy Email" level="support">
-     <component name="iad_rofs" long-name="IAD ROFS" origin-model="Foundation"/>
-     <component name="ls_pt_hack" long-name="ls pt hack" origin-model="Foundation"/>
-     <component name="settingwizard" long-name="Setting Wizard" origin-model="Foundation"/>
-     <component name="starter" long-name="Starter" origin-model="Foundation"/>
+     <component name="iad_rofs" long-name="IAD ROFS" origin-model="foundation"/>
+     <component name="ls_pt_hack" long-name="ls pt hack" origin-model="foundation"/>
+     <component name="settingwizard" long-name="Setting Wizard" origin-model="foundation"/>
+     <!-- Empty duplicate component starter removed -->
     </collection>
     <collection name="commonemail_help" long-name="Email Help" level="support">
-     <component name="help compo" origin-model="Foundation"/>
+     <component name="help" origin-model="foundation"/>
     </collection>
     <collection name="commonemail_info" long-name="Email Apps Info" level="app">
-     <component unofficial="yes" name="commonemail_build" long-name="Email Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="email_plat" class="api" origin-model="foundation">
+      <unit bldFile="app/commonemail/email_plat/group"/>
+     </component>
+     <component unofficial="yes" name="commonemail_build" long-name="Email Apps Build" origin-model="foundation">
       <unit bldFile="app/commonemail/group"/>
      </component>
-     <component unofficial="yes" name="email_setup_plugin_api" origin-model="Foundation">
-      <unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="conversations" long-name="Conversation Apps" tech_domain="pr" level="apps" levels="settings utils ui">
     <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-     <component name="vimpstsettings.dll=binary" origin-model="Foundation">
+     <component name="vimpstsettings" origin-model="foundation">
       <unit bldFile="app/conversations/uiservicetabsettings/group"/>
      </component>
     </collection>
     <collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-     <component name="imstutils_help" long-name="Help" origin-model="Foundation">
+     <component name="imstutils_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/conversations/imstutils/help/group"/>
      </component>
-     <component name="imconnectionprovider" long-name="IM Connection Provider" origin-model="Foundation">
+     <component name="imconnectionprovider" long-name="IM Connection Provider" origin-model="foundation">
       <unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
       <!-- <unit bldFile="app/conversations/imstutils/imconnectionprovider/tsrc/imconnectionprovider_test/group"/> -->
      </component>
-     <component name="xmppadapter" long-name="XMPP Adapter" origin-model="Foundation">
+     <component name="xmppadapter" long-name="XMPP Adapter" origin-model="foundation">
       <unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
       <!-- <unit bldFile="app/conversations/imstutils/xmppadapter/tsrc/xmppadapter_test/group"/> -->
      </component>
-     <component name="imconversationview" long-name="IM Conversation View" origin-model="Foundation">
+     <component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
       <unit bldFile="app/conversations/imstutils/imconversationview/group"/>
       <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
       <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
      </component>
-     <component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="Foundation">
+     <component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="foundation">
       <unit bldFile="app/conversations/imstutils/group"/>
      </component>
     </collection>
     <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-     <component name="vimpstutils" long-name="VIMP ST Utilities" origin-model="Foundation">
+     <component name="vimpstutils" long-name="VIMP ST Utilities" origin-model="foundation">
       <unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
      </component>
-     <component name="vimpststorage" long-name="VIMP ST Storage" origin-model="Foundation">
+     <component name="vimpststorage" long-name="VIMP ST Storage" origin-model="foundation">
       <unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
       <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactlist_ut/group"/> -->
       <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group"/> -->
       <!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group"/> -->
      </component>
-     <component name="vimpstengine" long-name="VIMP ST Engine" origin-model="Foundation">
+     <component name="vimpstengine" long-name="VIMP ST Engine" origin-model="foundation">
       <unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
       <!-- <unit bldFile="app/conversations/uiservicetab/vimpstengine/tsrc/group"/> -->
      </component>
-     <component name="vimpstcmdprocess" long-name="VIMP ST Command Process" origin-model="Foundation">
+     <component name="vimpstcmdprocess" long-name="VIMP ST Command Process" origin-model="foundation">
       <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/group"/>
       <!-- <unit bldFile="app/conversations/uiservicetab/vimpstcmdprocess/tsrc/group"/> -->
      </component>
-     <component name="vimpstui" long-name="VIMP ST UI" origin-model="Foundation">
+     <component name="vimpstui" long-name="VIMP ST UI" origin-model="foundation">
       <unit bldFile="app/conversations/uiservicetab/vimpstui/group"/>
      </component>
-     <component name="vimpstdetailsviewplugin" long-name="VIMP ST Details View Plugin" origin-model="Foundation">
+     <component name="vimpstdetailsviewplugin" long-name="VIMP ST Details View Plugin" origin-model="foundation">
       <unit bldFile="app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
      </component>
-     <component unofficial="yes" name="uiservicetab_build" long-name="UI Service Tab Build" origin-model="Foundation">
+     <component unofficial="yes" name="uiservicetab_build" long-name="UI Service Tab Build" origin-model="foundation">
       <unit bldFile="app/conversations/uiservicetab/group"/>
      </component>
     </collection>
     <collection name="servicewidget" long-name="Service Widget" level="ui">
-     <component name="servicewidgetactionhandler" long-name="Service Widget Action Handler" origin-model="Foundation">
+     <component name="servicewidgetactionhandler" long-name="Service Widget Action Handler" origin-model="foundation">
       <unit bldFile="app/conversations/servicewidget/servicewidgetactionhandler/group"/>
      </component>
-     <component name="servicewidgetdatapublisher" long-name="Service Widget Data Publisher" origin-model="Foundation">
+     <component name="servicewidgetdatapublisher" long-name="Service Widget Data Publisher" origin-model="foundation">
       <unit bldFile="app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
      </component>
-     <component name="themes" long-name="Themes" origin-model="Foundation">
+     <component name="themes" long-name="Themes" origin-model="foundation">
       <unit bldFile="app/conversations/servicewidget/themes/install-themes/install/servicewidget/group"/>
      </component>
-     <component unofficial="yes" name="servicewidget_build" long-name="Service Widget Build" origin-model="Foundation">
+     <component unofficial="yes" name="servicewidget_build" long-name="Service Widget Build" origin-model="foundation">
       <unit bldFile="app/conversations/servicewidget/group"/>
      </component>
     </collection>
     <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-     <component unofficial="yes" name="conversations_build" long-name="Conversation Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="conversations_plat" long-name="Conversation Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/conversations/conversations_plat/group"/>
+     </component>
+     <component unofficial="yes" name="conversations_build" long-name="Conversation Apps Build" origin-model="foundation">
       <unit bldFile="app/conversations/group"/>
      </component>
     </collection>
-    <collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="im_cv_launcher_api" origin-model="Foundation">
-      <unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="conversations_plat_build" long-name="Conversation Apps Platform API Build" origin-model="Foundation">
-      <unit bldFile="app/conversations/conversations_plat/group"/>
-     </component>
-     <component unofficial="yes" name="im_connection_api" origin-model="Foundation">
-      <unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="im" long-name="Instant Messaging Apps" tech_domain="pr" level="apps" levels="support engine apps">
     <collection name="impsengine" long-name="IMPS Engine" level="engine">
-     <component name="impsengine_utils" long-name="Utilities" origin-model="Foundation">
+     <component name="impsengine_utils" long-name="Utilities" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/utils/group"/> -->
      </component>
-     <component name="datautils" long-name="Data Utils" origin-model="Foundation">
+     <component name="datautils" long-name="Data Utils" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/datautils/group"/> -->
      </component>
-     <component name="impsengine_client" long-name="Client" origin-model="Foundation">
+     <component name="impsengine_client" long-name="Client" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/client/group"/> -->
      </component>
-     <component name="imapi" long-name="IM API" origin-model="Foundation">
+     <component name="imapi" long-name="IM API" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/imapi/group"/> -->
      </component>
-     <component name="imlauncher" long-name="IM Launcher" origin-model="Foundation">
+     <component name="imlauncher" long-name="IM Launcher" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/imlauncher/group"/> -->
      </component>
-     <component name="ImpsDataChannel" long-name="Imps Data Channel" origin-model="Foundation">
+     <component name="impsdatachannel" long-name="Imps Data Channel" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/impsdatachannel/group"/> -->
      </component>
-     <component name="ImpsIpCirWatcher" long-name="Imps Ip Cir Watcher" origin-model="Foundation">
+     <component name="impsipcirwatcher" long-name="Imps Ip Cir Watcher" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/impsipcirwatcher/group"/> -->
      </component>
-     <component name="messageencoder" long-name="Message Encoder" origin-model="Foundation">
+     <component name="messageencoder" long-name="Message Encoder" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/messageencoder/wbxml/group"/> -->
      </component>
-     <component name="engsrv" long-name="Eng Srv" origin-model="Foundation">
+     <component name="engsrv" long-name="Eng Srv" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/engsrv/group"/> -->
      </component>
-     <component name="impswatcher" long-name="Imps Watcher" origin-model="Foundation">
+     <component name="impswatcher" long-name="Imps Watcher" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/impswatcher/group"/> -->
      </component>
-     <component name="wvotaparser" long-name="WV OTA Parser" origin-model="Foundation">
+     <component name="wvotaparser" long-name="WV OTA Parser" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/wvotaparser/group"/> -->
      </component>
-     <component unofficial="yes" name="impsengine_test" long-name="IMPS Engine Test" origin-model="Foundation">
+     <component unofficial="yes" name="impsengine_test" long-name="IMPS Engine Test" origin-model="foundation">
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertimerprocess/group"/> -->
+      <!-- <unit bldFile="app/im/impsengine/tsrc/public/advance/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertest/group"/> -->
-      <!-- <unit bldFile="app/im/impsengine/tsrc/public/advance/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertestplugin/group"/> -->
      </component>
-     <component unofficial="yes" name="impsengine_build" long-name="IMPS Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="impsengine_build" long-name="IMPS Engine Build" origin-model="foundation">
       <unit bldFile="app/im/impsengine/group"/>
      </component>
     </collection>
     <collection name="pecengine" long-name="Presence Engine" level="engine">
-     <component name="CoreUtilsLib2" long-name="Core Utils Lib 2" origin-model="Foundation">
+     <component name="coreutilslib2" long-name="Core Utils Lib 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/coreutilslib2/group"/> -->
      </component>
-     <component name="StorageManager2" long-name="Storage Manager 2" origin-model="Foundation">
+     <component name="storagemanager2" long-name="Storage Manager 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/storagemanager2/group"/> -->
      </component>
-     <component name="Parser2" origin-model="Foundation">
+     <component name="pecparser2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/parser2/group"/> -->
      </component>
-     <component name="AttributeLibrary2" long-name="Attribute Library 2" origin-model="Foundation">
+     <component name="attributelibrary2" long-name="Attribute Library 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/attributelibrary2/group"/> -->
      </component>
-     <component name="ListLibrary2" long-name="List Library 2" origin-model="Foundation">
+     <component name="listlibrary2" long-name="List Library 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/listlibrary2/group"/> -->
      </component>
-     <component name="TransferAdapter2" long-name="Transfer Adapter 2" origin-model="Foundation">
+     <component name="transferadapter2" long-name="Transfer Adapter 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/transferadapter2/group"/> -->
      </component>
-     <component name="PresenceServer2" long-name="Presence Server 2" origin-model="Foundation">
+     <component name="presenceserver2" long-name="Presence Server 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/presenceserver2/group"/> -->
      </component>
-     <component name="PresenceManager2" long-name="Presence Manager 2" origin-model="Foundation">
+     <component name="presencemanager2" long-name="Presence Manager 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/presencemanager2/group"/> -->
      </component>
-     <component name="JanitorPlugin2" long-name="Janitor Plugin 2" origin-model="Foundation">
+     <component name="janitorplugin2" long-name="Janitor Plugin 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/janitorplugin2/group"/> -->
      </component>
-     <component name="PluginServer2" long-name="Plugin Server 2" origin-model="Foundation">
+     <component name="pluginserver2" long-name="Plugin Server 2" origin-model="foundation">
       <!-- <unit bldFile="app/im/pecengine/pluginserver2/group"/> -->
      </component>
-     <component unofficial="yes" name="pecengine_build" long-name="Presence Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="pecengine_build" long-name="Presence Engine Build" origin-model="foundation">
       <unit bldFile="app/im/pecengine/group"/>
      </component>
     </collection>
     <collection name="presadap12" long-name="Presence Adap 12" level="support">
-     <component name="Parser2" origin-model="Foundation">
+     <component name="presparser2" origin-model="foundation">
       <!-- <unit bldFile="app/im/presadap12/parser2/group"/> -->
      </component>
-     <component name="impsplugin" long-name="IMPS Plugin" origin-model="Foundation">
+     <component name="impsplugin" long-name="IMPS Plugin" origin-model="foundation">
       <!-- <unit bldFile="app/im/presadap12/impsplugin/group"/> -->
      </component>
-     <component unofficial="yes" name="presadap12_build" long-name="Presence Adap 12 Build" origin-model="Foundation">
+     <component unofficial="yes" name="presadap12_build" long-name="Presence Adap 12 Build" origin-model="foundation">
       <!-- <unit bldFile="app/im/presadap12/group"/> -->
      </component>
     </collection>
     <collection name="wvsettings20" long-name="WV Settings 20" level="support">
-     <component name="WVSAPSettingsStore.dll=binary" origin-model="Foundation">
+     <component name="wvsapsettingsstore" origin-model="foundation">
       <unit bldFile="app/im/wvsettings20/group"/>
      </component>
     </collection>
     <collection name="wvuing" long-name="WV UI NG" level="apps">
-     <component name="imindicatorplugin" long-name="IM Indicator Plugin" origin-model="Foundation">
+     <component name="imindicatorplugin" long-name="IM Indicator Plugin" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/imindicatorplugin/group"/> -->
      </component>
-     <component name="IMPSConnectionUI" long-name="IMPS Connection UI" origin-model="Foundation">
+     <component name="impsconnectionui" long-name="IMPS Connection UI" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/impsconnectionui/group"/> -->
      </component>
-     <component name="IMPSServiceSettingsUI" long-name="IMPS Service Settings UI" origin-model="Foundation">
+     <component name="impsservicesettingsui" long-name="IMPS Service Settings UI" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/impsservicesettingsui/group"/> -->
      </component>
-     <component name="IMPSAlwaysOnlinePlugin" long-name="IMPS Always Online Plugin" origin-model="Foundation">
+     <component name="impsalwaysonlineplugin" long-name="IMPS Always Online Plugin" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/impsalwaysonlineplugin/group"/> -->
      </component>
-     <component name="wvvariant" long-name="Wvvariant" origin-model="Foundation">
+     <component name="wvvariant" long-name="Wvvariant" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvvariant/group"/> -->
      </component>
-     <component name="wvuiada" long-name="Wvuiada" origin-model="Foundation">
+     <component name="wvuiada" long-name="Wvuiada" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvuiada/group"/> -->
      </component>
-     <component name="wvuistorage" long-name="WV UI Storage" origin-model="Foundation">
+     <component name="wvuistorage" long-name="WV UI Storage" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvuistorage/group"/> -->
      </component>
-     <component name="wvuipresence" long-name="WV UI Presence" origin-model="Foundation">
+     <component name="wvuipresence" long-name="WV UI Presence" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvuipresence/group"/> -->
      </component>
-     <component name="wvlogger" long-name="Wvlogger" origin-model="Foundation">
+     <component name="wvlogger" long-name="Wvlogger" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvlogger/group"/> -->
      </component>
-     <component name="wvuieng" long-name="Wvuieng" origin-model="Foundation">
+     <component name="wvuieng" long-name="Wvuieng" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvuieng/group"/> -->
      </component>
-     <component name="ImUtils" long-name="Im Utils" origin-model="Foundation">
+     <component name="imutils" long-name="Im Utils" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/imutils/group"/> -->
      </component>
-     <component name="wvuiprocess" long-name="WV UI Process" origin-model="Foundation">
+     <component name="wvuiprocess" long-name="WV UI Process" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvuiprocess/group"/> -->
      </component>
-     <component name="wvcommandutils" long-name="Wv Command Utils" origin-model="Foundation">
+     <component name="wvcommandutils" long-name="Wv Command Utils" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvcommandutils/group"/> -->
      </component>
-     <component name="wvaudiomanager" long-name="Wv Audio Manager" origin-model="Foundation">
+     <component name="wvaudiomanager" long-name="Wv Audio Manager" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvaudiomanager/group"/> -->
      </component>
-     <component name="wvuiave" long-name="Wvuiave" origin-model="Foundation">
+     <component name="wvuiave" long-name="Wvuiave" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/wvuiave/group"/> -->
      </component>
-     <component name="ImLauncher" long-name="IM Launcher" origin-model="Foundation">
+     <component name="wvimlauncher" long-name="IM Launcher" origin-model="foundation">
       <!-- <unit bldFile="app/im/wvuing/imlauncher/group"/> -->
      </component>
-     <component unofficial="yes" name="wvuing_build" long-name="WV UI NG Build" origin-model="Foundation">
+     <component unofficial="yes" name="wvuing_build" long-name="WV UI NG Build" origin-model="foundation">
       <unit bldFile="app/im/wvuing/group"/>
      </component>
     </collection>
     <collection name="im_info" long-name="Instant Messaging Apps Info" level="apps">
-     <component unofficial="yes" name="im_test" long-name="Instant Messaging Apps Test" origin-model="Foundation">
-      <!-- <unit bldFile="app/im/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="im_build" long-name="Instant Messaging Apps Build" origin-model="Foundation">
-      <unit bldFile="app/im/group"/>
-     </component>
-     <component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help" origin-model="Foundation">
-      <unit bldFile="app/im/help/group"/>
-     </component>
-    </collection>
-    <collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="wv_sap_settings_api" origin-model="Foundation">
-      <unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-     </component>
-    </collection>
-    <collection name="im_pub" long-name="Instant Messaging Apps Public Interfaces" level="apps">
-     <component unofficial="yes" name="im_application_launch_api" origin-model="Foundation">
+     <component unofficial="yes" name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/im/im_plat/group"/>
+      <unit bldFile="app/im/im_plat/wv_sap_settings_api/tsrc"/>
+     </component>
+     <component unofficial="yes" name="im_pub" long-name="Instant Messaging Apps Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/im/im_pub/group"/>
+      <!-- <unit bldFile="app/im/im_pub/im_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertest/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertestplugin/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertimerprocess/group"/> -->
-      <unit bldFile="app/im/im_pub/im_application_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="im_api" long-name="Instant Messaging Apps API" origin-model="Foundation">
-      <!-- <unit bldFile="app/im/im_pub/im_api/tsrc/group"/> -->
-      <unit bldFile="app/im/im_pub/im_api/group"/>
+     </component>
+     <component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help" origin-model="foundation">
+      <unit bldFile="app/im/help/group"/>
      </component>
     </collection>
    </block>
    <block name="utils" long-name="Utility Apps" tech_domain="pr" level="apps" levels="app">
     <collection name="extras" long-name="Extras" level="app">
-     <component name="about" long-name="About" origin-model="Foundation">
+     <component name="about" long-name="About" origin-model="foundation">
       <unit bldFile="app/utils/extras/about/group"/>
      </component>
-     <component name="calcsoft" long-name="Calcsoft" origin-model="Foundation">
+     <component name="calcsoft" long-name="Calcsoft" origin-model="foundation">
       <unit bldFile="app/utils/extras/calcsoft/group"/>
      </component>
-     <component name="converter" long-name="Converter" origin-model="Foundation">
+     <component name="converter" long-name="Converter" origin-model="foundation">
       <unit bldFile="app/utils/extras/converter/group"/>
      </component>
-     <component unofficial="yes" name="extras_build" long-name="Extras Build" origin-model="Foundation">
+     <component unofficial="yes" name="extras_build" long-name="Extras Build" origin-model="foundation">
       <unit bldFile="app/utils/extras/group"/>
      </component>
     </collection>
     <collection name="utils_info" long-name="Utility Apps Info" level="app">
-     <component unofficial="yes" name="utils_build" long-name="Utility Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="utils_build" long-name="Utility Apps Build" origin-model="foundation">
       <unit bldFile="app/utils/group"/>
      </component>
     </collection>
    </block>
    <block name="dictionary" long-name="Dictionary" tech_domain="pr" level="services" levels="appl">
     <collection name="userdict" long-name="User Dictionary" level="appl">
-     <component unofficial="yes" name="userdict_build" long-name="User Dictionary Build" origin-model="Foundation">
+     <component name="userdict_build" long-name="UserDict Client" origin-model="foundation">
       <unit bldFile="app/dictionary/userdict/group"/>
      </component>
     </collection>
-    <collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="appl">
-     <component unofficial="yes" name="menu_suites_macros_api" origin-model="Foundation">
-      <unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+    <collection name="dictionary_info" long-name="Dictionary Info" level="appl">
+     <component unofficial="yes" name="dictionary_plat" long-name="Dictionary Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/dictionary/dictionary_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="camera" long-name="Camera Apps" tech_domain="ma" level="apps" levels="empty 1">
     <collection name="camerauis" long-name="Camera UIs" level="1">
-     <component name="activepalette" long-name="Active Palette" origin-model="Foundation">
+     <component name="activepalette" long-name="Active Palette" origin-model="foundation">
       <unit bldFile="app/camera/camerauis/activepalette/group"/>
      </component>
-     <component name="cameraapp" long-name="Camera Application" origin-model="Foundation">
+     <component name="cameraapp" long-name="Camera Application" origin-model="foundation">
       <!-- <unit bldFile="app/camera/camerauis/cameraapp/generic/camerauiconfigmanager/group"/> -->
       <!-- <unit bldFile="app/camera/camerauis/cameraapp/generic/gscamcorderplugin/group"/> -->
       <unit bldFile="app/camera/camerauis/cameraapp/group"/>
@@ -11949,39 +8822,34 @@
      </component>
     </collection>
     <collection name="camera_info" long-name="Camera Apps Info" level="1">
-     <component unofficial="yes" name="camera_build" long-name="Camera Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="camera_build" long-name="Camera Apps Build" origin-model="foundation">
       <unit bldFile="app/camera/group"/>
      </component>
-    </collection>
-    <collection name="camera_plat" long-name="Camera Apps Platform Interfaces" level="1">
-     <component unofficial="yes" name="camcorder_ui_constants_api" origin-model="Foundation">
-      <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+     <component unofficial="yes" name="camera_plat" long-name="Camera Apps Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="active_palette_2_api" origin-model="Foundation">
-      <unit bldFile="app/camera/camera_plat/active_palette_2_api/group"/>
-      <!-- <unit bldFile="app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
+      <unit bldFile="app/camera/camera_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="imgeditor" long-name="Image Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
     <collection name="imageeditor" long-name="Image Editor" level="ui">
-     <component name="PB" origin-model="Foundation">
+     <component name="pb" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditor/pb/group"/>
      </component>
-     <component name="IEPB" origin-model="Foundation">
+     <component name="iepb" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
      </component>
-     <component name="ImageEditorUI" long-name="Image Editor UI" origin-model="Foundation">
+     <component name="imageeditorui" long-name="Image Editor UI" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
      </component>
-     <component name="ImageEditorManager" long-name="Image Editor Manager" origin-model="Foundation">
+     <component name="imageeditormanager" long-name="Image Editor Manager" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
      </component>
-     <component name="imageeditorApp" long-name="Image Editor App" origin-model="Foundation">
+     <component name="imageeditorapp" long-name="Image Editor App" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
      </component>
-     <component name="imageeditor_plugins" long-name="Plugins" origin-model="Foundation">
+     <component name="imageeditor_plugins" long-name="Plugins" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
       <unit bldFile="app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
       <unit bldFile="app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
@@ -12000,15 +8868,15 @@
       <unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
       <unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
      </component>
-     <component name="EditorProvider" long-name="Editor Provider" origin-model="Foundation">
+     <component name="editorprovider" long-name="Editor Provider" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
      </component>
-     <component unofficial="yes" name="imageeditor_build" long-name="Image Editor Build" origin-model="Foundation">
+     <component unofficial="yes" name="imageeditor_build" long-name="Image Editor Build" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditor/group"/>
      </component>
     </collection>
     <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-     <component name="filters" long-name="Filters" origin-model="Foundation">
+     <component name="filters" long-name="Filters" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
@@ -12030,194 +8898,161 @@
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
      </component>
-     <component name="ImageEditorUtils" long-name="Image Editor Utils" origin-model="Foundation">
+     <component name="imageeditorutils" long-name="Image Editor Utils" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
      </component>
-     <component name="SystemParameters" long-name="System Parameters" origin-model="Foundation">
+     <component name="systemparameters" long-name="System Parameters" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
      </component>
-     <component name="EngineWrapper" long-name="Engine Wrapper" origin-model="Foundation">
+     <component name="enginewrapper" long-name="Engine Wrapper" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
      </component>
-     <component name="JpegRotator" long-name="Jpeg Rotator" origin-model="Foundation">
+     <component name="jpegrotator" long-name="Jpeg Rotator" origin-model="foundation">
       <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegrotator/group"/> -->
      </component>
-     <component name="JpegScaler" long-name="Jpeg Scaler" origin-model="Foundation">
+     <component name="jpegscaler" long-name="Jpeg Scaler" origin-model="foundation">
       <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegscaler/group"/> -->
      </component>
-     <component unofficial="yes" name="imageeditorengine_build" long-name="Image Editor Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="imageeditorengine_build" long-name="Image Editor Engine Build" origin-model="foundation">
       <unit bldFile="app/imgeditor/imageeditorengine/group"/>
      </component>
     </collection>
     <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
-     <component unofficial="yes" name="imgeditor_build" long-name="Image Editor Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/imgeditor/imgeditor_plat/group"/>
+     </component>
+     <component unofficial="yes" name="imgeditor_build" long-name="Image Editor Apps Build" origin-model="foundation">
       <unit bldFile="app/imgeditor/group"/>
      </component>
     </collection>
-    <collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="image_processing_engine_api" origin-model="Foundation">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_definitions_api" origin-model="Foundation">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_debug_utilities_api" origin-model="Foundation">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_utilities_api" origin-model="Foundation">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_system_parameters_api" origin-model="Foundation">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videoeditor" long-name="Video Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
     <collection name="videditor" long-name="Video Editor" level="ui">
-     <component name="VideoEditorCommon" long-name="Video Editor Common" origin-model="Foundation">
+     <component name="videoeditorcommon" long-name="Video Editor Common" origin-model="foundation">
       <unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
      </component>
-     <component name="VideoEditorUiComponents" long-name="Video Editor UI Components" origin-model="Foundation">
+     <component name="videoeditoruicomponents" long-name="Video Editor UI Components" origin-model="foundation">
       <unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
      </component>
-     <component name="SimpleVideoEditor" long-name="Simple Video Editor" origin-model="Foundation">
+     <component name="simplevideoeditor" long-name="Simple Video Editor" origin-model="foundation">
       <unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
      </component>
-     <component name="SimpleCutVideo" long-name="Simple Cut Video" origin-model="Foundation">
+     <component name="simplecutvideo" long-name="Simple Cut Video" origin-model="foundation">
       <unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
      </component>
-     <component name="VideoProvider" long-name="Video Provider" origin-model="Foundation">
+     <component name="videoprovider" long-name="Video Provider" origin-model="foundation">
       <unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
      </component>
-     <component name="ManualVideoEditor" long-name="Manual Video Editor" origin-model="Foundation">
+     <component name="manualvideoeditor" long-name="Manual Video Editor" origin-model="foundation">
       <unit bldFile="app/videoeditor/videditor/manualvideoeditor/group"/>
      </component>
-     <component name="TrimForMms" long-name="Trim For MMS" origin-model="Foundation">
+     <component name="trimformms" long-name="Trim For MMS" origin-model="foundation">
       <!-- <unit bldFile="app/videoeditor/videditor/trimformms/group"/> -->
      </component>
-     <component unofficial="yes" name="videditor_build" long-name="Video Editor Build" origin-model="Foundation">
+     <component unofficial="yes" name="videditor_build" long-name="Video Editor Build" origin-model="foundation">
       <unit bldFile="app/videoeditor/videditor/group"/>
      </component>
     </collection>
     <collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-     <component name="audioeditorengine" long-name="Audio Editor Engine" origin-model="Foundation">
+     <component name="audioeditorengine" long-name="Audio Editor Engine" origin-model="foundation">
       <unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
      </component>
-     <component name="avcedit" long-name="Avcedit" origin-model="Foundation">
+     <component name="avcedit" long-name="Avcedit" origin-model="foundation">
       <unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
      </component>
-     <component name="h263decoder" long-name="H263 Decoder" origin-model="Foundation">
+     <component name="h263decoder" long-name="H263 Decoder" origin-model="foundation">
       <unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
      </component>
-     <component name="mp3aacManipLib" long-name="Mp3aac Manip Lib" origin-model="Foundation">
+     <component name="mp3aacmaniplib" long-name="Mp3aac Manip Lib" origin-model="foundation">
       <unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
      </component>
-     <component name="vedtranscoder" long-name="Ved Transcoder" origin-model="Foundation">
+     <component name="vedtranscoder" long-name="Ved Transcoder" origin-model="foundation">
       <unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
      </component>
-     <component name="vedengine" long-name="Ved Engine" origin-model="Foundation">
+     <component name="vedengine" long-name="Ved Engine" origin-model="foundation">
       <unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
      </component>
-     <component unofficial="yes" name="videoeditorengine_build" long-name="Video Editor Engine Build" origin-model="Foundation">
+     <component unofficial="yes" name="videoeditorengine_build" long-name="Video Editor Engine Build" origin-model="foundation">
       <unit bldFile="app/videoeditor/videoeditorengine/group"/>
      </component>
     </collection>
     <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
-     <component unofficial="yes" name="videoeditor_build" long-name="Video Editor Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/videoeditor/videoeditor_plat/group"/>
+     </component>
+     <component unofficial="yes" name="videoeditor_build" long-name="Video Editor Apps Build" origin-model="foundation">
       <unit bldFile="app/videoeditor/group"/>
      </component>
     </collection>
-    <collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="video_editor_engine_api" origin-model="Foundation">
-      <unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="gallery" long-name="Gallery Apps" tech_domain="ma" level="apps" levels="app">
     <collection name="mediagallery" long-name="Media Gallery" level="app">
-     <component name="mediagallery2" long-name="Media Gallery 2" origin-model="Foundation">
+     <component name="mediagallery2" long-name="Media Gallery 2" origin-model="foundation">
       <unit bldFile="app/gallery/mediagallery/mediagallery2/group"/>
      </component>
     </collection>
     <collection name="gallery_info" long-name="Gallery Apps Info" level="app">
-     <component unofficial="yes" name="gallery_build" long-name="Gallery Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="gallery_build" long-name="Gallery Apps Build" origin-model="foundation">
       <unit bldFile="app/gallery/group"/>
      </component>
-    </collection>
-    <collection name="gallery_plat" long-name="Gallery Apps Platform Interfaces" level="app">
-     <component unofficial="yes" name="album_manager_api" origin-model="Foundation">
-      <unit bldFile="app/gallery/gallery_plat/album_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_file_notification" origin-model="Foundation">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_file_notification/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_main_view_extension_api" origin-model="Foundation">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_main_view_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_api" origin-model="Foundation">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_file_api" origin-model="Foundation">
-      <unit bldFile="app/gallery/gallery_plat/media_file_api/group"/>
+     <component unofficial="yes" name="gallery_plat" long-name="Gallery Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/gallery/gallery_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="videoplayer" long-name="Video Player Apps" tech_domain="ma" level="apps" levels="support apps">
     <collection name="lwplayer" long-name="LW Player" level="apps">
-     <component name="LWPlayer.exe=binary" long-name="LW Player" origin-model="Foundation">
+     <component name="lwplayer_build" long-name="LW Player" origin-model="foundation">
       <unit bldFile="app/videoplayer/lwplayer/group"/>
      </component>
     </collection>
     <collection name="mediaplayer" long-name="Media Player" level="apps">
-     <component unofficial="yes" name="mediaplayer_build" long-name="Media Player Build" origin-model="Foundation">
+     <component name="mediaplayer_build" origin-model="foundation">
       <unit bldFile="app/videoplayer/mediaplayer/group"/>
      </component>
     </collection>
     <collection name="mediasettings" long-name="Media Settings" level="support">
-     <component unofficial="yes" name="mediasettings_build" long-name="Media Settings Build" origin-model="Foundation">
+     <component name="mediasettings_build" origin-model="foundation">
       <unit bldFile="app/videoplayer/mediasettings/group"/>
      </component>
     </collection>
     <collection name="videoplayer_info" long-name="Video Player Apps Info" level="apps">
-     <component unofficial="yes" name="videoplayer_help" long-name="Video Player Apps Help" origin-model="Foundation">
+     <component unofficial="yes" name="videoplayer_help" long-name="Video Player Apps Help" origin-model="foundation">
       <unit bldFile="app/videoplayer/help/group"/>
      </component>
-     <component unofficial="yes" name="videoplayer_test" long-name="Video Player Apps Test" origin-model="Foundation">
+     <component unofficial="yes" name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/videoplayer/videoplayer_plat/group"/>
+      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/tsrc/group"/>
+      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="videoplayer_test" long-name="Video Player Apps Test" origin-model="foundation">
       <!-- <unit bldFile="app/videoplayer/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="videoplayer_build" long-name="Video Player Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="videoplayer_build" long-name="Video Player Apps Build" origin-model="foundation">
       <unit bldFile="app/videoplayer/group"/>
      </component>
     </collection>
-    <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="media_player_engine_api" origin-model="Foundation">
-      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_player_file_details_dialog_api" origin-model="Foundation">
-      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="photos" long-name="Photos" tech_domain="ma" level="apps" levels="support fw ui app">
     <collection name="photosgallery" long-name="Photos Gallery" level="app">
-     <component name="photosgallery_help" long-name="Help" origin-model="Foundation">
+     <component name="photosgallery_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/help/group"/>
      </component>
-     <component name="logging" long-name="Logging" origin-model="Foundation">
+     <component name="logging" long-name="Logging" origin-model="foundation">
       <!-- <unit bldFile="app/photos/photosgallery/logging/app/group"/> -->
       <unit bldFile="app/photos/photosgallery/logging/group"/>
      </component>
-     <component name="photosgallery_common" long-name="Common" origin-model="Foundation">
+     <component name="photosgallery_common" long-name="Common" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/common/group"/>
      </component>
-     <component name="photosgallery_commonui" long-name="Common UI" origin-model="Foundation">
+     <component name="photosgallery_commonui" long-name="Common UI" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/commonui/group"/>
      </component>
-     <component name="collectionframework" long-name="Collection Framework" origin-model="Foundation">
+     <component name="photoscollectionfw" long-name="Collection Framework" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/collectionframework/group"/>
       <!-- <unit bldFile="app/photos/photosgallery/collectionframework/plugins/glxcollectionpluginalbums/group"/> -->
      </component>
-     <component name="viewframework" long-name="View Framework" origin-model="Foundation">
+     <component name="photosviewfw" long-name="View Framework" origin-model="foundation">
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerbase/tsrc/group"/> -->
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/group"/> -->
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/t_glxupnprenderer/group"/> -->
@@ -12234,160 +9069,142 @@
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/metadataview/group"/> -->
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/viewbase/group"/> -->
      </component>
-     <component name="controllers" long-name="Controllers" origin-model="Foundation">
+     <component name="controllers" long-name="Controllers" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/controllers/group"/>
      </component>
-     <component name="gallery" long-name="Gallery" origin-model="Foundation">
+     <component name="photogallery" long-name="Gallery" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/gallery/group"/>
      </component>
-     <component name="slideshow" long-name="Slideshow" origin-model="Foundation">
+     <component name="slideshow" long-name="Slideshow" origin-model="foundation">
       <!-- <unit bldFile="app/photos/photosgallery/slideshow/engine/tsrc/group"/> -->
       <unit bldFile="app/photos/photosgallery/slideshow/group"/>
      </component>
-     <component name="contentharvesterplugin" long-name="Content Harvester Plugin" origin-model="Foundation">
+     <component name="contentharvesterplugin" long-name="Content Harvester Plugin" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/contentharvesterplugin/group"/>
      </component>
-     <component name="photossuite" long-name="Photos Suite" origin-model="Foundation">
+     <component name="photossuite" long-name="Photos Suite" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/photossuite/group"/>
      </component>
      <!--Component manually removed as empty and name conflicts with another component-->
      <!--<component name="memoryplugin" long-name="Memory Plugin">
        <unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
      </component>-->
-     <component unofficial="yes" name="icons" origin-model="Foundation">
+     <component unofficial="yes" name="photosicons" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/icons"/>
      </component>
-     <component unofficial="yes" name="photosgallery_build" long-name="Photos Gallery Build" origin-model="Foundation">
+     <component unofficial="yes" name="photosgallery_build" long-name="Photos Gallery Build" origin-model="foundation">
       <unit bldFile="app/photos/photosgallery/group"/>
      </component>
     </collection>
     <collection name="photos_info" long-name="Photos Info" level="app">
-     <component unofficial="yes" name="photos_build" long-name="Photos Build" origin-model="Foundation">
-      <unit bldFile="app/photos/group"/>
-     </component>
-    </collection>
-    <collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-     <component unofficial="yes" name="gallery_utilities_api" origin-model="Foundation">
-      <unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="collection_plugins_api" origin-model="Foundation">
-      <unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-     </component>
-     <component unofficial="yes" name="controllers_collection_api" origin-model="Foundation">
+     <component unofficial="yes" name="photos_plat" long-name="Photos Platform Interfaces" class="api" origin-model="foundation">
       <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ui_metadatadialog/group"/> -->
+      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
       <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
-      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
-      <unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-     </component>
-     <component unofficial="yes" name="photos_plat_build" long-name="Photos Platform API Build" origin-model="Foundation">
       <unit bldFile="app/photos/photos_plat/group"/>
      </component>
-     <component unofficial="yes" name="slideshow_ui_constants_api" origin-model="Foundation">
-      <unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="views_metadatadialog_api" origin-model="Foundation">
-      <unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
+     <component unofficial="yes" name="photos_build" long-name="Photos Build" origin-model="foundation">
+      <unit bldFile="app/photos/group"/>
      </component>
     </collection>
    </block>
    <block name="videocenter" long-name="Video Center" tech_domain="ma" level="apps" levels="eng ui app">
     <collection name="mpxmyvideoscollection" long-name="MPX My Videos Collection" level="app">
-     <component name="mpx_common_api" long-name="MPX Common_Api" origin-model="Foundation">
+     <component name="mpx_common_api" long-name="MPX Common_Api" class="api" origin-model="foundation">
       <unit bldFile="app/videocenter/mpxmyvideoscollection/mpx_common_api/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpxmyvideoscollection_build" long-name="MPX My Videos Collection Build" origin-model="Foundation">
+     </component>
+     <component unofficial="yes" name="mpxmyvideoscollection_build" long-name="MPX My Videos Collection Build" origin-model="foundation">
       <unit bldFile="app/videocenter/mpxmyvideoscollection/group"/>
      </component>
-     <component unofficial="yes" name="mpxmyvideoscollection_test" long-name="MPX My Videos Collection Test" origin-model="Foundation">
+     <component unofficial="yes" name="mpxmyvideoscollection_test" long-name="MPX My Videos Collection Test" origin-model="foundation">
       <!-- <unit bldFile="app/videocenter/mpxmyvideoscollection/tsrc/group"/> -->
      </component>
     </collection>
     <collection name="nsmyvideosview" long-name="NS My Videos View" level="app">
-     <component name="hgmyvideos" long-name="HG My Videos" origin-model="Foundation">
+     <component name="hgmyvideos" long-name="HG My Videos" origin-model="foundation">
       <unit bldFile="app/videocenter/nsmyvideosview/hgmyvideos/group"/>
      </component>
-     <component name="hgmyvideosplugin" long-name="HG My Videos Plugin" origin-model="Foundation">
+     <component name="hgmyvideosplugin" long-name="HG My Videos Plugin" origin-model="foundation">
       <unit bldFile="app/videocenter/nsmyvideosview/hgmyvideosplugin/group"/>
      </component>
-     <component name="nsmyvideos" long-name="NS Myvideos" origin-model="Foundation">
+     <component name="nsmyvideos" long-name="NS Myvideos" origin-model="foundation">
       <!-- <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideos/group"/> -->
      </component>
-     <component name="nsmyvideosplugin" long-name="NS Myvideos Plugin" origin-model="Foundation">
+     <component name="nsmyvideosplugin" long-name="NS Myvideos Plugin" origin-model="foundation">
       <!-- <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideosplugin/group"/> -->
      </component>
     </collection>
     <collection name="vccommon" long-name="Video Center Common" level="eng">
-     <component name="vccommon_utils" long-name="Utilities" origin-model="Foundation">
+     <component name="vccommon_utils" long-name="Utilities" origin-model="foundation">
       <unit bldFile="app/videocenter/vccommon/utils/group"/>
      </component>
-     <component name="viewmessageutility" long-name="View Message Utility" origin-model="Foundation">
+     <component name="viewmessageutility" long-name="View Message Utility" origin-model="foundation">
       <unit bldFile="app/videocenter/vccommon/viewmessageutility/group"/>
      </component>
-     <component name="notifierplugins" long-name="Notifier Plugins" origin-model="Foundation">
+     <component name="notifierplugins" long-name="Notifier Plugins" origin-model="foundation">
       <unit bldFile="app/videocenter/vccommon/notifierplugins/notifierplugin/group"/>
       <unit bldFile="app/videocenter/vccommon/notifierplugins/vcxnotifier/group"/>
      </component>
-     <component name="vccommon_help" long-name="Help" origin-model="Foundation">
+     <component name="vccommon_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/videocenter/vccommon/help/group"/>
      </component>
-     <component unofficial="yes" name="sis" origin-model="Foundation">
+     <component unofficial="yes" name="sis" origin-model="foundation">
       <!-- <unit bldFile="app/videocenter/vccommon/sis"/> -->
      </component>
-     <component unofficial="yes" name="vccommon_build" long-name="Video Center Common Build" origin-model="Foundation">
+     <component unofficial="yes" name="vccommon_build" long-name="Video Center Common Build" origin-model="foundation">
       <unit bldFile="app/videocenter/vccommon/group"/>
      </component>
     </collection>
     <collection name="vcengines" long-name="Video Center Engines" level="eng">
-     <component name="vcengines_server" long-name="Server" origin-model="Foundation">
+     <component name="vcengines_server" long-name="Server" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/server/clientapi/group"/>
       <unit bldFile="app/videocenter/vcengines/server/group"/>
       <unit bldFile="app/videocenter/vcengines/server/iptvepgmanager/group"/>
      </component>
-     <component name="serviceprovisioning" long-name="Service Provisioning" origin-model="Foundation">
+     <component name="serviceprovisioning" long-name="Service Provisioning" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/serviceprovisioning/omaprovisioning/group"/>
       <unit bldFile="app/videocenter/vcengines/serviceprovisioning/provisioningappui/group"/>
       <unit bldFile="app/videocenter/vcengines/serviceprovisioning/provisioningprocessor/group"/>
       <unit bldFile="app/videocenter/vcengines/serviceprovisioning/provisioningrecognizer/group"/>
      </component>
-     <component name="mrssplugin" long-name="Mrss Plugin" origin-model="Foundation">
+     <component name="mrssplugin" long-name="Mrss Plugin" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/mrssplugin/group"/>
      </component>
-     <component name="livetvutils" long-name="Live TV Utils" origin-model="Foundation">
+     <component name="livetvutils" long-name="Live TV Utils" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/livetvutils/group"/>
      </component>
-     <component name="networkengine" long-name="Network Engine" origin-model="Foundation">
+     <component name="networkengine" long-name="Network Engine" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/networkengine/group"/>
      </component>
-     <component name="livetvepgengine" long-name="Live TV EPG Engine" origin-model="Foundation">
+     <component name="livetvepgengine" long-name="Live TV EPG Engine" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/livetvepgengine/group"/>
      </component>
-     <component name="tunerengine" long-name="Tuner Engine" origin-model="Foundation">
+     <component name="tunerengine" long-name="Tuner Engine" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/tunerengine/group"/>
      </component>
-     <component name="livetvschedulerplugin" long-name="Live TV Scheduler Plugin" origin-model="Foundation">
+     <component name="livetvschedulerplugin" long-name="Live TV Scheduler Plugin" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/livetvschedulerplugin/group"/>
      </component>
-     <component name="xmltvplugin" long-name="XML TV Plugin" origin-model="Foundation">
+     <component name="xmltvplugin" long-name="XML TV Plugin" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/xmltvplugin/group"/>
      </component>
-     <component name="scheduleddlplugin" long-name="Scheduled Download Plugin" origin-model="Foundation">
+     <component name="scheduleddlplugin" long-name="Scheduled Download Plugin" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/scheduleddlplugin/group"/>
      </component>
-     <component name="voddownloadplugin" long-name="VOD Download Plugin" origin-model="Foundation">
+     <component name="voddownloadplugin" long-name="VOD Download Plugin" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/voddownloadplugin/group"/>
      </component>
-     <component unofficial="yes" name="vcengines_build" long-name="Video Center Engines Build" origin-model="Foundation">
+     <component unofficial="yes" name="vcengines_build" long-name="Video Center Engines Build" origin-model="foundation">
       <unit bldFile="app/videocenter/vcengines/group"/>
      </component>
     </collection>
     <collection name="vcnsuis" long-name="Video Center NS UIs" level="ui">
-     <component name="vcnsapp" long-name="VCNS App" origin-model="Foundation">
+     <component name="vcnsapp" long-name="VCNS App" origin-model="foundation">
       <unit bldFile="app/videocenter/vcnsuis/vcnsapp/vcnsappui/group"/>
       <unit bldFile="app/videocenter/vcnsuis/vcnsapp/vcnsbsutility/group"/>
       <unit bldFile="app/videocenter/vcnsuis/vcnsapp/vcnsuiengine/group"/>
      </component>
-     <component name="vcnssettings" long-name="VCNS Settings" origin-model="Foundation">
+     <component name="vcnssettings" long-name="VCNS Settings" origin-model="foundation">
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnsgsplugin/group"/>
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnsscheduleplugin/group"/>
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnsscheduleview/group"/>
@@ -12395,264 +9212,227 @@
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnssettingsplugin/group"/>
       <unit bldFile="app/videocenter/vcnsuis/vcnssettings/vcnssettingsviews/group"/>
      </component>
-     <component name="vcnsahplugin" long-name="VCNS Action Handler Plugin" origin-model="Foundation">
+     <component name="vcnsahplugin" long-name="VCNS Action Handler Plugin" origin-model="foundation">
       <unit bldFile="app/videocenter/vcnsuis/vcnsahplugin/group"/>
      </component>
-     <component name="vcnsvodui" long-name="VCNS VOD UI" origin-model="Foundation">
+     <component name="vcnsvodui" long-name="VCNS VOD UI" origin-model="foundation">
       <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/plugins/hgvodplugin/group"/>
       <!-- <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/plugins/vcnsvodplugin/group"/> -->
       <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/views/hgvodui/group"/>
       <!-- <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/views/vcnsvodui/group"/> -->
      </component>
-     <component name="vcnslivetv" long-name="VCNS Live TV" origin-model="Foundation">
+     <component name="vcnslivetv" long-name="VCNS Live TV" origin-model="foundation">
       <unit bldFile="app/videocenter/vcnsuis/vcnslivetv/remindernotifier/group"/>
      </component>
-     <component name="vcnschplugin" long-name="VCNS Content Harvester Plugin" origin-model="Foundation">
+     <component name="vcnschplugin" long-name="VCNS Content Harvester Plugin" origin-model="foundation">
       <unit bldFile="app/videocenter/vcnsuis/vcnschplugin/group"/>
      </component>
     </collection>
     <collection name="vcplayer" long-name="Video Center Player" level="app">
-     <component name="vcplayer_core" long-name="Core" origin-model="Foundation">
+     <component name="vcplayer_core" long-name="Core" origin-model="foundation">
       <unit bldFile="app/videocenter/vcplayer/core/controllerbase/group"/>
       <unit bldFile="app/videocenter/vcplayer/core/playercore/group"/>
      </component>
-     <component name="vcplayer_utils" long-name="Utilities" origin-model="Foundation">
+     <component name="vcplayer_utils" long-name="Utilities" origin-model="foundation">
       <unit bldFile="app/videocenter/vcplayer/utils/group"/>
      </component>
-     <component name="vcplayer_plugins" long-name="Plugins" origin-model="Foundation">
+     <component name="vcplayer_plugins" long-name="Plugins" origin-model="foundation">
       <unit bldFile="app/videocenter/vcplayer/plugins/dlprogresscontroller/group"/>
       <unit bldFile="app/videocenter/vcplayer/plugins/rtpfileplaycontroller/group"/>
       <unit bldFile="app/videocenter/vcplayer/plugins/unicaststreamplayercontroller/group"/>
      </component>
-     <component name="vcnsplayerview" long-name="VCNS Player View" origin-model="Foundation">
+     <component name="vcnsplayerview" long-name="VCNS Player View" origin-model="foundation">
       <unit bldFile="app/videocenter/vcplayer/vcnsplayerview/group"/>
      </component>
-     <component name="defaultview" long-name="Default View" origin-model="Foundation">
+     <component name="defaultview" long-name="Default View" origin-model="foundation">
       <!-- <unit bldFile="app/videocenter/vcplayer/defaultview/group"/> -->
      </component>
-     <component unofficial="yes" name="vcplayer_build" long-name="Video Center Player Build" origin-model="Foundation">
+     <component unofficial="yes" name="vcplayer_build" long-name="Video Center Player Build" origin-model="foundation">
       <unit bldFile="app/videocenter/vcplayer/group"/>
      </component>
     </collection>
     <collection name="videocenter_info" long-name="Video Center Info" level="app">
-     <component unofficial="yes" name="videocenter_build" long-name="Video Center Build" origin-model="Foundation">
+     <component unofficial="yes" name="videocenter_build" long-name="Video Center Build" origin-model="foundation">
       <unit bldFile="app/videocenter/group"/>
      </component>
-    </collection>
-    <collection name="videocenter_plat" long-name="Video Center Platform Interfaces" level="app">
-     <component unofficial="yes" name="videocenter_plat_build" long-name="Video Center Platform API Build" origin-model="Foundation">
+     <component unofficial="yes" name="videocenter_plat" long-name="Video Center Platform Interfaces" class="api" origin-model="foundation">
       <unit bldFile="app/videocenter/videocenter_plat/group"/>
      </component>
-     <component unofficial="yes" name="videocenter_player_api" origin-model="Foundation">
-      <unit bldFile="app/videocenter/videocenter_plat/videocenter_player_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="musicplayer" long-name="Music Player Apps" tech_domain="ma" level="apps" levels="plugins support apps">
     <collection name="musicvisualization" long-name="Music Visualization" level="plugins">
-     <component name="musicvisualizationplugin" long-name="Music Visualization Plugin" origin-model="Foundation">
+     <component name="musicvisualizationplugin" long-name="Music Visualization Plugin" origin-model="foundation">
       <unit bldFile="app/musicplayer/musicvisualization/musicvisualizationplugin/group"/>
      </component>
-     <component name="mpxvisualizationplugins" long-name="MPX Visualization Plugins" origin-model="Foundation">
+     <component name="mpxvisualizationplugins" long-name="MPX Visualization Plugins" origin-model="foundation">
       <unit bldFile="app/musicplayer/musicvisualization/mpxvisualizationplugins/group"/>
      </component>
     </collection>
     <collection name="mpxmusicplayer" long-name="MPX Music Player" level="apps">
-     <component name="mpxmusicplayer_help" long-name="Help" origin-model="Foundation">
+     <component name="mpxmusicplayer_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
      </component>
-     <component name="mpxmusicplayer_commonui" long-name="Common UI" origin-model="Foundation">
+     <component name="mpxmusicplayer_commonui" long-name="Common UI" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
      </component>
-     <component name="activeidle" long-name="Active Idle" origin-model="Foundation">
+     <component name="activeidle" long-name="Active Idle" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxmusicplayer/activeidle/group"/>
      </component>
-     <component name="metadatahandler" long-name="Metadata Handler" origin-model="Foundation">
+     <component name="metadatahandler" long-name="Metadata Handler" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
      </component>
-     <component name="mediakeyhandler" long-name="Mediakey Handler" origin-model="Foundation">
+     <component name="mediakeyhandler" long-name="Mediakey Handler" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
      </component>
-     <component name="mpxmusicplayer_app" long-name="Application" origin-model="Foundation">
+     <component name="mpxmusicplayer_app" long-name="Application" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxmusicplayer/app/group"/>
      </component>
-     <component unofficial="yes" name="mpxmusicplayer_build" long-name="MPX Music Player Build" origin-model="Foundation">
+     <component unofficial="yes" name="mpxmusicplayer_build" long-name="MPX Music Player Build" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxmusicplayer/group"/>
      </component>
     </collection>
     <collection name="musichomescreen" long-name="Music Homescreen" level="apps">
-     <component name="mpxcollectionpublisher" long-name="MPX Collection Publisher" origin-model="Foundation">
+     <component name="mpxcollectionpublisher" long-name="MPX Collection Publisher" origin-model="foundation">
       <unit bldFile="app/musicplayer/musichomescreen/mpxcollectionpublisher/group"/>
      </component>
-     <component name="musiccontentpublisher" long-name="Music Content Publisher" origin-model="Foundation">
+     <component name="musiccontentpublisher" long-name="Music Content Publisher" origin-model="foundation">
       <unit bldFile="app/musicplayer/musichomescreen/musiccontentpublisher/group"/>
      </component>
-     <component name="mcpmusicplayer" long-name="MCP Music Player" origin-model="Foundation">
+     <component name="mcpmusicplayer" long-name="MCP Music Player" origin-model="foundation">
       <unit bldFile="app/musicplayer/musichomescreen/mcpmusicplayer/group"/>
      </component>
-     <component name="musicplayeractionhandlerplugin" long-name="Music Player Action Handler Plugin" origin-model="Foundation">
+     <component name="musicplayeractionhandlerplugin" long-name="Music Player Action Handler Plugin" origin-model="foundation">
       <unit bldFile="app/musicplayer/musichomescreen/musicplayeractionhandlerplugin/group"/>
      </component>
-     <component name="data" origin-model="Foundation">
+     <component name="data" origin-model="foundation">
       <unit bldFile="app/musicplayer/musichomescreen/data/themes/default/group"/>
      </component>
-     <component unofficial="yes" name="musichomescreen_build" long-name="Music Homescreen Build" origin-model="Foundation">
+     <component unofficial="yes" name="musichomescreen_build" long-name="Music Homescreen Build" origin-model="foundation">
       <unit bldFile="app/musicplayer/musichomescreen/group"/>
      </component>
     </collection>
     <collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-     <component name="serviceplugins" long-name="service Plugins" origin-model="Foundation">
+     <component name="serviceplugins" long-name="service Plugins" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxplugins/serviceplugins/group"/>
      </component>
-     <component name="viewplugins" long-name="View Plugins" origin-model="Foundation">
+     <component name="viewplugins" long-name="View Plugins" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxplugins/viewplugins/group"/>
      </component>
-     <component unofficial="yes" name="mpxplugins_build" long-name="MPX Plugins Build" origin-model="Foundation">
+     <component unofficial="yes" name="mpxplugins_build" long-name="MPX Plugins Build" origin-model="foundation">
       <unit bldFile="app/musicplayer/mpxplugins/group"/>
      </component>
     </collection>
-    <collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="mpx_music_store_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_shop_ui_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_media_key_handler_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_wap_adapter_cenrep_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-     </component>
-     <component unofficial="yes" name="music_visualization_plugin_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_application_features_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_remote_control_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_app_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_commonui_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-     </component>
-     <component unofficial="yes" name="music_content_publisher_plugin_api" origin-model="Foundation">
-      <unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-     </component>
-    </collection>
     <collection name="musicplayer_info" long-name="Music Player Apps Info" level="apps">
-     <component unofficial="yes" name="musicplayer_test" long-name="Music Player Apps Test" origin-model="Foundation">
+     <component unofficial="yes" name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/musicplayer/musicplayer_plat/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="musicplayer_test" long-name="Music Player Apps Test" origin-model="foundation">
       <!-- <unit bldFile="app/musicplayer/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="musicplayer_build" long-name="Music Player Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="musicplayer_build" long-name="Music Player Apps Build" origin-model="foundation">
       <unit bldFile="app/musicplayer/group"/>
      </component>
     </collection>
    </block>
    <block name="radio" long-name="Radio Apps" tech_domain="ma" level="apps" levels="engine ui">
     <collection name="fmradio" long-name="FM Radio" level="ui">
-     <component name="activeidleengine" long-name="Active Idle Engine" origin-model="Foundation">
+     <component name="activeidleengine" long-name="Active Idle Engine" origin-model="foundation">
       <unit bldFile="app/radio/fmradio/activeidleengine/group"/>
      </component>
-     <component name="fmradioengine" long-name="FM Radio Engine" origin-model="Foundation">
+     <component name="fmradioengine" long-name="FM Radio Engine" origin-model="foundation">
       <unit bldFile="app/radio/fmradio/fmradioengine/group"/>
      </component>
-     <component name="fmradioactionhandler" long-name="FMRadio Action Handler" origin-model="Foundation">
+     <component name="fmradioactionhandler" long-name="FMRadio Action Handler" origin-model="foundation">
       <unit bldFile="app/radio/fmradio/fmradioactionhandler/group"/>
      </component>
-     <component name="fmradiomcpplugin" long-name="FM Radio MCP Plugin" origin-model="Foundation">
+     <component name="fmradiomcpplugin" long-name="FM Radio MCP Plugin" origin-model="foundation">
       <unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
      </component>
-     <component name="FMRadio" origin-model="Foundation">
-      <unit bldFile="app/radio/fmradio/fmradio/group"/>
-     </component>
-     <component name="fmradio_help" long-name="Help" origin-model="Foundation">
+     
+     <component name="fmradio_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/radio/fmradio/help/group"/>
      </component>
-     <component unofficial="yes" name="fmradio_build" long-name="FM Radio Build" origin-model="Foundation">
+     <component unofficial="yes" name="fmradio_build" long-name="FM Radio Build" origin-model="foundation">
       <unit bldFile="app/radio/fmradio/group"/>
      </component>
     </collection>
    </block>
    <block name="voicerec" long-name="Voice Recorder Apps" tech_domain="ma" level="apps" levels="empty 1">
     <collection name="voicerecorder" long-name="Voice Recorder" level="1">
-     <component name="gsplugin" long-name="GS Plugin" origin-model="Foundation">
+     <component name="voicerecordergsplugin" long-name="GS Plugin" origin-model="foundation">
       <!-- <unit bldFile="app/voicerec/voicerecorder/gsplugin/group"/> -->
      </component>
-     <component name="voicerecorder_help" long-name="Help" origin-model="Foundation">
+     <component name="voicerecorder_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/voicerec/voicerecorder/help/group"/>
      </component>
-     <component unofficial="yes" name="voicerecorder_build" long-name="Voice Recorder Build" origin-model="Foundation">
+     <component name="voicerecorder_build" origin-model="foundation">
       <unit bldFile="app/voicerec/voicerecorder/group"/>
      </component>
     </collection>
     <collection name="voicerec_info" long-name="Voice Recorder Apps Info" level="1">
-     <component unofficial="yes" name="voicerec_build" long-name="Voice Recorder Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="voicerec_build" long-name="Voice Recorder Apps Build" origin-model="foundation">
       <unit bldFile="app/voicerec/group"/>
      </component>
-     <component unofficial="yes" name="voicerec_test" long-name="Voice Recorder Apps Test" origin-model="Foundation">
+     <component unofficial="yes" name="voicerec_test" long-name="Voice Recorder Apps Test" origin-model="foundation">
       <!-- <unit bldFile="app/voicerec/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces" level="1">
-     <component unofficial="yes" name="new_file_service_api" origin-model="Foundation">
-      <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="voicerecorder_public_constants_api" origin-model="Foundation">
-      <unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+     <component unofficial="yes" name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/voicerec/voicerec_plat/group"/>
+      <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/tsrc/group"/>
      </component>
     </collection>
    </block>
    <block name="imgvieweruis" long-name="Image Viewer UIs" tech_domain="ma" level="services" levels="app">
     <collection name="imageviewer" long-name="Image Viewer" level="app">
-     <component name="imageviewer_help" long-name="Help" origin-model="Foundation">
+     <component name="imageviewer_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/imgvieweruis/imageviewer/help/group"/>
      </component>
-     <component unofficial="yes" name="imageviewer_build" long-name="Image Viewer Build" origin-model="Foundation">
+     <component name="imageviewer_build" origin-model="foundation">
       <unit bldFile="app/imgvieweruis/imageviewer/group"/>
      </component>
     </collection>
     <collection name="imgvieweruis_info" long-name="Image Viewer UIs Info" level="app">
-     <component unofficial="yes" name="imgvieweruis_build" long-name="Image Viewer UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="imgvieweruis_build" long-name="Image Viewer UIs Build" origin-model="foundation">
       <unit bldFile="app/imgvieweruis/group"/>
      </component>
     </collection>
    </block>
    <block name="screensaver" long-name="Screen Saver Apps" tech_domain="ui" level="apps" levels="eng plugin">
     <collection name="scrsaver" long-name="Screen Saver Plugins" level="eng">
-     <component name="scrsaverplugins" long-name="Screen Saver Plugins" origin-model="Foundation">
+     <component name="scrsaverplugins" long-name="Screen Saver Plugins" origin-model="foundation">
       <!-- <unit bldFile="app/screensaver/scrsaver/scrsaverplugins/group"/> -->
      </component>
-     <component name="screensaveraiwplugin" long-name="Screen Saver AIW Plugin" origin-model="Foundation">
+     <component name="screensaveraiwplugin" long-name="Screen Saver AIW Plugin" origin-model="foundation">
       <unit bldFile="app/screensaver/scrsaver/screensaveraiwplugin/group"/>
      </component>
     </collection>
-    <collection name="screensaver.exe=binary" long-name="Screen Saver" level="plugin">
-     <component name="screensaver.exe=binary compo" origin-model="Foundation"/>
-    </collection>
+    
     <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="plugin">
-     <component unofficial="yes" name="screensaver_build" long-name="Screen Saver Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="screensaver_build" long-name="Screen Saver Apps Build" origin-model="foundation">
       <unit bldFile="app/screensaver/group"/>
      </component>
     </collection>
    </block>
    <block name="homescreen" long-name="Home Screen Apps" tech_domain="ui" level="apps" levels="fw apps">
     <collection name="idlehomescreen" long-name="Idle Homescreen" level="apps">
-     <component name="nativeuicontroller" long-name="Native UI Controller" origin-model="Foundation">
+     <component name="nativeuicontroller" long-name="Native UI Controller" origin-model="foundation">
       <unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
      </component>
-     <component name="exths" long-name="ExtHS" origin-model="Foundation">
+     <component name="exths" long-name="ExtHS" origin-model="foundation">
       <unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
      </component>
-     <component name="activeidle3" long-name="Active Idle 3" origin-model="Foundation">
+     <component name="activeidle3" long-name="Active Idle 3" origin-model="foundation">
       <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/group"/> -->
       <unit bldFile="app/homescreen/idlehomescreen/activeidle3/group"/>
       <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/> -->
      </component>
-     <component name="hsplugins" long-name="HS Plugins" origin-model="Foundation">
+     <component name="hsplugins" long-name="HS Plugins" origin-model="foundation">
       <unit bldFile="app/homescreen/idlehomescreen/hsplugins/group"/>
       <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/qhd_tch/organizer_2001f481/group"/> -->
       <!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001f48d/group"/> -->
@@ -12660,62 +9440,52 @@
      </component>
     </collection>
     <collection name="menufw" long-name="Menu Framework" level="fw">
-     <component name="hierarchynavigator" long-name="Hierarchy Navigator" origin-model="Foundation">
+     <component name="hierarchynavigator" long-name="Hierarchy Navigator" origin-model="foundation">
       <unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
      </component>
-     <component name="menufwui" long-name="Menu Framework UI" origin-model="Foundation">
+     <component name="menufwui" long-name="Menu Framework UI" origin-model="foundation">
       <unit bldFile="app/homescreen/menufw/menufwui/group"/>
      </component>
-     <component name="menusuites" long-name="Menu Suites" origin-model="Foundation">
+     <component name="menusuites" long-name="Menu Suites" origin-model="foundation">
       <unit bldFile="app/homescreen/menufw/menusuites/group"/>
      </component>
-     <component unofficial="yes" name="menufw_build" long-name="Menu Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="menufw_build" long-name="Menu Framework Build" origin-model="foundation">
       <unit bldFile="app/homescreen/menufw/group"/>
      </component>
     </collection>
     <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
-     <component unofficial="yes" name="homescreen_build" long-name="Home Screen Apps Build" origin-model="Foundation">
+     <component unofficial="yes" name="homescreen_build" long-name="Home Screen Apps Build" origin-model="foundation">
       <unit bldFile="app/homescreen/group"/>
      </component>
-     <component unofficial="yes" name="homescreen_test" long-name="Home Screen Apps Test" origin-model="Foundation">
+     <component unofficial="yes" name="homescreen_test" long-name="Home Screen Apps Test" origin-model="foundation">
       <!-- <unit bldFile="app/homescreen/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="menu_settings_api" origin-model="Foundation">
-      <unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
+     <component unofficial="yes" name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/homescreen/homescreen_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="graphicsuis" long-name="Graphics UIs" tech_domain="ui" level="services" levels="util ui">
     <collection name="svgtviewer" long-name="SVGT Viewer" level="ui">
-     <component name="SvgtViewerPlugin" long-name="SVGT Viewer Plugin" origin-model="Foundation">
+     <component name="svgtviewerplugin" long-name="SVGT Viewer Plugin" origin-model="foundation">
       <unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
      </component>
-     <component unofficial="yes" name="svgtviewer_build" long-name="SVGT Viewer Build" origin-model="Foundation">
+     <component unofficial="yes" name="svgtviewer_build" long-name="SVGT Viewer Build" origin-model="foundation">
       <unit bldFile="app/graphicsuis/svgtviewer/group"/>
      </component>
     </collection>
     <collection name="graphicsuis_info" long-name="Graphics UIs Info" level="ui">
-     <component unofficial="yes" name="graphicsuis_build" long-name="Graphics UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="graphicsuis_build" long-name="Graphics UIs Build" origin-model="foundation">
       <unit bldFile="app/graphicsuis/group"/>
      </component>
-    </collection>
-    <collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-     <component unofficial="yes" name="svg_application_observer_utility_api" origin-model="Foundation">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_file_view_details_dialog_api" origin-model="Foundation">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_viewer_ui_api" origin-model="Foundation">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+     <component unofficial="yes" name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/graphicsuis/graphicsuis_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="profile" long-name="Profile" tech_domain="ui" level="apps" levels="app">
     <collection name="profilesapplication" long-name="Profiles Application" level="app">
-     <component name="Profiles" long-name="Profiles" origin-model="Foundation">
+     <component name="profiles" long-name="Profiles" origin-model="foundation">
       <unit bldFile="app/profile/profilesapplication/profiles/group"/>
       <!-- <unit bldFile="app/profile/profilesapplication/profiles/gsprofilesplugin/group"/> -->
       <!-- <unit bldFile="app/profile/profilesapplication/profiles/profileaiwprovider/group"/> -->
@@ -12723,325 +9493,239 @@
       <unit bldFile="app/profile/profilesapplication/profiles/profileapp/tsrc/public/basic/group"/>
       <!-- <unit bldFile="app/profile/profilesapplication/profiles/profilesgstonesplugin/group"/> -->
      </component>
-     <component unofficial="yes" name="profilesapplication_test" long-name="Profiles Application Test" origin-model="Foundation">
+     <component unofficial="yes" name="profilesapplication_test" long-name="Profiles Application Test" origin-model="foundation">
       <!-- <unit bldFile="app/profile/profilesapplication/tsrc/public/basic/group"/> -->
      </component>
     </collection>
-    <collection name="profile_plat" long-name="Profile Platform Interfaces" level="app">
-     <component unofficial="yes" name="profiles_settings_view_api" origin-model="Foundation">
-      <unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-     </component>
-    </collection>
     <collection name="profile_info" long-name="Profile Info" level="app">
-     <component unofficial="yes" name="profile_test" long-name="Profile Test" origin-model="Foundation">
-      <!-- <unit bldFile="app/profile/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="profile_help" long-name="Profile Help" origin-model="Foundation">
+     <component unofficial="yes" name="profile_plat" long-name="Profile Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/profile/profile_plat/group"/>
+     </component>
+     <component unofficial="yes" name="profile_help" long-name="Profile Help" origin-model="foundation">
       <unit bldFile="app/profile/help/group"/>
      </component>
-     <component unofficial="yes" name="profile_build" long-name="Profile Build" origin-model="Foundation">
+     <component unofficial="yes" name="profile_build" long-name="Profile Build" origin-model="foundation">
       <unit bldFile="app/profile/group"/>
      </component>
     </collection>
    </block>
    <block name="speechsrv" long-name="Speech Recognition UIs" tech_domain="ui" level="services" levels="engine framework ui">
     <collection name="voiceui" long-name="Voice UI" level="ui">
-     <component name="vcommand" long-name="VCommand" origin-model="Foundation">
+     <component name="vcommand" long-name="VCommand" origin-model="foundation">
       <unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
      </component>
-     <component name="voiceuivoicerecognition" long-name="Voice UI Voice Recognition" origin-model="Foundation">
+     <component name="voiceuivoicerecognition" long-name="Voice UI Voice Recognition" origin-model="foundation">
       <unit bldFile="app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
      </component>
-     <component name="pbkinfoviewimpl" long-name="Phonebook Info View Implementation" origin-model="Foundation">
+     <component name="pbkinfoviewimpl" long-name="Phonebook Info View Implementation" origin-model="foundation">
       <unit bldFile="app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
      </component>
-     <component name="aiwpbkinfoviewprovider" long-name="AIW Phonebook Info View Provider" origin-model="Foundation">
+     <component name="aiwpbkinfoviewprovider" long-name="AIW Phonebook Info View Provider" origin-model="foundation">
       <unit bldFile="app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
      </component>
-     <component name="vccontrolpanelplugin" long-name="VC Control Panel Plugin" origin-model="Foundation">
+     <component name="vccontrolpanelplugin" long-name="VC Control Panel Plugin" origin-model="foundation">
       <unit bldFile="app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
      </component>
-     <component unofficial="yes" name="voiceui_build" long-name="Voice UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="voiceui_build" long-name="Voice UI Build" origin-model="foundation">
       <unit bldFile="app/speechsrv/voiceui/group"/>
      </component>
     </collection>
     <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-     <component name="sispeechrecognitiondata" long-name="SI Speech Recognition Data" origin-model="Foundation">
+     <component name="sispeechrecognitiondata" long-name="SI Speech Recognition Data" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/sispeechrecognitiondata/group"/>
      </component>
-     <component name="ttscommon" long-name="TTS Common" origin-model="Foundation">
+     <component name="ttscommon" long-name="TTS Common" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/ttscommon/group"/>
      </component>
-     <component name="devtts" long-name="Text to Speech" origin-model="Foundation">
+     <component name="devtts" long-name="Text to Speech" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/devtts/group"/>
      </component>
-     <component name="ttscustomcommands" long-name="TTS Custom Commands" origin-model="Foundation">
+     <component name="ttscustomcommands" long-name="TTS Custom Commands" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/ttscustomcommands/group"/>
      </component>
-     <component name="ttscontrollerplugin" long-name="TTS Controller Plugin" origin-model="Foundation">
+     <component name="ttscontrollerplugin" long-name="TTS Controller Plugin" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/ttscontrollerplugin/group"/>
      </component>
-     <component name="ttsutility" long-name="TTS Utility" origin-model="Foundation">
+     <component name="ttsutility" long-name="TTS Utility" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
      </component>
-     <component name="speechsynthesis" long-name="Speech Synthesis" origin-model="Foundation">
+     <component name="speechsynthesis" long-name="Speech Synthesis" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
       <unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
       <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/speechsynthesistest/group"/>
       <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/testapplication/group"/> -->
       <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/texttospeech/group"/> -->
      </component>
-     <component name="devasr" long-name="Audio Recording and Speech Recognition" origin-model="Foundation">
+     <component name="devasr" long-name="Audio Recording and Speech Recognition" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/devasr/group"/>
      </component>
-     <component name="sicc" long-name="Speaker Independent Custom Commands" origin-model="Foundation">
+     <component name="sicc" long-name="Speaker Independent Custom Commands" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/sicc/group"/>
      </component>
-     <component name="sisrscontrollerplugin" long-name="SI SRS Controller Plugin" origin-model="Foundation">
+     <component name="sisrscontrollerplugin" long-name="SI SRS Controller Plugin" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/sisrscontrollerplugin/group"/>
      </component>
-     <component name="siutility" long-name="Speaker Independent Utility" origin-model="Foundation">
+     <component name="siutility" long-name="Speaker Independent Utility" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/siutility/group"/>
      </component>
-     <component name="nssvasapi" long-name="NSS VAS API" origin-model="Foundation">
+     <component name="nssvasapi" long-name="NSS VAS API" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/nssvasapi/group"/>
       <!-- <unit bldFile="app/speechsrv/srsf/nssvasapi/nssvasdb/nssvasdbeventnotifier/group"/> -->
      </component>
-     <component name="nssvascontacthdlr" long-name="NSS VAS Contact Handler" origin-model="Foundation">
+     <component name="nssvascontacthdlr" long-name="NSS VAS Contact Handler" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/nssvascontacthdlr/group"/>
      </component>
-     <component name="vcommandhandler" long-name="Voice Command Handler" origin-model="Foundation">
+     <component name="vcommandhandler" long-name="Voice Command Handler" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/vcommandhandler/group"/>
      </component>
-     <component name="vuiphandler" long-name="Voice UI Plugin Handler" origin-model="Foundation">
+     <component name="vuiphandler" long-name="Voice UI Plugin Handler" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/vuiphandler/group"/>
      </component>
-     <component name="vcommandexecutor" long-name="Voice Command Executor" origin-model="Foundation">
+     <component name="vcommandexecutor" long-name="Voice Command Executor" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/vcommandexecutor/group"/>
      </component>
-     <component name="vcommandexecutorbearer" long-name="Voice Command Executor Bearer" origin-model="Foundation">
+     <component name="vcommandexecutorbearer" long-name="Voice Command Executor Bearer" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/vcommandexecutorbearer/group"/>
      </component>
-     <component name="vcommandmanager" long-name="Voice Command Manager" origin-model="Foundation">
+     <component name="vcommandmanager" long-name="Voice Command Manager" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/vcommandmanager/group"/>
      </component>
-     <component name="vcexecutorapp" long-name="Voice Command Executor Application" origin-model="Foundation">
+     <component name="vcexecutorapp" long-name="Voice Command Executor Application" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/vcexecutorapp/group"/>
      </component>
-     <component name="profileobserverplugin" long-name="Profile Observer Plugin" origin-model="Foundation">
+     <component name="profileobserverplugin" long-name="Profile Observer Plugin" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
      </component>
-     <component unofficial="yes" name="srsf_build" long-name="Speech Recognition and Synthesis Framework Build" origin-model="Foundation">
+     <component unofficial="yes" name="srsf_build" long-name="Speech Recognition and Synthesis Framework Build" origin-model="foundation">
       <unit bldFile="app/speechsrv/srsf/group"/>
      </component>
     </collection>
-    <collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-     <component unofficial="yes" name="voice_commands_resource_header_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="ui_voice_recognition_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_tts_common_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_devasr_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-     </component>
-     <component unofficial="yes" name="srsf_secondarydisplay_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-     </component>
-     <component unofficial="yes" name="tts_hw_device_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_ui_accessory_button_handling_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-     </component>
-     <component unofficial="yes" name="vocman_hw_device_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="asrs_hw_device_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="vcommand_settings_cenrep_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-     </component>
-     <component unofficial="yes" name="adaptation_hw_device_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_srs_custom_commands_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_synthesis_clientserver_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-     </component>
-     <component unofficial="yes" name="grcompiler_hw_device_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="recognition_hw_device_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_ui_plugin_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="vas_contact_handler_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="vas_vcommand_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_devtts_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-     </component>
-     <component unofficial="yes" name="srsf_cenrep_settings_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_srs_utility_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="ttp_hw_device_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_mmf_tts_custom_commands_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_si_speech_recognition_data_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="nlp_hw_device" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-     </component>
-     <component unofficial="yes" name="vas_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_tts_utility_api" origin-model="Foundation">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-     </component>
-    </collection>
     <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
-     <component unofficial="yes" name="speechsrv_test" long-name="Speech Recognition UIs Test" origin-model="Foundation">
+     <component unofficial="yes" name="speechsrv_test" long-name="Speech Recognition UIs Test" origin-model="foundation">
       <!-- <unit bldFile="app/speechsrv/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build" origin-model="foundation">
       <unit bldFile="app/speechsrv/group"/>
      </component>
+     <component unofficial="yes" name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/speechsrv/speechsrv_plat/group"/>
+      <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/tsrc/group"/>
+     </component>
     </collection>
    </block>
    <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
     <collection name="dtdinstaller" long-name="DTD Installer" level="install">
-     <component name="dtdinstaller compo" origin-model="Foundation">
+     <component name="dtdinstaller_build" origin-model="foundation">
       <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
      </component>
     </collection>
     <collection name="themeinstaller" long-name="Theme Installer" level="install">
-     <component name="themeinstaller compo" origin-model="Foundation">
+     <component name="themeinstaller_build" origin-model="foundation">
       <unit bldFile="tools/homescreentools/themeinstaller/group"/>
      </component>
     </collection>
     <collection name="themetool" long-name="Theme Tool" level="tool">
-     <component name="themetool compo" origin-model="Foundation">
+     <component name="themetool_build" origin-model="foundation">
       <unit bldFile="tools/homescreentools/themetool/group"/>
      </component>
     </collection>
     <collection name="homescreentools_info" long-name="Home Screen Tools Info" level="install">
-     <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="Foundation">
+     <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="foundation">
       <unit bldFile="tools/homescreentools/group"/>
      </component>
     </collection>
    </block>
    <block name="webuis" long-name="Web UIs" tech_domain="rt" level="services" levels="plugin app">
     <collection name="browserui" long-name="Browser UI" level="app">
-     <component name="browser" long-name="Browser" origin-model="Foundation">
+     <component name="browser" long-name="Browser" origin-model="foundation">
       <unit bldFile="app/webuis/browserui/browser/group"/>
       <!-- <unit bldFile="app/webuis/browserui/browser/launcher2/group"/> -->
      </component>
-     <component name="operatormenu" long-name="Operator Menu" origin-model="Foundation">
+     <component name="operatormenu" long-name="Operator Menu" origin-model="foundation">
       <unit bldFile="app/webuis/browserui/operatormenu/group"/>
      </component>
-     <component name="videoservices" long-name="Video Services" origin-model="Foundation">
+     <component name="videoservices" long-name="Video Services" origin-model="foundation">
       <unit bldFile="app/webuis/browserui/videoservices/group"/>
      </component>
-     <component unofficial="yes" name="browserui_build" long-name="Browser UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="browserui_build" long-name="Browser UI Build" origin-model="foundation">
       <unit bldFile="app/webuis/browserui/group"/>
      </component>
     </collection>
     <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-     <component name="browsersysteminfoplugin" long-name="Browser System Info Plugin" origin-model="Foundation">
+     <component name="browsersysteminfoplugin" long-name="Browser System Info Plugin" origin-model="foundation">
       <unit bldFile="app/webuis/browserplugins/browsersysteminfoplugin/group"/>
      </component>
-     <component name="browsergpsplugin" long-name="Browser GPS Plugin" origin-model="Foundation">
+     <component name="browsergpsplugin" long-name="Browser GPS Plugin" origin-model="foundation">
       <unit bldFile="app/webuis/browserplugins/browsergpsplugin/group"/>
      </component>
-     <component name="browseraudiovideoplugin" long-name="Browser Audio Video Plugin" origin-model="Foundation">
+     <component name="browseraudiovideoplugin" long-name="Browser Audio Video Plugin" origin-model="foundation">
       <unit bldFile="app/webuis/browserplugins/browseraudiovideoplugin/group"/>
      </component>
-     <component unofficial="yes" name="browserplugins_build" long-name="Browser Plugins Build" origin-model="Foundation">
+     <component unofficial="yes" name="browserplugins_build" long-name="Browser Plugins Build" origin-model="foundation">
       <unit bldFile="app/webuis/browserplugins/group"/>
      </component>
     </collection>
     <collection name="pushmtm" long-name="Push MTM" level="plugin">
-     <component name="pushmtm_help" long-name="Help" origin-model="Foundation">
+     <component name="pushmtm_help" long-name="Help" origin-model="foundation">
       <unit bldFile="app/webuis/pushmtm/help/group"/>
      </component>
-     <component name="Plugins" origin-model="Foundation">
+     <component name="plugins" origin-model="foundation">
       <unit bldFile="app/webuis/pushmtm/plugins/group"/>
      </component>
-     <component unofficial="yes" name="pushmtm_build" long-name="Push MTM Build" origin-model="Foundation">
+     <component unofficial="yes" name="pushmtm_build" long-name="Push MTM Build" origin-model="foundation">
       <unit bldFile="app/webuis/pushmtm/group"/>
      </component>
     </collection>
     <collection name="webuis_info" long-name="Web UIs Info" level="app">
-     <component unofficial="yes" name="webuis_build" long-name="Web UIs Build" origin-model="Foundation">
+     <component unofficial="yes" name="webuis_build" long-name="Web UIs Build" origin-model="foundation">
       <unit bldFile="app/webuis/group"/>
      </component>
     </collection>
    </block>
    <block name="java" long-name="Java" tech_domain="rt" level="services" levels="framework util generic rt">
     <collection name="javaextensions" long-name="Java Extensions" level="generic">
-     <component name="eswt" long-name="Eswt" origin-model="Foundation"/>
-     <component name="jsr" long-name="JSR" origin-model="Foundation"/>
-     <component name="supplements" long-name="Supplements" origin-model="Foundation"/>
+     <component name="eswt" long-name="Eswt" origin-model="foundation"/>
+     <component name="jsr" long-name="JSR" origin-model="foundation"/>
+     <component name="supplements" long-name="Supplements" origin-model="foundation"/>
     </collection>
     <collection name="javainstaller" long-name="Java Installer" level="generic">
-     <component name="javarightslistener" long-name="Java Rights Listener" origin-model="Foundation"/>
-     <component name="installplugins" long-name="Install Plugins" origin-model="Foundation"/>
-     <component name="midp2otadownloadplugin" long-name="MIDP2 OTA Download Plugin" origin-model="Foundation"/>
-     <component name="installationfrontend" long-name="Installation Frontend" origin-model="Foundation"/>
-     <component name="midp2iferecognizer" long-name="MIDP2 Interface Rrecognizer" origin-model="Foundation"/>
-     <component name="iferecognizers" long-name="Ife Recognizers" origin-model="Foundation"/>
+     <component name="javarightslistener" long-name="Java Rights Listener" origin-model="foundation"/>
+     <component name="installplugins" long-name="Install Plugins" origin-model="foundation"/>
+     <component name="midp2otadownloadplugin" long-name="MIDP2 OTA Download Plugin" origin-model="foundation"/>
+     <component name="installationfrontend" long-name="Installation Frontend" origin-model="foundation"/>
+     <component name="midp2iferecognizer" long-name="MIDP2 Interface Rrecognizer" origin-model="foundation"/>
+     <component name="iferecognizers" long-name="Ife Recognizers" origin-model="foundation"/>
     </collection>
     <collection name="javalegacy" long-name="Java Legacy" level="util">
-     <component name="JcfCommon" long-name="Jcf Common" origin-model="Foundation"/>
-     <component name="j2me" long-name="J2ME" origin-model="Foundation"/>
+     <component name="jcfcommon" long-name="Jcf Common" origin-model="foundation"/>
+     <component name="j2me" long-name="J2ME" origin-model="foundation"/>
     </collection>
     <collection name="javamanager" long-name="Java Manager" level="framework">
-     <component name="javabackup" long-name="Java Backup" origin-model="Foundation"/>
-     <component name="javaregistry" long-name="Java Registry" origin-model="Foundation"/>
-     <component name="javadrmmanager" long-name="Java DRM Manager" origin-model="Foundation"/>
-     <component name="javasettings" long-name="Java Settings" origin-model="Foundation"/>
+     <component name="javabackup" long-name="Java Backup" origin-model="foundation"/>
+     <!-- Empty duplicate component javaregistry removed -->
+     <component name="javadrmmanager" long-name="Java DRM Manager" origin-model="foundation"/>
+     <component name="javasettings" long-name="Java Settings" origin-model="foundation"/>
     </collection>
     <collection name="javaruntime" long-name="Java Runtime" level="rt">
-     <component name="javaruntime_common" long-name="Common" origin-model="Foundation"/>
-     <component name="temp_j2me_root" long-name="Temp J2me Root" origin-model="Foundation"/>
-     <component name="jvm" long-name="JVM" origin-model="Foundation"/>
-     <component name="eventserver" long-name="Event Server" origin-model="Foundation"/>
-     <component name="javaruntime_utils" long-name="Utilities" origin-model="Foundation"/>
-     <component name="midp2ams" long-name="Midp2ams" origin-model="Foundation"/>
-     <component name="redirserver" long-name="Redirect Server" origin-model="Foundation"/>
+     <!-- Empty duplicate component common removed -->
+     <component name="temp_j2me_root" long-name="Temp J2me Root" origin-model="foundation"/>
+     <component name="jvm" long-name="JVM" origin-model="foundation"/>
+     <component name="eventserver" long-name="Event Server" origin-model="foundation"/>
+     <!-- Empty duplicate component utils removed -->
+     <component name="midp2ams" long-name="Midp2ams" origin-model="foundation"/>
+     <component name="redirserver" long-name="Redirect Server" origin-model="foundation"/>
     </collection>
     <collection name="javautils" long-name="Java Utils" level="util">
-     <component name="jarfiledecoder" long-name="JAR File Decoder" origin-model="Foundation"/>
-     <component name="javareader" long-name="Java Reader" origin-model="Foundation"/>
-     <component name="javapackagelookup" long-name="Java Package Lookup" origin-model="Foundation"/>
-     <component name="javautils_common" long-name="Common" origin-model="Foundation"/>
-     <component name="integrityserver" long-name="Integrity Server" origin-model="Foundation"/>
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javadrmutils" long-name="Java DRM Utils"/>-->
-     <component name="javarecognizer" long-name="Java Recognizer" origin-model="Foundation"/>
-     <component name="iconconverter" long-name="Icon Converter" origin-model="Foundation"/>
-     <component name="adt" long-name="ADT" origin-model="Foundation"/>
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javaenvinfo" long-name="Java Environment Info"/>-->
+     <component name="jarfiledecoder" long-name="JAR File Decoder" origin-model="foundation"/>
+     <component name="javareader" long-name="Java Reader" origin-model="foundation"/>
+     <component name="javapackagelookup" long-name="Java Package Lookup" origin-model="foundation"/>
+     <!-- Empty duplicate component common removed -->
+     <component name="integrityserver" long-name="Integrity Server" origin-model="foundation"/>
+     <!-- Empty duplicate component javadrmutils removed -->
+     <component name="javarecognizer" long-name="Java Recognizer" origin-model="foundation"/>
+     <component name="iconconverter" long-name="Icon Converter" origin-model="foundation"/>
+     <component name="adt" long-name="ADT" origin-model="foundation"/>
+     <!-- Empty duplicate component javaenvinfo removed -->
     </collection>
     <collection name="java_stubs" long-name="Java Stubs" level="util">
      <!--component manually moved to javautils collection-->
@@ -13052,109 +9736,101 @@
      <!--<component name="javaenvinfo" long-name="Java Environment Info">
        <unit bldFile="app/java/java_stubs/javaenvinfo/group"/>
      </component>-->
-     <component name="javaregistry" long-name="Java Registry" origin-model="Foundation">
+     <component name="javaregistry" long-name="Java Registry" origin-model="foundation">
       <unit bldFile="app/java/java_stubs/javaregistry/clientserver/client/group"/>
      </component>
-     <component unofficial="yes" name="java_stubs_build" origin-model="Foundation">
+     <component unofficial="yes" name="java_stubs_build" origin-model="foundation">
       <unit bldFile="app/java/java_stubs/group"/>
      </component>
     </collection>
     <collection name="javatools" long-name="Java Tools" level="generic">
-     <component name="envupdater" long-name="Environment Updater" origin-model="Foundation"/>
+     <component name="envupdater" long-name="Environment Updater" origin-model="foundation"/>
     </collection>
     <collection name="java_info" long-name="Java Info" level="rt">
-     <component unofficial="yes" name="java_build" long-name="Java Build" origin-model="Foundation">
+     <component unofficial="yes" name="java_build" long-name="Java Build" origin-model="foundation">
       <unit bldFile="app/java/group"/>
      </component>
-    </collection>
-    <collection name="java_plat" long-name="Java Platform Interfaces" level="rt">
-     <component unofficial="yes" name="java_registry_api" origin-model="Foundation">
-      <unit bldFile="app/java/java_plat/java_registry_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_superd_parser_api" origin-model="Foundation">
-      <unit bldFile="app/java/java_plat/java_superd_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_env_info_api" origin-model="Foundation">
-      <unit bldFile="app/java/java_plat/java_env_info_api/group"/>
+     <component unofficial="yes" name="java_plat" long-name="Java Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="app/java/java_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
     <collection name="creator" long-name="Creator" level="app">
-     <component name="creator.exe=binary" origin-model="Foundation">
+     <component name="creator_build" origin-model="foundation">
       <unit bldFile="tools/rndtools/creator/group"/>
      </component>
     </collection>
     <collection name="filebrowser" long-name="File Browser" level="specific">
-     <component name="fileopserver" long-name="File Op Server" origin-model="Foundation">
+     <component name="fileopserver" long-name="File Op Server" origin-model="foundation">
       <unit bldFile="tools/rndtools/filebrowser/fileopserver/group"/>
      </component>
-     <component name="fileopclient" long-name="File Op Client" origin-model="Foundation">
+     <component name="fileopclient" long-name="File Op Client" origin-model="foundation">
       <unit bldFile="tools/rndtools/filebrowser/fileopclient/group"/>
      </component>
-     <component unofficial="yes" name="filebrowser_build" long-name="File Browser Build" origin-model="Foundation">
+     <component name="filebrowser_build" origin-model="foundation">
       <unit bldFile="tools/rndtools/filebrowser/group"/>
      </component>
     </collection>
     <collection name="launcher" long-name="Launcher" level="specific">
-     <component name="Launcher.exe=binary" origin-model="Foundation">
+     <component name="launcher_build" origin-model="foundation">
       <unit bldFile="tools/rndtools/launcher/group"/>
      </component>
     </collection>
     <collection name="screengrabber" long-name="Screen Grabber" level="specific">
-     <component name="ScreenGrabber.exe=binary" origin-model="Foundation">
+     <component name="screengrabber_build" origin-model="foundation">
       <unit bldFile="tools/rndtools/screengrabber/group"/>
      </component>
     </collection>
     <collection name="stifui" long-name="STIF UI" level="generic">
-     <component name="stifui" long-name="STIF UI" origin-model="Foundation">
+     <component name="stifui_stifui" long-name="STIF UI" origin-model="foundation">
       <unit bldFile="tools/rndtools/stifui/stifui/group"/>
      </component>
-     <component name="uitestserverstarter" long-name="UI Test Server Starter" origin-model="Foundation">
+     <component name="uitestserverstarter" long-name="UI Test Server Starter" origin-model="foundation">
       <unit bldFile="tools/rndtools/stifui/uitestserverstarter/group"/>
      </component>
-     <component unofficial="yes" name="stifui_build" long-name="STIF UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="stifui_build" long-name="STIF UI Build" origin-model="foundation">
       <unit bldFile="tools/rndtools/stifui/group"/>
      </component>
     </collection>
     <collection name="loadgen" long-name="Load Generator" level="app">
-     <component name="LoadGen.exe=binary" origin-model="Foundation">
+     <component name="loadgen_build" origin-model="foundation">
       <unit bldFile="tools/rndtools/loadgen/group"/>
      </component>
     </collection>
     <collection name="perfmon" long-name="Performance Monitor" level="app">
-     <component name="PerfMon.exe=binary" origin-model="Foundation">
+     <component name="perfmon_build" origin-model="foundation">
       <unit bldFile="tools/rndtools/perfmon/group"/>
      </component>
     </collection>
     <collection name="htiui" long-name="HTI UI" level="generic">
-     <component name="HtiCommPlugins" long-name="HTI Comm Plugins" origin-model="Foundation"/>
-     <component name="HtiServicePlugins" long-name="HTI Service Plugins" origin-model="Foundation"/>
-     <component name="HtiDeviceReboot" long-name="HTI DeviceR eboot" origin-model="Foundation">
+     <!-- Empty duplicate component HtiCommPlugins removed -->
+     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="htidevicereboot" long-name="HTI DeviceR eboot" origin-model="foundation">
       <unit bldFile="tools/rndtools/htiui/htidevicereboot/group"/>
      </component>
-     <component name="HtiStartupWait" long-name="HTI Startup Wait" origin-model="Foundation">
+     <component name="htistartupwait" long-name="HTI Startup Wait" origin-model="foundation">
       <unit bldFile="tools/rndtools/htiui/htistartupwait/group"/>
      </component>
-     <component name="HtiAdmin" long-name="HTI Admin" origin-model="Foundation">
+     <component name="htiadmin" long-name="HTI Admin" origin-model="foundation">
       <unit bldFile="tools/rndtools/htiui/htiadmin/group"/>
      </component>
-     <component unofficial="yes" name="htiui_build" long-name="HTI UI Build" origin-model="Foundation">
+     <component unofficial="yes" name="htiui_build" long-name="HTI UI Build" origin-model="foundation">
       <unit bldFile="tools/rndtools/htiui/group"/>
      </component>
     </collection>
     <collection name="memspyui" long-name="Memspy UI" level="generic">
-     <component name="memspyui.exe=binary" origin-model="Foundation">
+     <component name="memspyui_build" origin-model="foundation">
       <unit bldFile="tools/rndtools/memspyui/group"/>
      </component>
     </collection>
    </block>
    <block name="helps" long-name="Help Apps" tech_domain="ui" level="apps" span="2" levels="eng tools unused  ui">
     <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="ui">
-     <component name="AiwHelpProvider" long-name="Aiw Help Provider" origin-model="Foundation">
+     <component name="aiwhelpprovider" long-name="Aiw Help Provider" origin-model="foundation">
       <!-- <unit bldFile="app/helps/csxhelp/aiwhelpprovider/group"/> -->
      </component>
-     <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build" origin-model="Foundation">
+     <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build" origin-model="foundation">
       <unit bldFile="app/helps/csxhelp/group"/>
      </component>
     </collection>
diff -r 40c430068ab4 -r 2be41f6d21e7 foundation/sysdefs/system_model_os.xml
--- a/foundation/sysdefs/system_model_os.xml	Wed Jul 22 16:40:55 2009 +0100
+++ b/foundation/sysdefs/system_model_os.xml	Fri Jul 24 17:20:56 2009 +0100
@@ -1178,7 +1178,7 @@
 <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
 </component>
 <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="tb91" purpose="development" plugin="Y">
-<unit mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp"/>
+<unit bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp="os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp"/>
 </component>
 <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y">
 <unit bldFile="os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
diff -r 40c430068ab4 -r 2be41f6d21e7 foundation/sysdefs/system_model_s60.xml
--- a/foundation/sysdefs/system_model_s60.xml	Wed Jul 22 16:40:55 2009 +0100
+++ b/foundation/sysdefs/system_model_s60.xml	Fri Jul 24 17:20:56 2009 +0100
@@ -15,7 +15,7 @@
 Tools			to
 Operator Complementary Packages		ocp
 -->
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation">
    <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
@@ -31,30 +31,30 @@
      </component>
     </collection>
     <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-     <component name="drm_stubs compo" long-name="DRM Stubs Component">
+     <component name="drm_stubs_build" long-name="DRM Stubs Component">
       <unit bldFile="adaptation/stubs/drm_stubs/group"/>
      </component>
     </collection>
     <collection name="ptit9core_stub" long-name="PTI T9 Core Stub" level="plugin">
-     <component name="ptit9core_stub compo" long-name="PTI T9 Core Stub Component"/>
+     <component name="ptit9core_stub_build" long-name="PTI T9 Core Stub Component"/>
     </collection>
     <collection name="btaudioadaptation_stub" long-name="BT Audio Adaptation Stub" level="adaptation">
-     <component name="btaudioadaptation_stub.dll=binary">
+     <component name="btaudioadaptation_stub_build">
       <unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
      </component>
     </collection>
     <collection name="posmsgpluginreferenceimpl" long-name="Pos Msg Plugin Reference Implementation" level="plugin">
-     <component name="eposomasuplposrefapp.dll=binary">
+     <component name="eposomasuplposrefapp">
       <unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
      </component>
     </collection>
     <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-     <component name="AsnImplementation.dll=binary" long-name="ASN Imple­ment­ation">
+     <component name="asnimplementation" long-name="ASN Imple­ment­ation">
       <unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
      </component>
     </collection>
     <collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-     <component name="power_save_display_mode_stub.dll=binary">
+     <component name="power_save_display_mode_stub_build">
       <unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
      </component>
     </collection>
@@ -100,7 +100,7 @@
      <component name="featuremanagerstub" long-name="Feature Manager Stub">
       <unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group"/>
      </component>
-     <component name="TVOutConfig" long-name="TVOut Config">
+     <component name="tvoutconfig" long-name="TVOut Config">
       <unit bldFile="adaptation/stubs/systemswstubs/tvoutconfig/group"/>
      </component>
      <component name="hwrmstubplugins" long-name="HWRM Stub Plugins">
@@ -129,17 +129,17 @@
      </component>
     </collection>
     <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-     <component name="tactileclickplugin.dll=binary">
+     <component name="tactileclickplugin_build">
       <unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
      </component>
     </collection>
     <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-     <component name="wlanhwinit.dll=binary">
+     <component name="wlanhwinit">
       <unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
      </component>
     </collection>
     <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-     <component name="ocrsrv.dll=binary">
+     <component name="ocrsrv">
       <unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
      </component>
     </collection>
@@ -152,19 +152,16 @@
       <unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
       <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/group"/>
       <!-- <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/nft/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
      </component>
     </collection>
     <collection name="ofdbus" long-name="OF Dbus" level="utilities">
      <component name="dbus" long-name="Dbus">
       <unit bldFile="os/ossrv/ofdbus/dbus/group"/>
       <unit bldFile="os/ossrv/ofdbus/dbus/tsrc/group"/>
-      <unit bldFile="os/ossrv/ossrv_pub/dbus/group"/>
      </component>
      <component name="dbus-glib" long-name="Dbus glib">
       <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
       <unit bldFile="os/ossrv/ofdbus/dbus-glib/tsrc/group"/>
-      <unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
      </component>
      <component unofficial="yes" name="ofdbus_build" long-name="OF Dbus Build">
       <unit bldFile="os/ossrv/ofdbus/group"/>
@@ -172,12 +169,12 @@
      <component unofficial="yes" name="ofdbus_test" long-name="OF Dbus Test">
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_file_send/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages1/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/file_transfer_time/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages1/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
      </component>
     </collection>
     <collection name="glib" long-name="Glib" level="utilities">
@@ -221,11 +218,11 @@
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/bc/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/graph/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
       <unit bldFile="os/ossrv/stdcpp/tsrc/group"/>
      </component>
     </collection>
@@ -241,275 +238,18 @@
      <component unofficial="yes" name="ossrv_test" long-name="Generic OS Services Test">
       <!-- <unit bldFile="os/ossrv/tsrc/group"/> -->
      </component>
+     <component unofficial="yes" name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" class="api">
+      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+     </component>
      <component unofficial="yes" name="ossrv_build" long-name="Generic OS Services Build">
       <unit bldFile="os/ossrv/group"/>
      </component>
-    </collection>
-    <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-     <component unofficial="yes" name="standard_compressiondecompression_api">
-      <unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_memory_allocation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-     </component>
-     <component unofficial="yes" name="glib_io_channels">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-     </component>
-     <component unofficial="yes" name="cryptogaphy_related_api">
-      <unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_automatic_string_completion">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-     </component>
-     <component unofficial="yes" name="glib_strings">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-     </component>
-     <component unofficial="yes" name="glib_string_utility_functions">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_message_logging">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-     </component>
-     <component unofficial="yes" name="localization_function_api">
-      <unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-     </component>
-     <component unofficial="yes" name="gparamspec">
-      <unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-     </component>
-     <component unofficial="yes" name="wide_character_classapis">
-      <unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_balanced_binary_trees">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-     </component>
-     <component unofficial="yes" name="glib_hook_functions">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_generic_values">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-     </component>
-     <component unofficial="yes" name="glib_varargs_value_collection">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-     </component>
-     <component unofficial="yes" name="glib_caches">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-     </component>
-     <component unofficial="yes" name="no_namespace_headers">
-      <unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-     </component>
-     <component unofficial="yes" name="glib_error_reporting">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-     </component>
-     <component unofficial="yes" name="glib_keyvalue_file_parser">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-     </component>
-     <component unofficial="yes" name="glib_internationalization">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-     </component>
-     <component unofficial="yes" name="utility_apis">
-      <unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_signals">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-     </component>
-     <component unofficial="yes" name="glib_miscellaneous_utility_functions">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_unicode_manipulation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-     </component>
-     <component unofficial="yes" name="glib_memory_slices">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-     </component>
-     <component unofficial="yes" name="glib_nary_trees">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-     </component>
-     <component unofficial="yes" name="exceptions">
-      <unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_date_and_time_functions">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-     </component>
-     <component unofficial="yes" name="debug">
-      <unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_inputoutput_and_data_encoding_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_atomic_operations">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-     </component>
-     <component unofficial="yes" name="glib_asynchronous_queues">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-     </component>
-     <component unofficial="yes" name="glib_random_numbers">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-     </component>
-     <component unofficial="yes" name="gtype">
-      <unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-     </component>
-     <component unofficial="yes" name="ossrv_pub_configuration">
-      <unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-     </component>
-     <component unofficial="yes" name="ssl_protocol_methods_api">
-      <unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-     </component>
-     <component unofficial="yes" name="ssl_general_api">
+     <component unofficial="yes" name="ossrv_pub" long-name="Generic OS Services Public Interfaces" class="api">
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
+      <unit bldFile="os/ossrv/ossrv_pub/group"/>
       <!-- <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_quarks">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-     </component>
-     <component unofficial="yes" name="gboxed">
-      <unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-     </component>
-     <component unofficial="yes" name="memory">
-      <unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_certificates_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-     </component>
-     <component unofficial="yes" name="gobject">
-      <unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-     </component>
-     <component unofficial="yes" name="glib_doublylinked_lists">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-     </component>
-     <component unofficial="yes" name="glib_datasets">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-     </component>
-     <component unofficial="yes" name="glib_character_set_conversion">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-     </component>
-     <component unofficial="yes" name="glib_singlylinked_lists">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-     </component>
-     <component unofficial="yes" name="glib_relations_and_tuples">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-     </component>
-     <component unofficial="yes" name="glib_timers">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-     </component>
-     <component unofficial="yes" name="gtypemodule">
-      <unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-     </component>
-     <component unofficial="yes" name="glib_file_utilities">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-     </component>
-     <component unofficial="yes" name="glib_standard_macros">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_utility_functions_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="compiler_specific_runtime_support">
-      <unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-     </component>
-     <component unofficial="yes" name="glib_simple_xml_subset_parser">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-     </component>
-     <component unofficial="yes" name="glib_enums_and_flags">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-     </component>
-     <component unofficial="yes" name="character_type_apis">
-      <unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_parameters_and_values">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-     </component>
-     <component unofficial="yes" name="glib_lexical_scanner">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-     </component>
-     <component unofficial="yes" name="glib_spawning_processes">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-     </component>
-     <component unofficial="yes" name="glib_closures">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-     </component>
-     <component unofficial="yes" name="glib_arrays">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="crypto_symmetric_ciphers_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-     </component>
-     <component unofficial="yes" name="stl">
       <!-- <unit bldFile="os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-     </component>
-     <component unofficial="yes" name="math_operations_api">
-      <unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-     </component>
-     <component unofficial="yes" name="io_stream_api">
-      <unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-     </component>
-     <component unofficial="yes" name="gtypeplugin">
-      <unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-     </component>
-     <component unofficial="yes" name="boost_apis">
-      <unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="crypto_auxillary_functions_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="cpp_wrappers">
-      <unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-     </component>
-     <component unofficial="yes" name="thread_api">
-      <unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_doubleended_queues">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-     </component>
-     <component unofficial="yes" name="type_attributes">
-      <unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-     </component>
-     <component unofficial="yes" name="glib_main_event_loop">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-     </component>
-     <component unofficial="yes" name="glib_threads">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-     </component>
-     <component unofficial="yes" name="typeinfo">
-      <unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-     </component>
-     <component unofficial="yes" name="glib_globstyle_pattern_matching">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-     </component>
-     <component unofficial="yes" name="glib_dynamic_loading_of_modules">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-     </component>
-     <component unofficial="yes" name="openc_wrappers">
-      <unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-     </component>
-     <component unofficial="yes" name="glib_hash_tables">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-     </component>
-     <component unofficial="yes" name="glib_thread_pools">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-     </component>
-     <component unofficial="yes" name="glib_shellrelated_utilities">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-     </component>
-     <component unofficial="yes" name="openc_headers">
-      <unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_public_key_cryptography_and_key_agreement_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_commandline_option_parser">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_authentication_codes_and_hash_functions_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_basic_types">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-     </component>
-     <component unofficial="yes" name="glib_value_arrays">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
      </component>
     </collection>
    </block>
@@ -521,6 +261,9 @@
       <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/serverexe/group"/> -->
       <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/tsrc/public/basic/group"/> -->
      </component>
+     <component unofficial="yes" name="featuremgmt_build" long-name="Feature Management Build">
+      <unit bldFile="os/devicesrv/featuremgmt/group"/>
+     </component>
     </collection>
    </block>
    <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
@@ -593,7 +336,7 @@
      <component name="commonengineresources" long-name="Common Engine Resources">
       <unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
      </component>
-     <component name="PlatformEnv" long-name="Platform Env">
+     <component name="platformenv" long-name="Platform Env">
       <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
       <unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
       <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/platformver/group"/> -->
@@ -623,10 +366,10 @@
      <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test">
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
      </component>
      <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build">
@@ -634,28 +377,28 @@
      </component>
     </collection>
     <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <component name="ServerExe" long-name="Server Exe">
+     <component name="serverexe" long-name="Server Exe">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/serverexe/group"/> -->
      </component>
      <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
      </component>
-     <component name="ClientDll" long-name="Client DLL">
+     <component name="clientdll" long-name="Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/clientdll/group"/> -->
      </component>
-     <component name="CommonDll" long-name="Common DLL">
+     <component name="commondll" long-name="Common DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/commondll/group"/> -->
      </component>
-     <component name="VibraClientDll" long-name="Vibra Client DLL">
+     <component name="vibraclientdll" long-name="Vibra Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
      </component>
-     <component name="ExtendedLightClientDll" long-name="Extended Light Client DLL">
+     <component name="extendedlightclientdll" long-name="Extended Light Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
      </component>
-     <component name="LightClientDll" long-name="Light Client DLL">
+     <component name="lightclientdll" long-name="Light Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
      </component>
-     <component name="FmTxClientDll" long-name="FM TX Client DLL">
+     <component name="fmtxclientdll" long-name="FM TX Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
      </component>
      <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin">
@@ -703,8 +446,8 @@
     </collection>
     <collection name="mediator" long-name="Mediator" level="app-if">
      <component unofficial="yes" name="mediator_test" long-name="Mediator Test">
+      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/group"/> -->
       <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="mediator_build" long-name="Mediator Build">
       <unit bldFile="os/devicesrv/mediator/group"/>
@@ -776,320 +519,34 @@
       <!-- <unit bldFile="os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
      </component>
     </collection>
-    <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-     <component unofficial="yes" name="vibra_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/vibra_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_channel_api">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-     </component>
-     <component unofficial="yes" name="platform_environment_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+     <component unofficial="yes" name="devicesrv_pub" long-name="Device Services Public Interfaces" class="api">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
+      <unit bldFile="os/devicesrv/devicesrv_pub/group"/>
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
       <!-- <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
-     </component>
-     <component unofficial="yes" name="phone_parser_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
-     </component>
-     <component unofficial="yes" name="sensor_data_compensator_api">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
       <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
-     </component>
-     <component unofficial="yes" name="version_info_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
-     </component>
-     <component unofficial="yes" name="sysutil_api">
       <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="string_loader_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/string_loader_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_platform_security_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="platform_path_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="cone_resource_loader_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/cone_resource_loader_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-     </component>
-     <component unofficial="yes" name="vibra_api">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
       <!-- <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="find_item_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
-     </component>
-     <component unofficial="yes" name="hwrm_power_state_api">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="light_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/light_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
-     </component>
-     <component unofficial="yes" name="text_resolver_api">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_discovery_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
-     </component>
-     <component unofficial="yes" name="accessory_monitoring_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
-     </component>
-    </collection>
-    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-     <component unofficial="yes" name="featuremgmt">
-      <unit bldFile="os/devicesrv/featuremgmt/group"/>
      </component>
      <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build">
       <unit bldFile="os/devicesrv/group"/>
      </component>
-    </collection>
-    <collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="string_resource_reader_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/string_resource_reader_api/group"/>
-     </component>
-     <component unofficial="yes" name="sae_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-     </component>
-     <component unofficial="yes" name="tv_out_config_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_effect_data_getter_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="configuration_file_parser_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_version_info_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_api/group"/>
-     </component>
-     <component unofficial="yes" name="power_state_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/power_state_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_audio_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="lights_commands_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/lights_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_adaptation_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_notification_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_static_registration_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_event_consumer_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_manager_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_reason_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_reason_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_extension_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="security_notification_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/security_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_data_compensator_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="isc_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/isc_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_key_event_handling_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-     </component>
-     <component unofficial="yes" name="tiltcompensation_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_packetizer_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="dos_extension_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_startup_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_startup_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_resource_blocking_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_resource_blocking_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_command_initiator_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-     </component>
-     <component unofficial="yes" name="disk_and_memory_level_keys_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_status_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="remote_control_extension_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_state_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_state_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="vibra_commands_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/vibra_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_event_provider_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_dsy_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_policy_utility_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_state_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_resource_manager_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_resource_manager_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="tspclientmapper_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-     </component>
-     <component unofficial="yes" name="shared_data_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_policy_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_domain_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-     </component>
-     <component unofficial="yes" name="target_modifier_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/target_modifier_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_bluetooth_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="light_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/light_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="wakeup_alarm_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-     </component>
-     <component unofficial="yes" name="activity_manager_api">
+     <component unofficial="yes" name="devicesrv_plat" long-name="Device Services Platform Interfaces" class="api">
       <!-- <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="sim_utils_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sim_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="dos_extension_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_audio_policy_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_audio_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="headset_status_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="display_language_definition_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_info_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_info_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="fm_tx_commands_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/fm_tx_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_content_policy_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/common_content_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_command_responder_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_light_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_light_api/group"/>
-     </component>
-     <component unofficial="yes" name="disk_notification_handler_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="syslangutil_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_channel_filter_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_version_info_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_startup_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_startup_extension_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+      <unit bldFile="os/devicesrv/devicesrv_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
-    <collection name="Data Source Modules" long-name="Generic Positioning Plugins" level="data-acquisition">
+    <collection name="datasourcemodules" long-name="Generic Positioning Plugins">
      <component name="locationnpppsy" long-name="Location NPP PSY">
       <unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
      </component>
@@ -1146,58 +603,15 @@
      <component name="dut" long-name="Dut"/>
      <component name="ping" long-name="Ping"/>
     </collection>
-    <collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-     <component unofficial="yes" name="wlan_sdk_info_api">
-      <unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-     </component>
-    </collection>
     <collection name="wlan_info" long-name="WLAN Info" level="test">
+     <component unofficial="yes" name="wlan_pub" long-name="WLAN Public Interfaces" class="api">
+      <unit bldFile="os/wlan/wlan_pub/group"/>
+     </component>
      <component unofficial="yes" name="wlan_build" long-name="WLAN Build">
       <unit bldFile="os/wlan/group"/>
      </component>
-    </collection>
-    <collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-     <component unofficial="yes" name="wlan_agent_hotspot_plugin_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hal_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_management_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_control_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_info_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hpa_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_eapol_plugin_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_osa_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_device_settings_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hw_initialization_data_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_dbif_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_power_save_plugin_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_spia_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_generic_plugin_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+     <component unofficial="yes" name="wlan_plat" long-name="WLAN Platform Interfaces" class="api">
+      <unit bldFile="os/wlan/wlan_plat/group"/>
      </component>
     </collection>
    </block>
@@ -1245,16 +659,14 @@
      <component unofficial="yes" name="cellularsrv_build" long-name="Cellular Baseband Services Build">
       <unit bldFile="os/cellularsrv/group"/>
      </component>
-    </collection>
-    <collection name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="primary_pdp_context_qos_parameter_setting_api">
-      <unit bldFile="os/cellularsrv/cellularsrv_plat/primary_pdp_context_qos_parameter_setting_api/group"/>
+     <component unofficial="yes" name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" class="api">
+      <unit bldFile="os/cellularsrv/cellularsrv_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
     <collection name="audio" long-name="Audio Codecs" level="middleware">
-     <component name="ARM_CMMF_codecs" long-name="ARM CMMF Codecs">
+     <component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs">
       <unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
      </component>
      <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build">
@@ -1262,7 +674,7 @@
      </component>
     </collection>
     <collection name="video" long-name="Video Codecs" level="middleware">
-     <component name="ARM_MDF_Decoders" long-name="ARM MDF Decoders">
+     <component name="arm_mdf_decoders" long-name="ARM MDF Decoders">
       <unit bldFile="os/mm/video/group"/>
      </component>
     </collection>
@@ -1328,255 +740,37 @@
      </component>
     </collection>
     <collection name="mm_info" long-name="Multimedia Info" level="app-if">
+     <component unofficial="yes" name="mm_pub" long-name="Multimedia Public Interfaces" class="api">
+      <unit bldFile="os/mm/mm_pub/audio_effects_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/group"/>
+     </component>
      <component unofficial="yes" name="mm_build" long-name="Multimedia Build">
       <unit bldFile="os/mm/group"/>
      </component>
      <component unofficial="yes" name="mm_test" long-name="Multimedia Test">
       <!-- <unit bldFile="os/mm/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="custom_interface_message_handler_factory_api">
-      <unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_visualization_api">
-      <unit bldFile="os/mm/mm_plat/audio_visualization_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_proxy_api">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="frametable_api">
-      <unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_decoder_scaling_mdf_custom_interface">
-      <unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_proxy_api">
-      <unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="rds_adaptation_api">
-      <unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_api">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_buffer_management_mdf_custom_interface">
-      <unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_utility_api">
-      <unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="fm_radio_adaptation_api">
-      <unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_audio_routing_manager_api">
-      <unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_proxy_api">
-      <unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaacplusutil_api">
-      <unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_api">
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="display_posting_api">
-      <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_policy_header_api">
-      <unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="nokia_audio_policy_header_api">
-      <unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_api">
-      <unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_proxy_api">
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="mdf_plugin_uids">
-      <unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_builder_api">
-      <unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_audio_settings_definition_api">
-      <unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_fourcc_definitions_api">
-      <unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="devsound_adaptation_api">
-      <unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_api">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_reclaim_extbuffers_ci">
-      <unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_api">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
-     </component>
-     <component unofficial="yes" name="nokia_multimedia_fourcc_definitions_api">
-      <unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_proxy_factory_api">
-      <unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_window_control_custom_interface">
-      <unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_proxy_api">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_audio_routing_client_api">
-      <unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_audio_settings_api">
-      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_api">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_proxy_api">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="secure_output_mdf_custom_interface">
-      <unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_decoder_rotation_mdf_custom_interface">
-      <unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
-     </component>
-    </collection>
-    <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
-     <component unofficial="yes" name="audio_effects_presets_api">
-      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_audio_player_api">
-      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_extension_interfaces_api">
-      <unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_api">
-      <unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
+     <component unofficial="yes" name="mm_plat" long-name="Multimedia Platform Interfaces" class="api">
+      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/audio_routing_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/audio_visualization_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/group"/>
+      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -1596,38 +790,19 @@
      <component name="jp2kcodec" long-name="JP2K Codec">
       <unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
      </component>
-     <component name="H264AVCVideoEncARM" long-name="H264AVC VideoEnc ARM"/>
-     <component name="VideoEncPluginARM" long-name="VideoEnc Plugin ARM"/>
+     <component name="h264avcvideoencarm" long-name="H264AVC VideoEnc ARM"/>
+     <component name="videoencpluginarm" long-name="VideoEnc Plugin ARM"/>
     </collection>
     <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
+     <component unofficial="yes" name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" class="api">
+      <unit bldFile="os/imagingext/imagingext_plat/group"/>
+     </component>
      <component unofficial="yes" name="imagingext_build" long-name="Imaging Extensions Build">
       <unit bldFile="os/imagingext/group"/>
      </component>
-    </collection>
-    <collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="h324_annex_k_custom_api">
-      <unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="jpeg2000_icl_plugin_api">
-      <unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_face_tracking_custom_api">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_orientation_custom_api">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_icl_jpeg_api">
-      <unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_ui_orientation_override_custom_api">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-     </component>
-    </collection>
-    <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-     <component unofficial="yes" name="exif_api">
+     <component unofficial="yes" name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" class="api">
       <!-- <unit bldFile="os/imagingext/imagingext_pub/exif_api/tsrc/group"/> -->
-      <unit bldFile="os/imagingext/imagingext_pub/exif_api/group"/>
+      <unit bldFile="os/imagingext/imagingext_pub/group"/>
      </component>
     </collection>
    </block>
@@ -1636,7 +811,7 @@
      <component name="vgi" long-name="VGI">
       <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
      </component>
-     <component name="2D_OpenVG_1_0" long-name="2D Open VG 1.0"/>
+     <component name="2d_openvg_1_0" long-name="2D Open VG 1.0"/>
      <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1"/>
     </collection>
     <collection name="m3g" long-name="M3G" level="internal-adaptations">
@@ -1644,26 +819,19 @@
       <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
      </component>
     </collection>
-    <collection name="graphics_pub" long-name="Graphics Public Interfaces" level="app-if">
-     <component unofficial="yes" name="graphics_pub_build" long-name="Graphics Public API Build">
-      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
-     </component>
-    </collection>
     <collection name="graphics_info" long-name="Graphics Info" level="app-if">
      <component unofficial="yes" name="graphicssvs">
+      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
       <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
+     </component>
+     <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api">
+      <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
      </component>
      <component unofficial="yes" name="graphics_build" long-name="Graphics Build">
       <unit bldFile="os/graphics/group"/>
      </component>
-    </collection>
-    <collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="openvg_binding_api">
-      <unit bldFile="os/graphics/graphics_plat/openvg_binding_api/group"/>
-     </component>
-     <component unofficial="yes" name="m3g_core_api">
-      <unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
+     <component unofficial="yes" name="graphics_plat" long-name="Graphics Platform Interfaces" class="api">
+      <unit bldFile="os/graphics/graphics_plat/group"/>
      </component>
     </collection>
    </block>
@@ -1680,10 +848,10 @@
      <!--<component name="charconvplugins"/>-->
     </collection>
     <collection name="textandlocutils" level="util">
-     <component name="Localizer" long-name="Localizer">
+     <component name="localizer" long-name="Localizer">
       <unit bldFile="os/textandloc/charconvfw/localizer/group"/>
      </component>
-     <component name="Findutil" long-name="Find Util">
+     <component name="findutil" long-name="Find Util">
       <unit bldFile="os/textandloc/charconvfw/findutil/group"/>
      </component>
      <component name="numbergrouping" long-name="Number Grouping">
@@ -1692,50 +860,31 @@
      <component name="gamerecognizer" long-name="Game Recognizer">
       <unit bldFile="os/textandloc/charconvfw/gamerecognizer/group"/>
      </component>
-     <component name="JPLangUtil" long-name="JP Lang Util">
+     <component name="jplangutil" long-name="JP Lang Util">
       <unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
      </component>
-     <component name="SortUtil" long-name="Sort Util">
+     <component name="sortutil" long-name="Sort Util">
       <unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
      </component>
-     <component name="AknJapaneseReading" long-name="Akn Japanese Reading">
+     <component name="aknjapanesereading" long-name="Akn Japanese Reading">
       <unit bldFile="os/textandloc/charconvfw/aknjapanesereading/group"/>
      </component>
      <component name="inlinetext" long-name="Inline Text">
       <unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
      </component>
     </collection>
-    <collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-     <component unofficial="yes" name="directory_localizer_api">
-      <unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_api">
-      <unit bldFile="os/textandloc/textandloc_pub/character_conversion_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_plugin_provider_api">
+    <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+     <component unofficial="yes" name="textandloc_pub" long-name="Text and Localisation Public Interfaces" class="api">
       <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
-      <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/group"/>
-     </component>
-    </collection>
-    <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+      <unit bldFile="os/textandloc/textandloc_pub/group"/>
+     </component>
      <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build">
       <unit bldFile="os/textandloc/group"/>
      </component>
-    </collection>
-    <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-     <component unofficial="yes" name="findutil_api">
-      <unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
+     <component unofficial="yes" name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" class="api">
       <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="japanese_language_utilities_api">
-      <unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_nonpublic_api">
-      <unit bldFile="os/textandloc/textandloc_plat/character_conversion_nonpublic_api/group"/>
-     </component>
-     <component unofficial="yes" name="sortutil_api">
+      <unit bldFile="os/textandloc/textandloc_plat/group"/>
       <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
-      <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
      </component>
     </collection>
    </block>
@@ -1778,86 +927,37 @@
      </component>
     </collection>
     <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
+     <component unofficial="yes" name="xmlsrv_plat" long-name="XML Services Platform Interfaces" class="api">
+      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="xmlsrv_build" long-name="XML Services Build">
       <unit bldFile="os/xmlsrv/group"/>
      </component>
-    </collection>
-    <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="xml_engine_serializer_api">
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_utils_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_xml_pointer_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_pointer_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_encryption_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="libxml2_xml_schemas_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_schemas_api/group"/>
-     </component>
-     <component unofficial="yes" name="xmlsrv_plat_build" long-name="XML Services Platform API Build">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="xml_engine_xpath_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_security_engine_utils_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_engine_utils_api">
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_canonical_xml_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_canonical_xml_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_signature_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="libxml2_xpath_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xpath_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_engine_deserializer_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_deserializer_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_xml_linking_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_linking_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_parser_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_parser_api/group"/>
-     </component>
-    </collection>
-    <collection name="xmlsrv_pub" long-name="XML Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="xml_engine_dom_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/group"/>
+     <component unofficial="yes" name="xmlsrv_pub" long-name="XML Services Public Interfaces" class="api">
+      <unit bldFile="os/xmlsrv/xmlsrv_pub/group"/>
       <!-- <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="xmlsrv_pub_build" long-name="XML Services Public API Build">
-      <unit bldFile="os/xmlsrv/xmlsrv_pub/group"/>
-     </component>
     </collection>
    </block>
    <block name="deviceplatformrelease" long-name="Device Platform Release" tech_domain="to" level="services" levels="bld mid top">
-    <collection name="S60Extras" long-name="S60 Extras" level="mid">
-     <component name="S60Extras compo" long-name="S60 Extras Component">
+    <collection name="s60extras" long-name="S60 Extras" level="mid">
+     <component name="s60extras_build" long-name="S60 Extras Component">
       <unit bldFile="os/deviceplatformrelease/s60extras/group"/>
      </component>
     </collection>
-    <collection name="S60LocFiles" long-name="S60 Loc Files" level="mid">
-     <component name="S60LocFiles compo" long-name="S60 Loc Files Component">
+    <collection name="s60locfiles" long-name="S60 Loc Files" level="mid">
+     <component name="s60locfiles_build" long-name="S60 Loc Files Component">
       <unit bldFile="os/deviceplatformrelease/s60locfiles/group"/>
      </component>
     </collection>
-    <collection name="Version" long-name="Version" level="top">
-     <component name="Version compo" long-name="Version Component">
+    <collection name="version" long-name="Version" level="top">
+     <component name="version_build" long-name="Version Component">
       <unit bldFile="os/deviceplatformrelease/version/group"/>
      </component>
     </collection>
@@ -1877,72 +977,72 @@
    </block>
    <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
     <collection name="stif" long-name="STIF" level="fw">
-     <component name="TestInterface" long-name="Test Interface">
+     <component name="testinterface" long-name="Test Interface">
       <unit bldFile="ostools/osrndtools/stif/testinterface/group"/>
      </component>
-     <component name="TestServer" long-name="Test Server">
+     <component name="testserver" long-name="Test Server">
       <unit bldFile="ostools/osrndtools/stif/testserver/group"/>
      </component>
-     <component name="TestEngine" long-name="Test Engine">
+     <component name="testengine" long-name="Test Engine">
       <unit bldFile="ostools/osrndtools/stif/testengine/group"/>
      </component>
-     <component name="TestServerStarter" long-name="Test Server Starter">
+     <component name="testserverstarter" long-name="Test Server Starter">
       <unit bldFile="ostools/osrndtools/stif/testserverstarter/group"/>
      </component>
-     <component name="StifTFwIf" long-name="STIF TFwIf">
+     <component name="stiftfwif" long-name="STIF TFwIf">
       <unit bldFile="ostools/osrndtools/stif/stiftfwif/group"/>
      </component>
-     <component name="ConsoleUI" long-name="Console UI">
+     <component name="consoleui" long-name="Console UI">
       <unit bldFile="ostools/osrndtools/stif/consoleui/group"/>
      </component>
-     <component name="TestCombiner" long-name="Test Combiner">
+     <component name="testcombiner" long-name="Test Combiner">
       <unit bldFile="ostools/osrndtools/stif/testcombiner/group"/>
      </component>
-     <component name="DemoModule" long-name="Demo Module">
+     <component name="demomodule" long-name="Demo Module">
       <unit bldFile="ostools/osrndtools/stif/demomodule/group"/>
      </component>
-     <component name="ATSLogger" long-name="ATS Logger">
+     <component name="atslogger" long-name="ATS Logger">
       <unit bldFile="ostools/osrndtools/stif/atslogger/group"/>
      </component>
-     <component name="ATSInterface" long-name="ATS Interface">
+     <component name="atsinterface" long-name="ATS Interface">
       <unit bldFile="ostools/osrndtools/stif/atsinterface/group"/>
      </component>
-     <component name="TestScripter" long-name="Test Scripter">
+     <component name="testscripter" long-name="Test Scripter">
       <unit bldFile="ostools/osrndtools/stif/testscripter/group"/>
      </component>
-     <component name="SUEvent" long-name="SU Event">
+     <component name="suevent" long-name="SU Event">
       <unit bldFile="ostools/osrndtools/stif/suevent/group"/>
      </component>
-     <component name="StifKernelTestClassBase" long-name="STIF Kernel Test Class Base">
+     <component name="stifkerneltestclassbase" long-name="STIF Kernel Test Class Base">
       <unit bldFile="ostools/osrndtools/stif/stifkerneltestclassbase/group"/>
      </component>
      <component name="examples" long-name="Examples">
       <!-- <unit bldFile="ostools/osrndtools/stif/examples/stiftestmeasurementstub/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/examples/stifhwresetstub/group"/> -->
      </component>
-     <component name="TestModuleTemplates" long-name="Test Module Templates">
+     <component name="testmoduletemplates" long-name="Test Module Templates">
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/capsmodifierxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/testmodulexxx/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
      </component>
      <component unofficial="yes" name="stif_build" long-name="STIF Build">
       <unit bldFile="ostools/osrndtools/stif/group"/>
      </component>
     </collection>
     <collection name="memspy" long-name="Memspy" level="trace">
-     <component name="Driver">
+     <component name="driver">
       <unit bldFile="ostools/osrndtools/memspy/driver/group"/>
      </component>
-     <component name="Engine">
+     <component name="memspy_engine">
       <unit bldFile="ostools/osrndtools/memspy/engine/group"/>
      </component>
-     <component name="CommandLine">
+     <component name="commandline">
       <unit bldFile="ostools/osrndtools/memspy/commandline/group"/>
      </component>
-     <component name="Console">
+     <component name="console">
       <unit bldFile="ostools/osrndtools/memspy/console/group"/>
      </component>
      <component unofficial="yes" name="memspy_build" long-name="Memspy Build">
@@ -1950,45 +1050,36 @@
      </component>
     </collection>
     <collection name="hti" long-name="HTI" level="trace">
-     <component name="HtiCfg">
+     <component name="hticfg">
       <unit bldFile="ostools/osrndtools/hti/hticfg/group"/>
      </component>
-     <component name="HtiAutoStart">
+     <component name="htiautostart">
       <unit bldFile="ostools/osrndtools/hti/htiautostart/group"/>
      </component>
-     <component name="HtiFramework">
+     <component name="htiframework">
       <unit bldFile="ostools/osrndtools/hti/htiframework/group"/>
      </component>
-     <component name="HtiCommPlugins" long-name="HTI Comm Plugins"/>
-     <component name="HtiServicePlugins" long-name="HTI Service Plugins"/>
-     <component name="HtiFileHlp">
+     <!-- Empty duplicate component HtiCommPlugins removed -->
+     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="htifilehlp">
       <unit bldFile="ostools/osrndtools/hti/htifilehlp/group"/>
      </component>
-     <component name="HtiWatchDog">
+     <component name="htiwatchdog">
       <unit bldFile="ostools/osrndtools/hti/htiwatchdog/group"/>
      </component>
      <component unofficial="yes" name="hti_build" long-name="HTI Build">
       <unit bldFile="ostools/osrndtools/hti/group"/>
      </component>
     </collection>
-    <collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
-     <component unofficial="yes" name="memspy_api">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
-     </component>
-     <component unofficial="yes" name="stif_api">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/stif_api/group"/>
-     </component>
-     <component unofficial="yes" name="hti_api">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/hti_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_system_trace_api">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
+    <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
+     <component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build">
+      <unit bldFile="ostools/osrndtools/group"/>
      </component>
     </collection>
    </block>
    <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
     <collection name="gid_pc_tool" long-name="GID PC Tool">
-     <component name="DBImporter" long-name="DB Importer">
+     <component name="dbimporter" long-name="DB Importer">
       <unit bldFile="tools/swconfigtools/gid_pc_tool/group"/>
      </component>
     </collection>
@@ -2005,15 +1096,7 @@
      <component unofficial="yes" name="shortlinksrv_build">
       <unit bldFile="os/shortlinksrv/group"/>
      </component>
-    </collection>
-    <collection name="shortlinksrv_plat">
-     <component unofficial="yes" name="bluetooth_power_management_api">
-      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/bluetooth_power_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_audio_adaptation_api">
-      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/bluetooth_audio_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="shortlinksrv_plat_build">
+     <component unofficial="yes" name="shortlinksrv_plat" class="api">
       <unit bldFile="os/shortlinksrv/shortlinksrv_plat/group"/>
      </component>
     </collection>
@@ -2042,7 +1125,7 @@
      </component>
     </collection>
     <collection name="gssettingsuis" long-name="GS Settings UIs" level="specific">
-     <component name="Gs" long-name="GS">
+     <component name="gs" long-name="GS">
       <unit bldFile="mw/appsupport/gssettingsuis/gs/group"/>
       <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/gsdiagnosticsplugin"/> -->
       <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/gsprslnplugin"/> -->
@@ -2050,18 +1133,18 @@
      </component>
     </collection>
     <collection name="profilesservices" long-name="Profiles Services" level="server">
-     <component name="FileList" long-name="File List">
+     <component name="filelist" long-name="File List">
       <unit bldFile="mw/appsupport/profilesservices/filelist/group"/>
       <unit bldFile="mw/appsupport/profilesservices/filelist/tsrc/public/basic/group"/>
      </component>
-     <component name="MediaFileList" long-name="Media File List">
+     <component name="mediafilelist" long-name="Media File List">
       <unit bldFile="mw/appsupport/profilesservices/mediafilelist/group"/>
      </component>
-     <component name="ProfileEngine" long-name="Profile Engine">
+     <component name="profileengine" long-name="Profile Engine">
       <unit bldFile="mw/appsupport/profilesservices/profileengine/group"/>
       <unit bldFile="mw/appsupport/profilesservices/profileengine/tsrc/public/basic/group"/>
      </component>
-     <component name="RingingTone3DPlugin" long-name="Ringing Tone 3D Plugin">
+     <component name="ringingtone3dplugin" long-name="Ringing Tone 3D Plugin">
       <unit bldFile="mw/appsupport/profilesservices/ringingtone3dplugin/group"/>
      </component>
      <component unofficial="yes" name="profilesservices_test" long-name="Profiles Services Test">
@@ -2069,7 +1152,7 @@
      </component>
     </collection>
     <collection name="flashliteapi_3_1" long-name="Flashlite API 3.1" level="specific">
-     <component name="flashliteapi_3_1 compo"/>
+     <component name="flashliteapi_3_1_build"/>
     </collection>
     <collection name="contextframework" long-name="Context Framework" level="framework">
      <component name="cfw" long-name="Context Framework">
@@ -2085,10 +1168,10 @@
      </component>
     </collection>
     <collection name="mediakeys" long-name="Media Keys" level="plugin">
-     <component name="KeyPublisherPlugin" long-name="Key Publisher Plugin">
+     <component name="keypublisherplugin" long-name="Key Publisher Plugin">
       <!-- <unit bldFile="mw/appsupport/mediakeys/keypublisherplugin/group"/> -->
      </component>
-     <component name="MMKeyBearer" long-name="MM Key Bearer">
+     <component name="mmkeybearer" long-name="MM Key Bearer">
       <!-- <unit bldFile="mw/appsupport/mediakeys/mmkeybearer/group"/> -->
      </component>
      <component unofficial="yes" name="mediakeys_build" long-name="Media Keys Build">
@@ -2096,13 +1179,13 @@
      </component>
     </collection>
     <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-     <component name="DbRecovery" long-name="Db Recovery">
+     <component name="dbrecovery" long-name="Db Recovery">
       <unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
      </component>
-     <component name="NspsWsPlugin" long-name="Nsps WS Plugin">
+     <component name="nspswsplugin" long-name="Nsps WS Plugin">
       <unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
      </component>
-     <component name="Rfs" long-name="RFS">
+     <component name="rfs" long-name="RFS">
       <unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfs/plugins/gsrfsplugin/group"/> -->
      </component>
@@ -2111,10 +1194,10 @@
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group"/> -->
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group"/> -->
      </component>
-     <component name="SysAp" long-name="Sys Ap">
+     <component name="sysap" long-name="Sys Ap">
       <unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
      </component>
-     <component name="VariatedSettings" long-name="Variated Settings">
+     <component name="variatedsettings" long-name="Variated Settings">
       <unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
      </component>
      <component name="accfwuinotifier" long-name="ACC Framework UI Notifier">
@@ -2135,10 +1218,10 @@
      <component name="gsserverenginestub" long-name="GS Server Engine Stub">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
      </component>
-     <component name="GSServerEngine" long-name="GS Server Engine">
+     <component name="gsserverengine" long-name="GS Server Engine">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
      </component>
-     <component name="GSServer" long-name="GS Server">
+     <component name="gsserver" long-name="GS Server">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserver/group"/>
      </component>
      <component name="sensordatacompensatorplugin" long-name="Sensor Data Compensator Plugin">
@@ -2154,10 +1237,10 @@
      </component>
     </collection>
     <collection name="startupservices" long-name="Startup Services" level="system">
-     <component name="SplashScreen" long-name="Splash Screen">
+     <component name="splashscreen" long-name="Splash Screen">
       <unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
      </component>
-     <component name="Startup">
+     <component name="startup">
       <unit bldFile="mw/appsupport/startupservices/startup/group"/>
       <!-- <unit bldFile="mw/appsupport/startupservices/startup/mediatorplugin/group"/> -->
       <!-- <unit bldFile="mw/appsupport/startupservices/startup/startupsyncplugin/group"/> -->
@@ -2174,155 +1257,28 @@
      <component name="gssensorplugin" long-name="GS Sensor Plugin">
       <unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
      </component>
-     <component name="GSAccessoryPlugin" long-name="GS Accessory Plugin">
+     <component name="gsaccessoryplugin" long-name="GS Accessory Plugin">
       <unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
      </component>
      <component unofficial="yes" name="systemsettings_build" long-name="System Settings Build">
       <unit bldFile="mw/appsupport/systemsettings/group"/>
      </component>
     </collection>
-    <collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-     <component unofficial="yes" name="settings_launch_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/group"/>
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="secondary_display_startup_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_accfw_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_subscription_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_user_setting_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-     </component>
-     <component unofficial="yes" name="action_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="application_orientation_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-     </component>
-     <component unofficial="yes" name="filelist_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/filelist_api/group"/>
-     </component>
-     <component unofficial="yes" name="restore_factory_settings_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_source_settings_manager_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="oom_monitor_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_configuration_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_client_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_listbox_api">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_framework_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/group"/>
+    <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
+     <component unofficial="yes" name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/group"/>
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="context_framework_listener_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_version_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_source_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="oom_monitor_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_services_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_plugin_callback_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_mediafilelist_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/profiles_mediafilelist_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_uis_cenrep_collection_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_uis_cenrep_collection_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_notification_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_sysap_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-     </component>
-     <component unofficial="yes" name="ood_threshold_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_backgroundimage_api">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/group"/>
-     </component>
-     <component unofficial="yes" name="restore_factory_settings_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_keys_definition_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_system_state_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_light_control_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="operation_provider_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_engine_api">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_key_handler_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_access_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_framework_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_framework_mapper_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonecmdhandler_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-     </component>
-    </collection>
-    <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-     <component unofficial="yes" name="profiles_engine_active_profile_settings_api">
-      <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_active_profile_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="flash_viewer_framework_api">
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="appsupport_pub" long-name="Generic Application Support Public Interfaces" class="api">
       <!-- <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="network_status_api">
+      <unit bldFile="mw/appsupport/appsupport_pub/group"/>
       <!-- <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_engine_wrapper_api">
-      <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/group"/>
       <!-- <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/> -->
      </component>
-    </collection>
-    <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
      <component unofficial="yes" name="appsupport_build" long-name="Generic Application Support Build">
       <unit bldFile="mw/appsupport/group"/>
      </component>
@@ -2350,18 +1306,18 @@
      </component>
     </collection>
     <collection name="wim" long-name="WIM" level="framework">
-     <component name="SwimReader" long-name="Swim Reader"/>
-     <component name="Scard" long-name="S Card"/>
-     <component name="WimUtil" long-name="WIM Util"/>
-     <component name="WimServer" long-name="WIM Server"/>
-     <component name="WimClient" long-name="WIM Client"/>
-     <component name="WimPlugin" long-name="WIM Plugin"/>
+     <component name="swimreader" long-name="Swim Reader"/>
+     <component name="scard" long-name="S Card"/>
+     <component name="wimutil" long-name="WIM Util"/>
+     <component name="wimserver" long-name="WIM Server"/>
+     <component name="wimclient" long-name="WIM Client"/>
+     <component name="wimplugin" long-name="WIM Plugin"/>
      <component unofficial="yes" name="wim_build" long-name="WIM Build">
       <unit bldFile="mw/securitysrv/wim/group"/>
      </component>
     </collection>
     <collection name="cms" long-name="Certificate Management Services" level="generic">
-     <component name="CMS.Dll=binary" long-name="CMS">
+     <component name="cms_build" long-name="CMS">
       <unit bldFile="mw/securitysrv/cms/group"/>
      </component>
     </collection>
@@ -2369,41 +1325,41 @@
      <component name="x509certnameparser" long-name="X509cert Name Parser">
       <unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
      </component>
-     <component name="PKCS12">
+     <component name="pkcs12">
       <unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
      </component>
-     <component name="CertmanUi" long-name="Certman UI">
+     <component name="certmanui" long-name="Certman UI">
       <unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
      </component>
-     <component name="CTSecurityDialogs" long-name="CT Security Dialogs">
+     <component name="ctsecuritydialogs" long-name="CT Security Dialogs">
       <unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
      </component>
-     <component name="CertSaver" long-name="Cert Saver">
+     <component name="certsaver" long-name="Cert Saver">
       <unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
      </component>
-     <component name="SecModUI" long-name="Sec Mod UI">
+     <component name="secmodui" long-name="Sec Mod UI">
       <unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
      </component>
-     <component name="DeviceToken" long-name="Device Token">
+     <component name="devicetoken" long-name="Device Token">
       <unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
      </component>
-     <component name="Certificates">
+     <component name="certificates">
       <unit bldFile="mw/securitysrv/pkiutilities/certificates/group"/>
      </component>
-     <component name="Certificates_OEM"/>
+     <component name="certificates_oem"/>
      <component unofficial="yes" name="pkiutilities_build" long-name="PKI Utilities Build">
       <unit bldFile="mw/securitysrv/pkiutilities/group"/>
      </component>
     </collection>
     <collection name="remotelock" long-name="Remote Lock" level="server">
-     <component name="RemotelockSettings" long-name="Remote Lock Settings"/>
-     <component name="RemoteLockEngine" long-name="Remote Lock Engine"/>
+     <component name="remotelocksettings" long-name="Remote Lock Settings"/>
+     <component name="remotelockengine" long-name="Remote Lock Engine"/>
      <component unofficial="yes" name="remotelock_build" long-name="Remote Lock Build">
       <unit bldFile="mw/securitysrv/remotelock/group"/>
      </component>
     </collection>
     <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-     <component name="TrkDummy" long-name="Trk Dummy">
+     <component name="trkdummy" long-name="Trk Dummy">
       <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/trkdummy/group"/> -->
      </component>
      <component unofficial="yes" name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build">
@@ -2414,16 +1370,16 @@
      <component name="keylockpolicyapi" long-name="Keylock Policy Api">
       <unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
      </component>
-     <component name="Autolock">
+     <component name="autolock">
       <unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
      </component>
-     <component name="SecUi" long-name="Sec UI">
+     <component name="secui" long-name="Sec UI">
       <unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
      </component>
-     <component name="Securitynotifier" long-name="Security Notifier">
+     <component name="securitynotifier" long-name="Security Notifier">
       <unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
      </component>
-     <component name="Securityobserver" long-name="Security Observer">
+     <component name="securityobserver" long-name="Security Observer">
       <unit bldFile="mw/securitysrv/securitydialogs/securityobserver/group"/>
      </component>
      <component unofficial="yes" name="securitydialogs_build" long-name="Security Dialogs Build">
@@ -2431,56 +1387,14 @@
      </component>
     </collection>
     <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-     <component unofficial="yes" name="provisioning_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-     </component>
-     <component unofficial="yes" name="cms_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-     </component>
-     <component unofficial="yes" name="gba_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-     </component>
-     <component unofficial="yes" name="remote_lock_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-     </component>
-     <component unofficial="yes" name="x509certnameparser_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-     </component>
-     <component unofficial="yes" name="devicelock_access_api">
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="keylock_policy_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="wim_cert_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-     </component>
-     <component unofficial="yes" name="keyguard_configuration_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="lockapp_server_api">
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
-     </component>
      <component unofficial="yes" name="securitysrv_build" long-name="Security Services Build">
       <unit bldFile="mw/securitysrv/group"/>
      </component>
-     <component unofficial="yes" name="pkcs12_parser_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="keyguard_access_api">
+     <component unofficial="yes" name="secsrv_plat" class="api">
+      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
+      <unit bldFile="mw/securitysrv/secsrv_plat/group"/>
       <!-- <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="device_key_store_encryption_plugin_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_utils_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="pkidialog_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="security_code_ui_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
      </component>
      <component unofficial="yes" name="securitysrv_test" long-name="Security Services Test">
       <!-- <unit bldFile="mw/securitysrv/tsrc/group"/> -->
@@ -2554,72 +1468,23 @@
       <unit bldFile="mw/drm/wmdrm/group"/>
      </component>
     </collection>
-    <collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-     <component unofficial="yes" name="oma_drm_caf_agent_api">
-      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_license_checker_api">
+    <collection name="drm_info" long-name="DRM Info" level="specific">
+     <component unofficial="yes" name="drm_pub" long-name="DRM Public Interfaces" class="api">
+      <!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_helper_api">
-      <!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
-     </component>
-    </collection>
-    <collection name="drm_info" long-name="DRM Info" level="specific">
+      <unit bldFile="mw/drm/drm_pub/group"/>
+      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
+     </component>
+     <component unofficial="yes" name="drm_plat" long-name="DRM Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
+      <unit bldFile="mw/drm/drm_plat/group"/>
+      <!-- <unit bldFile="mw/drm/drm_plat/roap_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="drm_build" long-name="DRM Build">
       <unit bldFile="mw/drm/group"/>
      </component>
     </collection>
-    <collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-     <component unofficial="yes" name="drm_plat_build" long-name="DRM Platform API Build">
-      <unit bldFile="mw/drm/drm_plat/group"/>
-     </component>
-     <component unofficial="yes" name="camese_utility_api">
-      <unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="camese_framework_api">
-      <unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_common_api">
-      <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="roap_api">
-      <unit bldFile="mw/drm/drm_plat/roap_api/group"/>
-      <!-- <unit bldFile="mw/drm/drm_plat/roap_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="drm_license_manager_api">
-      <unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_agents_api">
-      <unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_legacy_api">
-      <unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-     </component>
-     <component unofficial="yes" name="dcf_repository_api">
-      <unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_utility_api">
-      <unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_service_api">
-      <unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_rights_api">
-      <unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
-      <!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="wmdrm_core_api">
-      <unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_secondary_display_api">
-      <unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="accesssec" long-name="Access Security" tech_domain="se" level="generic" levels="plugin framework server generic specific">
     <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
@@ -2650,54 +1515,10 @@
       <unit bldFile="mw/accesssec/eapol/group"/>
      </component>
     </collection>
-    <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-     <component unofficial="yes" name="eapsim_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapleap_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaptlspeap_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="wep_security_settings_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="eap_type_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-     </component>
-     <component unofficial="yes" name="wapi_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eap_vpn_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-     </component>
-     <component unofficial="yes" name="wpa_security_settings_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="accesssec_plat_build" long-name="Access Security Platform API Build">
+    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
+     <component unofficial="yes" name="accesssec_plat" long-name="Access Security Platform Interfaces" class="api">
       <unit bldFile="mw/accesssec/accesssec_plat/group"/>
      </component>
-     <component unofficial="yes" name="eapmschapv2_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapgtc_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="wi-fi_protected_setup_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="wapi_security_settings_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_eap_settings_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapaka_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-     </component>
-    </collection>
-    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
      <component unofficial="yes" name="accesssec_build" long-name="Access Security Build">
       <unit bldFile="mw/accesssec/group"/>
      </component>
@@ -2782,154 +1603,67 @@
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
      </component>
      <component unofficial="yes" name="locationtriggering_build" long-name="Location Triggering Build">
       <unit bldFile="mw/locationsrv/locationtriggering/group"/>
      </component>
     </collection>
     <collection name="locationsrv_info" long-name="Location Services Info" level="interface">
-     <component unofficial="yes" name="location_notation_preferences_settings_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_local_variation_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
-     </component>
-     <component unofficial="yes" name="supl_settings_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_and_navigation_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
+     <component unofficial="yes" name="locsrv_plat" class="api">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <unit bldFile="mw/locationsrv/locsrv_plat/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_settings_notifier_secondary_display_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="privacy_notifiers_secondary_display_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_triggering_status_information_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_image_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_centre_registration_api">
-      <unit bldFile="mw/locationsrv/locsrv_pub/location_centre_registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_category_definition_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_centre_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="landmarks_database_management_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="np_proxy_configuration_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="genericpositioningplugins">
       <unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
      </component>
-     <component unofficial="yes" name="landmarks_search_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_terminal_initiation_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-     </component>
      <component unofficial="yes" name="locationsrv_test" long-name="Location Services Test">
       <!-- <unit bldFile="mw/locationsrv/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="location_triggering_api">
-      <unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_image_conversion_plugin_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_pos_message_plugin_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="oma_supl_asn_codec_plugin_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="geocoding_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
-     </component>
-     <component unofficial="yes" name="map_and_navigation_provider_discovery_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_and_navigation_provider_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_supl_configuration_parameter_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="blid_application_satellite_info_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
-     </component>
      <component unofficial="yes" name="locationsrv_build" long-name="Location Services Build">
       <unit bldFile="mw/locationsrv/group"/>
      </component>
-     <component unofficial="yes" name="supl_query_secondary_display_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_triggering_management_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_settings_launch_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_api">
+     <component unofficial="yes" name="locsrv_pub" class="api">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
+      <unit bldFile="mw/locationsrv/locsrv_pub/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="map_and_navigation_aiw_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-     </component>
-     <component unofficial="yes" name="psy_configuration_ui_plugin_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="supl_network_initiation_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
@@ -3018,65 +1752,14 @@
      </component>
     </collection>
     <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-     <component unofficial="yes" name="data_connection_log_counters_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
-     </component>
-     <component unofficial="yes" name="commsdat_wlan_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_monitor_server_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="disconnect_dialog_disable_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-     </component>
-     <component unofficial="yes" name="agent_dialog_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="disconnect_dialog_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-     </component>
      <component unofficial="yes" name="ipconnmgmt_build" long-name="IP Connectivity Management Build">
       <unit bldFile="mw/ipconnmgmt/group"/>
      </component>
-     <component unofficial="yes" name="connection_monitor_extension_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_engine_misc_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_settings_ui_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_engine_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_connection_settings_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_ui_utilities_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_settings_handler_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="bearer_settings_plugin_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="pdpcontextmanager2_settings_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpm_connect_screen_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_settings_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="pdpcontextmanager2_reset_factory_settings_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpm_default_connection_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+     <component unofficial="yes" name="ipcm_pub" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/group"/>
+     </component>
+     <component unofficial="yes" name="ipcm_plat" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/group"/>
      </component>
     </collection>
    </block>
@@ -3114,24 +1797,13 @@
      </component>
     </collection>
     <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
+     <component unofficial="yes" name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" class="api">
+      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
+     </component>
      <component unofficial="yes" name="netprotocols_build" long-name="High-level Internet Protocols Build">
       <unit bldFile="mw/netprotocols/group"/>
      </component>
     </collection>
-    <collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-     <component unofficial="yes" name="http_cache_mgr_api">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-     </component>
-     <component unofficial="yes" name="http_filters_api">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-     </component>
-     <component unofficial="yes" name="netprotocols_plat_build" long-name="High-level Internet Protocols Platform API Build">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
-     </component>
-     <component unofficial="yes" name="cookie_manager_api">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="ipappprotocols" long-name="IP App Protocols" tech_domain="dc" level="generic" levels="plugin framework conn server">
     <collection name="rtp" long-name="RTP" level="server">
@@ -3165,18 +1837,13 @@
      </component>
     </collection>
     <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
+     <component unofficial="yes" name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" class="api">
+      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/group"/>
+     </component>
      <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build">
       <unit bldFile="mw/ipappprotocols/group"/>
      </component>
     </collection>
-    <collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="server">
-     <component unofficial="yes" name="srtp_api">
-      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtprtcp_api">
-      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="wirelessacc" long-name="Wireless Access" tech_domain="dc" level="specific" levels="framework generic ui">
     <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
@@ -3216,17 +1883,8 @@
      </component>
     </collection>
     <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-     <component unofficial="yes" name="hotspot_framework_client_api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="hotspot_framework_client_plugin_api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_connectivity_test_service_api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_connectivity_test_service_settings_api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+     <component unofficial="yes" name="hsfw_plat" class="api">
+      <unit bldFile="mw/wirelessacc/hsfw_plat/group"/>
      </component>
      <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build">
       <unit bldFile="mw/wirelessacc/group"/>
@@ -3377,7 +2035,7 @@
      </component>
     </collection>
     <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-     <component name="vpnapi.dll=binary" long-name="VPN API">
+     <component name="vpnapi" long-name="VPN API">
       <unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
      </component>
     </collection>
@@ -3388,7 +2046,7 @@
      <component unofficial="yes" name="vpnclient_build" long-name="VPN Client Build">
       <unit bldFile="mw/vpnclient/group"/>
      </component>
-     <component unofficial="yes" name="vpnapi">
+     <component unofficial="yes" name="vpnc_plat" class="api">
       <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
      </component>
     </collection>
@@ -3512,16 +2170,16 @@
      <component unofficial="yes" name="multimediacommsengine_test" long-name="Multimedia Comms Engine Test">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
      </component>
     </collection>
     <collection name="natfw" long-name="NAT Framework" level="framework">
@@ -3594,30 +2252,13 @@
      </component>
     </collection>
     <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
+     <component unofficial="yes" name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" class="api">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/group"/>
+     </component>
      <component unofficial="yes" name="ipappsrv_build" long-name="IP App Services Build">
       <unit bldFile="mw/ipappsrv/group"/>
      </component>
     </collection>
-    <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="floor_control_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_control_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="nat_settings_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="transcoder_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-     </component>
-     <component unofficial="yes" name="comms_event_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_comms_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="phonesrv" long-name="Telephony and SIM Services" tech_domain="vc" level="specific" levels="plugin framework server generic specific">
     <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
@@ -3626,7 +2267,7 @@
      </component>
     </collection>
     <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-     <component name="CbsServer" long-name="CBS Server">
+     <component name="cbsserver" long-name="CBS Server">
       <unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
      </component>
      <component name="cbsui" long-name="CBS UI">
@@ -3664,7 +2305,7 @@
      </component>
     </collection>
     <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-     <component name="EnPolicy" long-name="En Policy">
+     <component name="enpolicy" long-name="En Policy">
       <unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
      </component>
      <component name="aiwdialdata" long-name="AIW Dial Data">
@@ -3679,12 +2320,12 @@
      <component name="phoneserver" long-name="Phones Erver">
       <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
      </component>
-     <component name="CallUI" long-name="Call UI">
+     <component name="callui" long-name="Call UI">
       <unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
      </component>
     </collection>
     <collection name="satengine" long-name="Sat Engine" level="generic">
-     <component name="SatServer" long-name="Sat Server">
+     <component name="satserver" long-name="Sat Server">
       <unit bldFile="mw/phonesrv/satengine/satserver/group"/>
      </component>
      <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build">
@@ -3714,13 +2355,13 @@
      <component name="telephonysettings" long-name="Telephony Settings">
       <unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
      </component>
-     <component name="SSSettings" long-name="SS Settings">
+     <component name="sssettings" long-name="SS Settings">
       <unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
      </component>
-     <component name="PsetNotesUi" long-name="Pset Notes UI">
+     <component name="psetnotesui" long-name="Pset Notes UI">
       <unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
      </component>
-     <component name="ServiceRequest" long-name="Service Request">
+     <component name="servicerequest" long-name="Service Request">
       <unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
      </component>
     </collection>
@@ -3730,132 +2371,25 @@
      </component>
     </collection>
     <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
+     <component unofficial="yes" name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
+      <unit bldFile="mw/phonesrv/phonesrv_plat/group"/>
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="phonesrv_pub" long-name="Telephony and SIM Services Public Interfaces" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_pub/group"/>
+     </component>
      <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build">
       <unit bldFile="mw/phonesrv/group"/>
      </component>
     </collection>
-    <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="voice_mailbox_number_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-     </component>
-     <component unofficial="yes" name="cbs_mcn_client_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_notify_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-     </component>
-     <component unofficial="yes" name="converged_call_engine_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="dial_utils_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_ussd_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-     </component>
-     <component unofficial="yes" name="default_emergency_numbers_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_observer_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_ussd_internal_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_command_handler_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_emergency_call_api">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_messenger_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_information_mediator_api">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="cbs_message_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_mailbox_settings_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_notes_ui_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_service_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="callui_reconnect_query_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-     </component>
-     <component unofficial="yes" name="ss_settings_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_dial_data_consumer_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_image_handler_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="service_provider_settings_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="string_parser_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="converged_call_provider_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_network_information_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_sat_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_information_api">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="network_handling_engine_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_configuration_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="cenrep_database_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_refresh_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group"/>
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="incoming_call_monitor_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_server_information_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_client_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group"/>
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phone_client_utility_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="messagingmw" long-name="Messaging Middleware" tech_domain="pr" level="specific" levels="stack fw api">
     <collection name="msgbranched" long-name="Messaging Branched" level="fw">
-     <component name="msgbranched.lib=binary">
+     <component name="msgbranched_build">
       <unit bldFile="mw/messagingmw/msgbranched/group"/>
      </component>
     </collection>
@@ -3964,27 +2498,17 @@
      <component name="suplwappushhandler"/>
     </collection>
     <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-     <component unofficial="yes" name="send_ui_api">
-      <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+     <component unofficial="yes" name="msgfw_pub" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_pub/group"/>
       <!-- <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="always_online_client_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_datautils_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+      <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="messagingmw_build" long-name="Messaging Middleware Build">
       <unit bldFile="mw/messagingmw/group"/>
      </component>
-     <component unofficial="yes" name="always_online_plugin_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="msg_common_utils_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_plugin_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+     <component unofficial="yes" name="msgfw_plat" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_plat/group"/>
+      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -4035,6 +2559,8 @@
      <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test">
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/group"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
@@ -4042,11 +2568,9 @@
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
@@ -4064,104 +2588,30 @@
       <unit bldFile="mw/imsrv/brandingserver/group"/>
      </component>
     </collection>
-    <collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="ximp_search_protocol_plugin_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_avabilitytext">
-      <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_protocol_plugin_host_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_management_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_management_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_data_model_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_base_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_data_model_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_cache_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_protocol_plugin_host_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_protocol_plugin_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_protocol_plugin_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_protocol_plugin_host_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_base_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_data_model_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_data_model_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="xmpp_settings_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="im_cache_client_api">
+    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
+     <component unofficial="yes" name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/group"/>
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
-      <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_base_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_feature_plugin_api">
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
-     </component>
-     <component unofficial="yes" name="ximp_search_management_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_base_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_protocol_plugin_host_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_management_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_protocol_plugin_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build">
       <unit bldFile="mw/imsrv/group"/>
      </component>
@@ -4169,16 +2619,16 @@
    </block>
    <block name="legacypresence" long-name="Legacy Presence Services" tech_domain="pr" level="specific" levels="engine fw ui">
     <collection name="xdmengine" long-name="XDM Engine" level="engine">
-     <component name="XdmSettingsApi" long-name="XDM Settings Api">
+     <component name="xdmsettingsapi" long-name="XDM Settings Api">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmsettingsapi/group"/> -->
      </component>
-     <component name="XdmProvisioning" long-name="XDM Provisioning">
+     <component name="xdmprovisioning" long-name="XDM Provisioning">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmprovisioning/group"/> -->
      </component>
-     <component name="XdmDeviceManagement" long-name="XDM Device Management">
+     <component name="xdmdevicemanagement" long-name="XDM Device Management">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmdevicemanagement/group"/> -->
      </component>
-     <component unofficial="yes" name="xdmengine_build" long-name="XDM Engine Build">
+     <component name="xdmengine_build" long-name="XDM Engine">
       <unit bldFile="mw/legacypresence/xdmengine/group"/>
      </component>
     </collection>
@@ -4191,12 +2641,12 @@
      </component>
     </collection>
     <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-     <component name="msgconnmanager.dll=binary">
+     <component name="msgconnmanager_build">
       <unit bldFile="mw/legacypresence/msgconnmanager/group"/>
      </component>
     </collection>
     <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptor" level="fw">
-     <component name="simpleplugin.dll=binary">
+     <component name="simpleplugin">
       <unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
      </component>
     </collection>
@@ -4235,10 +2685,10 @@
      </component>
     </collection>
     <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
-     <component name="XdmXmlParser" long-name="XDM XML Parser">
+     <component name="xdmxmlparser" long-name="XDM XML Parser">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xdmxmlparser/group"/> -->
      </component>
-     <component name="XcapProtocol" long-name="Xcap Protocol">
+     <component name="xcapprotocol" long-name="Xcap Protocol">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
@@ -4247,7 +2697,7 @@
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaputils/group"/> -->
      </component>
-     <component name="LocalProtocol" long-name="Local Protocol">
+     <component name="localprotocol" long-name="Local Protocol">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/localoperations/group"/> -->
      </component>
@@ -4256,55 +2706,19 @@
      </component>
     </collection>
     <collection name="simpledatamodeladapter" long-name="SIMPLE Data Mode Aadapter" level="fw">
-     <component name="presenceplugin.dll=binary">
+     <component name="presenceplugin">
       <unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
      </component>
     </collection>
     <collection name="legacypresence_info" long-name="Legacy Presence Services Info" level="ui">
-     <component unofficial="yes" name="xdm_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-     </component>
-     <component unofficial="yes" name="watcher_info_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_connection_manager_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="simple_instant_msg_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
-     </component>
-     <component unofficial="yes" name="simple_settings_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="publisher_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
-     </component>
-     <component unofficial="yes" name="authorization_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-     </component>
-     <component unofficial="yes" name="simple_documents_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-     </component>
-     <component unofficial="yes" name="xdm_protocol_plugin_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="registration_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="xdm_settings_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_list_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="watcher_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
+     <component unofficial="yes" name="pressrv_plat" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="opensrv" long-name="Open Services" tech_domain="rt" level="specific" levels="prt lib server eng">
     <collection name="loudmouth" long-name="Loudmouth" level="prt">
-     <component unofficial="yes" name="loudmouth_build" long-name="Loudmouth Build">
+     <component name="loudmouth_build">
       <unit bldFile="mw/opensrv/loudmouth/group"/>
      </component>
      <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test">
@@ -4312,7 +2726,7 @@
      </component>
     </collection>
     <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-     <component unofficial="yes" name="libtelepathy_build" long-name="Telepathy Library Build">
+     <component name="libtelepathy_build">
       <unit bldFile="mw/opensrv/libtelepathy/group"/>
      </component>
      <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test">
@@ -4339,19 +2753,14 @@
      </component>
     </collection>
     <collection name="opensrv_info" long-name="Open Services Info" level="eng">
+     <component unofficial="yes" name="opensrv_plat" long-name="Open Services Platform Interfaces" class="api">
+      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
+      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="opensrv_build" long-name="Open Services Build">
       <unit bldFile="mw/opensrv/group"/>
      </component>
     </collection>
-    <collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-     <component unofficial="yes" name="opensrv_plat_build" long-name="Open Services Platform API Build">
-      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="messagequeue_api">
-      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
-      <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="remotemgmt" long-name="Remote Management" tech_domain="dm" level="specific" levels="plugin framework server generic specific">
     <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
@@ -4452,7 +2861,7 @@
      </component>
     </collection>
     <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-     <component name="SCP">
+     <component name="scp">
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
@@ -4487,140 +2896,30 @@
       <unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
      </component>
     </collection>
-    <collection name="ahle" long-name="Adaptive History List" level="generic">
-     <component name="ahleserver" long-name="Adaptive History List Server"/>
-     <component name="ahleclient" long-name="Adaptive History List Client"/>
-    </collection>
     <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
      <component unofficial="yes" name="remotemgmt_build" long-name="Remote Management Build">
       <unit bldFile="mw/remotemgmt/group"/>
      </component>
-     <component unofficial="yes" name="fotaapplication">
-      <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-     </component>
-    </collection>
-    <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-     <component unofficial="yes" name="synchronization_capability_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-     </component>
-    </collection>
-    <collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
-     <component unofficial="yes" name="adaptive_history_list_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="pnpms_utils_api">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="diagnostics_framework_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="adaptive_history_list_session_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
-     </component>
-     <component unofficial="yes" name="dm_utils_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_utility_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="device_management_plugin_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="scp_server_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="syncml_client_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="obex_client_session_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
-     </component>
-     <component unofficial="yes" name="policy_management_request_api">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_ds_extensions_api">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
-     </component>
-     <component unofficial="yes" name="dm_tree_apis">
+     <component unofficial="yes" name="remotemgmt_pub" long-name="Remote Management Public Interfaces" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_pub/group"/>
+     </component>
+     <component unofficial="yes" name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-     </component>
-     <component unofficial="yes" name="dm_constant_definitions_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_provisioning_adapter_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-     </component>
-     <component unofficial="yes" name="data_synchronization_plugin_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="setting_enforcement_info_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="device_management_parameter_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_alert_api">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
-     </component>
-     <component unofficial="yes" name="sync_service_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="policy_management_certificate_api">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_provisioning_engine_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/group"/>
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_results_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-     </component>
-     <component unofficial="yes" name="data_synchronization_notification_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="ds_constant_definitions_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="update_package_storage_plugin_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_notifier_roaming_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
-     </component>
-     <component unofficial="yes" name="terminal_security_device_lock_api">
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_agent_util_and_definitions_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_pool_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-     </component>
-     <component unofficial="yes" name="sync_alert_handler_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="syncml_notifier_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="fota_engine_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
@@ -4680,7 +2979,7 @@
      <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin">
       <unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
      </component>
-     <component name="gsplugin" long-name="GS Plugin">
+     <component name="remotestoragegsplugin" long-name="GS Plugin">
       <unit bldFile="mw/remotestorage/remotestoragefw/gsplugin/group"/>
      </component>
      <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control">
@@ -4691,14 +2990,14 @@
      </component>
     </collection>
     <collection name="remotestorage_info" long-name="Remote Storage Info" level="framework">
-     <component unofficial="yes" name="rsfw_access_protocol_plugin_api">
+     <component unofficial="yes" name="rsfw_plat" class="api">
       <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
      </component>
     </collection>
    </block>
    <block name="remoteconn" long-name="Remote Connectivity" tech_domain="de" level="generic" levels="plugin framework server generic specific">
     <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-     <component name="SeCon" long-name="Se Con">
+     <component name="secon" long-name="Se Con">
       <unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
      </component>
     </collection>
@@ -4706,6 +3005,9 @@
      <component unofficial="yes" name="remoteconn_build" long-name="Remote Connectivity Build">
       <unit bldFile="mw/remoteconn/group"/>
      </component>
+     <component unofficial="yes" name="remoteconn_plat" long-name="Remote Connectivity Platform Interfaces" class="api">
+      <unit bldFile="mw/remoteconn/remoteconn_plat/group"/>
+     </component>
     </collection>
    </block>
    <block name="dlnasrv" long-name="DLNA Services" tech_domain="de" level="specific" levels="framework server plugin">
@@ -4897,58 +3199,15 @@
      </component>
     </collection>
     <collection name="homemedia" long-name="Home Media" level="framework">
-     <component name="homemedia" long-name="Home Media">
-      <unit bldFile="mw/dlnasrv/homemedia/homemedia/group"/>
-     </component>
-     <component unofficial="yes" name="homemedia_build" long-name="Home Media Build">
+     <component name="homemedia_build" long-name="Home Media">
       <unit bldFile="mw/dlnasrv/homemedia/group"/>
      </component>
-    </collection>
-    <collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="upnp_plugin_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_http_transfer_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_http_transfer_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_media_server_metadata_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_media_server_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_command_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_httpserver_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_httpserver_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_common_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_avcp_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_media_server_settings_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_security_plugin_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_control_point_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_control_point_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_av_objects_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_device_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_utils_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_utils_api/group"/>
-     </component>
+     
     </collection>
     <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
+     <component unofficial="yes" name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/group"/>
+     </component>
      <component unofficial="yes" name="dlnasrv_build" long-name="DLNA Services Build">
       <unit bldFile="mw/dlnasrv/group"/>
      </component>
@@ -5075,116 +3334,25 @@
      <component name="imageprintuiprovider" long-name="ImagePrint UI Provider">
       <unit bldFile="mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
      </component>
-     <component name="imageprintui" long-name="ImagePrint UI">
+     <component name="usbimageprintui" long-name="ImagePrint UI">
       <unit bldFile="mw/shortlinkconn/usbuis/imageprintui/group"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" level="plugin">
-     <component unofficial="yes" name="bluetooth_power_state_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/bluetooth_power_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_notifier_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/bluetooth_notifier_api/group"/>
-     </component>
-    </collection>
     <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
+     <component unofficial="yes" name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/group"/>
+     </component>
      <component unofficial="yes" name="public">
       <!-- <unit bldFile="mw/shortlinkconn/tsrc/public/basic/group"/> -->
      </component>
+     <component unofficial="yes" name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/group"/>
+     </component>
      <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build">
       <unit bldFile="mw/shortlinkconn/group"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="bluetooth_engine_settings_api">
-      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialup_connection_status_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_dosserver_audio_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_dosserver_audio_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_watcher_info_api_header">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_watcher_info_api_header/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_sap_connection_state_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_sap_connection_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_notifier_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_notifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="pictbridge_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/pictbridge_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_transport_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_transport_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_device_management_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_device_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_device_control_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_device_control_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_notifier_internal_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_notifier_internal_api/group"/>
-     </component>
-     <component unofficial="yes" name="at_command_handler_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/at_command_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_connection_management_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_connection_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_watcher_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_watcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="obex_secondary_display_notification_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_personality_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_personality_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_responder_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_responder_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_secondary_display_notification_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="dun_secondary_display_notification_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_discovery_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_discovery_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_dut_mode_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_dut_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_local_variation_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_local_variation_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_personality_api_header">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_personality_api_header/group"/>
-     </component>
-     <component unofficial="yes" name="obex_service_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_secondary_display_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_server_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="obex_service_utils_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="imghandling" long-name="Image Handling" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
     <collection name="3gplibrary" long-name="3GP Library" level="server">
@@ -5197,7 +3365,7 @@
      </component>
     </collection>
     <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
-     <component name="IHL.dll=binary" long-name="IHL">
+     <component name="ihl" long-name="IHL">
       <unit bldFile="mw/imghandling/imagehandlinglib/group"/>
      </component>
     </collection>
@@ -5216,29 +3384,14 @@
      </component>
     </collection>
     <collection name="imghandling_info" long-name="Image Handling Info" level="specific">
-     <component unofficial="yes" name="tvoutengine_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/tvoutengine_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_handling_library_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-     </component>
-     <component unofficial="yes" name="3gp_library_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+     <component unofficial="yes" name="imagehandling_plat" class="api">
       <!-- <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="image_info_popup_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_info_popup_api/group"/>
+      <unit bldFile="mw/imghandling/imagehandling_plat/group"/>
+      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build">
       <unit bldFile="mw/imghandling/group"/>
      </component>
-     <component unofficial="yes" name="thumbnailmanager_api">
-      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
-      <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_preview_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_preview_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="metadatasrv" long-name="Legacy Metadata Services" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
@@ -5257,38 +3410,16 @@
       <unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
      </component>
     </collection>
-    <collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform API Build">
+    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
+     <component unofficial="yes" name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" class="api">
       <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
      </component>
-     <component unofficial="yes" name="content_listing_framework_extended_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_fetch_implementation_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_collection_manager_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_style_grid_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_style_grid_api/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="content_listing_framework_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="metadatasrv_pub_build" long-name="Legacy Metadata Services Public API Build">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
-     </component>
-     <component unofficial="yes" name="media_fetch_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
      <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build">
       <unit bldFile="mw/metadatasrv/group"/>
      </component>
+     <component unofficial="yes" name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" class="api">
+      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
+     </component>
     </collection>
    </block>
    <block name="mds" long-name="Metadata Services" tech_domain="mm" level="specific" levels="mgr eng server int">
@@ -5364,7 +3495,7 @@
      </component>
     </collection>
     <collection name="watchdog" long-name="Watchdog" level="server">
-     <component name="mdswatchdog.exe=binary">
+     <component name="mdswatchdog">
       <unit bldFile="mw/mds/watchdog/group"/>
      </component>
     </collection>
@@ -5373,56 +3504,31 @@
       <!-- <unit bldFile="mw/mds/iadstoprestart/group"/> -->
      </component>
     </collection>
-    <collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-     <component unofficial="yes" name="content_listing_framework_api">
-      <unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="mds_pub_build" long-name="Metadata Services Public API Build">
+    <collection name="mds_info" long-name="Metadata Services Info" level="int">
+     <component unofficial="yes" name="mds_pub" long-name="Metadata Services Public Interfaces" class="api">
       <unit bldFile="mw/mds/mds_pub/group"/>
      </component>
-    </collection>
-    <collection name="mds_info" long-name="Metadata Services Info" level="int">
+     <component unofficial="yes" name="mds_plat" long-name="Metadata Services Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
+      <unit bldFile="mw/mds/mds_plat/group"/>
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="mds_build" long-name="Metadata Services Build">
       <unit bldFile="mw/mds/group"/>
      </component>
     </collection>
-    <collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-     <component unofficial="yes" name="mds_plat_build" long-name="Metadata Services Platform API Build">
-      <unit bldFile="mw/mds/mds_plat/group"/>
-     </component>
-     <component unofficial="yes" name="location_manager_api">
-      <unit bldFile="mw/mds/mds_plat/location_manager_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="harvester_framework_api">
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
-      <unit bldFile="mw/mds/mds_plat/harvester_framework_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="content_listing_framework_extended_api">
-      <unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_collection_manager_api">
-      <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="metadata_engine_api">
-      <unit bldFile="mw/mds/mds_plat/metadata_engine_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="context_engine_plugin_api">
-      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="mmuifw" long-name="Multimedia UI Framework" tech_domain="mm" level="specific" levels="mgr mdl util ui">
     <collection name="alfwidgetutils" long-name="ALF Widget Utils" level="ui">
-     <component name="alfwidgetutils.dll=binary" long-name="ALF Widget Utils Component">
+     <component name="alfwidgetutils_build" long-name="ALF Widget Utils Component">
       <unit bldFile="mw/mmuifw/alfwidgetutils/group"/>
      </component>
     </collection>
@@ -5459,15 +3565,13 @@
      </component>
     </collection>
     <collection name="osncore" long-name="OSN Core" level="util">
-     <component name="osncore" long-name="OSN Core">
-      <unit bldFile="mw/mmuifw/osncore/osncore/group"/>
-     </component>
-     <component unofficial="yes" name="osncore_build" long-name="OSN Core Build">
+     <component name="osncore_build" long-name="OSN Core">
       <unit bldFile="mw/mmuifw/osncore/group"/>
      </component>
+     
     </collection>
     <collection name="resourcepool" long-name="Resource Pool" level="util">
-     <component name="alfresourcepool.dll=binary" long-name="ALF Resource Pool">
+     <component name="alfresourcepool" long-name="ALF Resource Pool">
       <unit bldFile="mw/mmuifw/resourcepool/group"/>
      </component>
     </collection>
@@ -5483,70 +3587,23 @@
      </component>
     </collection>
     <collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
+     <component unofficial="yes" name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/group"/>
+     </component>
      <component unofficial="yes" name="mmuifw_build" long-name="Multimedia UI Framework Build">
       <unit bldFile="mw/mmuifw/group"/>
      </component>
     </collection>
-    <collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="ui">
-     <component unofficial="yes" name="alf_containerwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="gesturehelper_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_resourcepool_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_customlayoutmanagers_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_sliderwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_widgetmodel_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_widgetutils_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_widget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_scrollbarwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_widgetfactory_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_string_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_global_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_datamodel_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_container_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_coverflowwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_viewwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videoutils" long-name="Video Utils" tech_domain="mm" level="specific" levels="empty eng util">
     <collection name="dvrengine" long-name="DVR Engine" level="eng">
-     <component name="CommonRecordingEngine" long-name="Common Recording Engine">
+     <component name="commonrecordingengine" long-name="Common Recording Engine">
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliphandler/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliprecognizer/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtputils/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/group"/>
      </component>
-     <component name="CommonRecordingEngineClient" long-name="Common Recording Engine Client">
+     <component name="commonrecordingengineclient" long-name="Common Recording Engine Client">
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengineclient/group"/>
      </component>
      <component unofficial="yes" name="dvrengine_build" long-name="DVR Engine Build">
@@ -5562,36 +3619,25 @@
      </component>
     </collection>
     <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-     <component name="SchedulerClient" long-name="Scheduler Client">
+     <component name="schedulerclient" long-name="Scheduler Client">
       <unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
      </component>
-     <component name="SchedulerServer" long-name="Scheduler Server">
+     <component name="schedulerserver" long-name="Scheduler Server">
       <unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
      </component>
      <component unofficial="yes" name="videoscheduler_build" long-name="Video Scheduler Build">
       <unit bldFile="mw/videoutils/videoscheduler/group"/>
      </component>
     </collection>
-    <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="util">
-     <component unofficial="yes" name="dvrengine_api">
-      <unit bldFile="mw/videoutils/videoutils_plat/dvrengine_api/group"/>
-     </component>
-     <component unofficial="yes" name="videoscheduler_api">
-      <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="videoutils_plat_build" long-name="Video Utils Platform API Build">
+    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
+     <component unofficial="yes" name="videoutils_plat" long-name="Video Utils Platform Interfaces" class="api">
       <unit bldFile="mw/videoutils/videoutils_plat/group"/>
-     </component>
-     <component unofficial="yes" name="videoconnutility_api">
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
-      <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build">
       <unit bldFile="mw/videoutils/group"/>
      </component>
@@ -5664,11 +3710,11 @@
      </component>
     </collection>
     <collection name="metadatautility" long-name="Metadata Utility" level="generic">
-     <component name="3GPExtParserLib"/>
-     <component name="3GPExtParserLib_stub">
+     <component name="3gpextparserlib"/>
+     <component name="3gpextparserlib_stub">
       <unit bldFile="mw/mmmw/metadatautility/3gpextparserlib_stub/group"/>
      </component>
-     <component unofficial="yes" name="metadatautility_build" long-name="Metadata Utility Build">
+     <component name="metadatautility_build">
       <unit bldFile="mw/mmmw/metadatautility/group"/>
      </component>
     </collection>
@@ -5703,7 +3749,7 @@
      </component>
     </collection>
     <collection name="thumbnailengine" long-name="Thumbnail Engine" level="server">
-     <component name="TNEEngine.dll=binary" long-name="TNE Engine">
+     <component name="tneengine" long-name="TNE Engine">
       <unit bldFile="mw/mmmw/thumbnailengine/group"/>
      </component>
     </collection>
@@ -5723,82 +3769,14 @@
      <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test">
       <!-- <unit bldFile="mw/mmmw/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
-     <component unofficial="yes" name="enhanced_media_client_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="progressive_download_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_buffer_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_audio_control_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_descriptor_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_balance_effect_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-     </component>
-     <component unofficial="yes" name="stream_control_custom_command_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_volume_effect_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_file_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_progressive_download_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_audio_effects_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-     </component>
-     <component unofficial="yes" name="mtp_keys_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/mtp_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="configuration_components_factory_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="mtp_wmdrm_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/mtp_wmdrm_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_metadata_reader_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-     </component>
-     <component unofficial="yes" name="voip_audio_services_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="thumbnail_engine_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_drm_config_intfc_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-     </component>
-     <component unofficial="yes" name="equalizer_ui_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_data_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_preset_utilities_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_output_control_utility_proxy_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_monitor_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_utilities_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_output_control_utility_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+     <component unofficial="yes" name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -5811,10 +3789,10 @@
    </block>
    <block name="camerasrv" long-name="Camera Services" tech_domain="mm" level="specific" levels="plugin fw api">
     <collection name="camappengine" long-name="Camera App Engine" level="fw">
-     <component name="StillConverter" long-name="Still Converter">
+     <component name="stillconverter" long-name="Still Converter">
       <!-- <unit bldFile="mw/camerasrv/camappengine/stillconverter/group"/> -->
      </component>
-     <component name="Engine">
+     <component name="camappengine_engine">
       <!-- <unit bldFile="mw/camerasrv/camappengine/engine/group"/> -->
      </component>
      <component name="asynchfilesavequeue" long-name="Asynch File Save Queue">
@@ -5849,40 +3827,17 @@
      </component>
     </collection>
     <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
+     <component unofficial="yes" name="camerasrv_plat" long-name="Camera Services Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
+      <unit bldFile="mw/camerasrv/camerasrv_plat/group"/>
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="camerasrv_build" long-name="Camera Services Build">
       <unit bldFile="mw/camerasrv/group"/>
      </component>
     </collection>
-    <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-     <component unofficial="yes" name="media_recorder_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="custom_onboard_camera_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_recorder_sink_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-     </component>
-     <component unofficial="yes" name="asynchronous_file_saving_queue_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="3gp_file_composer_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-     </component>
-     <component unofficial="yes" name="camera_application_engine_api">
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="cae_extentension_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-     </component>
-     <component unofficial="yes" name="imaging_configuration_manager_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
-     </component>
-    </collection>
    </block>
    <block name="mmappfw" long-name="Multimedia App Framework" tech_domain="mm" level="specific" levels="empty fw utils">
     <collection name="mmappcomponents" long-name="MM App Components" level="utils">
@@ -5892,7 +3847,7 @@
      <component name="playlistengine" long-name="Playlist Engine">
       <unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
      </component>
-     <component name="harvester" long-name="Harvester">
+     <component name="mmappfwharvester" long-name="Harvester">
       <unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
      </component>
      <component name="mmappcommonui" long-name="MM App Common UI">
@@ -5916,10 +3871,10 @@
      <component name="playbackframework" long-name="Playback Framework">
       <unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
      </component>
-     <component name="collectionframework" long-name="Collection Framework">
+     <component name="mpxcollectionfw" long-name="Collection Framework">
       <unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
      </component>
-     <component name="viewframework" long-name="View Framework">
+     <component name="mpxviewfw" long-name="View Framework">
       <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
      </component>
      <component unofficial="yes" name="mpx_build" long-name="MPX Build">
@@ -5933,61 +3888,21 @@
      <component unofficial="yes" name="mmappfw_test" long-name="Multimedia App Framework Test">
       <!-- <unit bldFile="mw/mmappfw/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="utils">
-     <component unofficial="yes" name="mpx_albumart_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="asx_parser_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="collection_helper_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-     </component>
-     <component unofficial="yes" name="mmappfw_plat_build" long-name="Multimedia App Framework Platform API Build">
+     <component unofficial="yes" name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/tsrc/group"/>
       <unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_playback_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_player_settings_engine_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_metadata_extractor_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_collection_mediator_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_common_definition_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="playlist_engine_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_playback_common_definition_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_backstepping_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_server_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_base_view_plugins_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_collection_common_definition_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_view_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_collection_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -5996,7 +3911,7 @@
      <component name="ptienginev2" long-name="PTI Engine V2">
       <unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
      </component>
-     <component name="AknInputLanguage" long-name="Akn Input Language">
+     <component name="akninputlanguage" long-name="Akn Input Language">
       <unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
      </component>
      <component name="peninputarc" long-name="Pen Input Arc">
@@ -6040,7 +3955,7 @@
      <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn">
       <unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
      </component>
-     <component name="Matsutake" long-name="Matsutake"/>
+     <component name="matsutake" long-name="Matsutake"/>
      <component unofficial="yes" name="textinput_build" long-name="Text Input Build">
       <unit bldFile="mw/inputmethods/textinput/group"/>
      </component>
@@ -6064,55 +3979,21 @@
      </component>-->
     </collection>
     <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
+     <component unofficial="yes" name="inputmethods_plat" long-name="Input Methods Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
+      <unit bldFile="mw/inputmethods/inputmethods_plat/group"/>
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build">
       <unit bldFile="mw/inputmethods/group"/>
      </component>
-    </collection>
-    <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="framework">
-     <component unofficial="yes" name="aknfep_status_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptiengine_indic_definitions_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_settings_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptiengine_key_definations_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ptiengine_hwr_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="aknfep_uiinterface_api">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_definitions_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="pen_input_server_api">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_pen_support_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-     </component>
-    </collection>
-    <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="framework">
-     <component unofficial="yes" name="input_language_info_api">
+     <component unofficial="yes" name="inputmethods_pub" long-name="Input Methods Public Interfaces" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_pub/group"/>
       <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="optical_character_recognition_api">
-      <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
       <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ptiengine_iti_api">
       <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
      </component>
     </collection>
    </block>
@@ -6121,33 +4002,33 @@
      <component name="pslnengine" long-name="Personalization Engine">
       <!-- <unit bldFile="mw/classicui/psln/pslnengine/group"/> -->
      </component>
-     <component name="PslnFramework" long-name="Personalization Framework">
+     <component name="pslnframework" long-name="Personalization Framework">
       <!-- <unit bldFile="mw/classicui/psln/pslnframework"/> -->
      </component>
-     <component name="PslnLibraryLoaders" long-name="Personalization Library Loaders"/>
+     <component name="pslnlibraryloaders" long-name="Personalization Library Loaders"/>
      <component name="pslnslidesetdialog" long-name="Personalization Slideset Dialog">
       <!-- <unit bldFile="mw/classicui/psln/pslnslidesetdialog/group"/> -->
      </component>
-     <component name="PslnGSPlugin" long-name="Personalizaion GS Plugin">
+     <component name="pslngsplugin" long-name="Personalizaion GS Plugin">
       <unit bldFile="mw/classicui/psln/pslngsplugin/group"/>
      </component>
      <component name="psln_help" long-name="Help">
       <unit bldFile="mw/classicui/psln/help/group"/>
      </component>
-     <component unofficial="yes" name="psln_build" long-name="Personalization Build">
+     <component name="psln_build" long-name="Psln">
       <unit bldFile="mw/classicui/psln/group"/>
      </component>
     </collection>
     <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-     <component name="ServiceHandler" long-name="Service Handler">
+     <component name="aifwservicehandler" long-name="Service Handler">
       <unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
      </component>
     </collection>
     <collection name="commonuis" long-name="Common UIs" level="specific">
-     <component name="CommonUi" long-name="Common UI">
+     <component name="commonui" long-name="Common UI">
       <unit bldFile="mw/classicui/commonuis/commonui/group"/>
      </component>
-     <component name="CommonDialogs" long-name="Common Dialogs">
+     <component name="commondialogs" long-name="Common Dialogs">
       <unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
       <!-- <unit bldFile="mw/classicui/commonuis/commondialogs/group_test"/> -->
      </component>
@@ -6159,7 +4040,7 @@
      <component name="eikctl" long-name="Eikctl">
       <unit bldFile="mw/classicui/uifw/eikctl/group"/>
      </component>
-     <component name="AvKon" long-name="AvKon">
+     <component name="avkon" long-name="AvKon">
       <!-- <unit bldFile="mw/classicui/uifw/avkon/aknhlist/group"/> -->
       <!-- <unit bldFile="mw/classicui/uifw/avkon/aknkeyrotator/group"/> -->
       <unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
@@ -6168,10 +4049,10 @@
       <!-- <unit bldFile="mw/classicui/uifw/avkon/prebuilder"/> -->
       <!-- <unit bldFile="mw/classicui/uifw/avkon/tsrc/bc/s60_sdkmcl/bctestmixmcl/group"/> -->
      </component>
-     <component name="EikStd" long-name="EikStd">
+     <component name="eikstd" long-name="EikStd">
       <unit bldFile="mw/classicui/uifw/eikstd/group"/>
      </component>
-     <component name="AknGlobalUI" long-name="Avkon Global UI">
+     <component name="aknglobalui" long-name="Avkon Global UI">
       <unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
      </component>
      <component name="ganes" long-name="Ganes">
@@ -6181,13 +4062,13 @@
       <!-- <unit bldFile="mw/classicui/uifw/tsrc/group"/> -->
      </component>
     </collection>
-    <collection name="CommonAdapter" long-name="Common Adapter" level="support">
-     <component name="commonadapter.dll=binary">
+    <collection name="commonadapter" long-name="Common Adapter" level="support">
+     <component name="commonadapter_build">
       <unit bldFile="mw/classicui/commonadapter/group"/>
      </component>
     </collection>
     <collection name="ode" long-name="Open Dynamics Engine" level="support">
-     <component name="ode.dll=binary">
+     <component name="ode_build">
       <unit bldFile="mw/classicui/ode/group"/>
      </component>
     </collection>
@@ -6195,475 +4076,147 @@
      <component unofficial="yes" name="classicui_build" long-name="Classic UI Build">
       <unit bldFile="mw/classicui/group"/>
      </component>
-     <component unofficial="yes" name="classicui_test" long-name="Classic UI Test">
-      <!-- <unit bldFile="mw/classicui/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-     <component unofficial="yes" name="global_window_priorities_api">
-      <unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_provider_utility_api">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_api">
-      <unit bldFile="mw/classicui/classicui_plat/alarm_api/group"/>
-     </component>
-     <component unofficial="yes" name="signal_pane_api">
-      <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="long_tap_animation_api">
-      <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_file_dialogs_filter_factory_api">
-      <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="volume_popup_api">
-      <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group"/>
-     </component>
-     <component unofficial="yes" name="touch_pane_observer_api">
-      <unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="indicator_touch_observer_api">
-      <unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_cursors_api">
-      <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group"/>
-     </component>
-     <component unofficial="yes" name="special_character_table_api">
-      <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_utilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="battery_pane_api">
-      <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_sounds_api">
+     <component unofficial="yes" name="classicui_pub" long-name="Classic UI Public Interfaces" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/application_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/base_controls_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/buttons_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/choice_list_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/context_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/dialogs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/document_handler_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/editors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/error_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/fonts_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/form_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/generic_button_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/grids_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/images_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/indicators_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/initialization_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/input_frame_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/keylock_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/labels_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/misc_controls_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/notes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/notifiers_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/options_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/popups_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/queries_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_mode_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/scroller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/searchfield_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/server_application_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/setting_pages_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/slider_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/sounds_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/status_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/tabs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/title_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/toolbar_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/group"/> -->
+      <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/volume_control_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="classicui_plat" long-name="Classic UI Platform Interfaces" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/alarm_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/application_switching_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
+      <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group"/>
       <!-- <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/tsrc/group"/> -->
-      <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
-     </component>
-     <component unofficial="yes" name="generic_parameter_api">
-      <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="ode_api">
-      <unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_scroller_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_utilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_anim_dll_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-     </component>
-     <component unofficial="yes" name="stylus_activated_popup_api">
-      <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group"/>
-     </component>
-     <component unofficial="yes" name="pointer_event_modifier_api">
-      <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_framework_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="text_scroller_api">
-      <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group"/>
-     </component>
-     <component unofficial="yes" name="number_grouping_api">
-      <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_localised_texts_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_secondary_display_support_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_ui_settings_api">
-      <unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_shared_document_api">
-      <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_notifiers_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_input_capabilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="find_item_ui_api">
-      <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_secondary_display_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_configuration_api">
-      <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_localised_texts_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-     </component>
-     <component unofficial="yes" name="server_application_services_api">
-      <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="japanese_reading_api">
-      <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_notes_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_buttons_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group"/>
-     </component>
-     <component unofficial="yes" name="transition_effect_parameters_api">
-      <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_indicators_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_popup_priority_controller_api">
-      <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_runtime_api">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-     </component>
-     <component unofficial="yes" name="list_effects_api">
-      <unit bldFile="mw/classicui/classicui_plat/list_effects_api/group"/>
-     </component>
-     <component unofficial="yes" name="emergency_call_support_api">
-      <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_service_interface_menu_api">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_animation_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group"/>
-     </component>
-     <component unofficial="yes" name="input_block_api">
-      <unit bldFile="mw/classicui/classicui_plat/input_block_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_lists_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_number_text_utilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="touch_pane_api">
-      <unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="themes_settings_api">
-      <unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="ganes_api">
-      <unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
-     </component>
-     <component unofficial="yes" name="task_list_api">
-      <unit bldFile="mw/classicui/classicui_plat/task_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_ui_framework_definitions_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="uikon_status_api">
-      <unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="application_switching_api">
-      <unit bldFile="mw/classicui/classicui_plat/application_switching_api/group"/>
-     </component>
-     <component unofficial="yes" name="physics_api">
-      <unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-     </component>
-     <component unofficial="yes" name="memory_card_ui_api">
-      <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="transition_effect_utilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="item_finder_api">
-      <unit bldFile="mw/classicui/classicui_plat/item_finder_api/group"/>
-     </component>
-     <component unofficial="yes" name="eikon_server_extension_client_api">
-      <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_dialogs_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="fep_document_navigation_api">
-      <unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_editors_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_aiw_criteria_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_animation_plugin_definitions_api">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_queries_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_plugin_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_slide_show_dialog_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_status_pane_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_setting_pages_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group"/>
-     </component>
-     <component unofficial="yes" name="skinnable_clock_api">
-      <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group"/>
-     </component>
-     <component unofficial="yes" name="indicator_plugin_api">
-      <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_application_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_settings_api">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_ui_server_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_status_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_testability_api">
-      <!-- <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
-      <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_rotator_api">
-      <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_fonts_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group"/>
-     </component>
-     <component unofficial="yes" name="legacy_ui_framework_headers_api">
-      <unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_initialization_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_grids_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_service_interface_base_api">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_settings_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="popup_form_api">
-      <unit bldFile="mw/classicui/classicui_plat/popup_form_api/group"/>
-     </component>
-    </collection>
-    <collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
-     <component unofficial="yes" name="window_server_event_observer_api">
-      <unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="info_popup_note_api">
-      <unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group"/>
-     </component>
-     <component unofficial="yes" name="labels_api">
-      <unit bldFile="mw/classicui/classicui_pub/labels_api/group"/>
-     </component>
-     <component unofficial="yes" name="uikon_core_controls">
-      <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group"/>
-     </component>
-     <component unofficial="yes" name="intermediate_state_api">
-      <unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_file_dialogs_api">
-      <unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="buttons_api">
-      <unit bldFile="mw/classicui/classicui_pub/buttons_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_service_handler_api">
-      <unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="screen_saver_api">
-      <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group"/>
-     </component>
-     <component unofficial="yes" name="form_api">
-      <unit bldFile="mw/classicui/classicui_pub/form_api/group"/>
-     </component>
-     <component unofficial="yes" name="generic_button_api">
-      <unit bldFile="mw/classicui/classicui_pub/generic_button_api/group"/>
-     </component>
-     <component unofficial="yes" name="keylock_api">
-      <unit bldFile="mw/classicui/classicui_pub/keylock_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialog_shutter_api">
-      <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group"/>
-     </component>
-     <component unofficial="yes" name="navigation_pane_api">
-      <unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_pane_api">
-      <unit bldFile="mw/classicui/classicui_pub/context_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="ui_framework_definitions_api">
-      <unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_generic_parameter_api">
-      <unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="slider_api">
-      <unit bldFile="mw/classicui/classicui_pub/slider_api/group"/>
-     </component>
-     <component unofficial="yes" name="application_framework_api">
-      <unit bldFile="mw/classicui/classicui_pub/application_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="base_controls_api">
-      <unit bldFile="mw/classicui/classicui_pub/base_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="touch_ui_utilities_api">
-      <unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="document_handler_api">
-      <unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="ui_framework_utilities_api">
-      <unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="tabs_api">
-      <unit bldFile="mw/classicui/classicui_pub/tabs_api/group"/>
-     </component>
-     <component unofficial="yes" name="input_frame_api">
-      <unit bldFile="mw/classicui/classicui_pub/input_frame_api/group"/>
-     </component>
-     <component unofficial="yes" name="indicators_api">
-      <unit bldFile="mw/classicui/classicui_pub/indicators_api/group"/>
-     </component>
-     <component unofficial="yes" name="classicui_pub_test">
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
-      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
-     </component>
-     <component unofficial="yes" name="initialization_api">
-      <unit bldFile="mw/classicui/classicui_pub/initialization_api/group"/>
-     </component>
-     <component unofficial="yes" name="scroller_api">
-      <unit bldFile="mw/classicui/classicui_pub/scroller_api/group"/>
-     </component>
-     <component unofficial="yes" name="setting_pages_api">
-      <unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group"/>
-     </component>
-     <component unofficial="yes" name="volume_control_api">
-      <unit bldFile="mw/classicui/classicui_pub/volume_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="hotkeys_api">
-      <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group"/>
-     </component>
-     <component unofficial="yes" name="notifiers_api">
-      <unit bldFile="mw/classicui/classicui_pub/notifiers_api/group"/>
-     </component>
-     <component unofficial="yes" name="information_preview_popup_api">
-      <unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_ui_api">
-      <unit bldFile="mw/classicui/classicui_pub/error_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="screen_mode_api">
-      <unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_criteria_api">
-      <unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group"/>
-     </component>
-     <component unofficial="yes" name="popups_api">
-      <unit bldFile="mw/classicui/classicui_pub/popups_api/group"/>
-     </component>
-     <component unofficial="yes" name="choice_list_api">
-      <unit bldFile="mw/classicui/classicui_pub/choice_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="notes_api">
-      <unit bldFile="mw/classicui/classicui_pub/notes_api/group"/>
-     </component>
-     <component unofficial="yes" name="screen_clearer_api">
-      <unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group"/>
-     </component>
-     <component unofficial="yes" name="grids_api">
-      <unit bldFile="mw/classicui/classicui_pub/grids_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialogs_api">
-      <unit bldFile="mw/classicui/classicui_pub/dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="images_api">
-      <unit bldFile="mw/classicui/classicui_pub/images_api/group"/>
-     </component>
-     <component unofficial="yes" name="fonts_api">
-      <unit bldFile="mw/classicui/classicui_pub/fonts_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_api">
-      <unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
-     </component>
-     <component unofficial="yes" name="searchfield_api">
-      <unit bldFile="mw/classicui/classicui_pub/searchfield_api/group"/>
-     </component>
-     <component unofficial="yes" name="private_ui_framework_api">
-      <unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="sounds_api">
-      <unit bldFile="mw/classicui/classicui_pub/sounds_api/group"/>
-     </component>
-     <component unofficial="yes" name="editors_api">
-      <unit bldFile="mw/classicui/classicui_pub/editors_api/group"/>
-     </component>
-     <component unofficial="yes" name="misc_controls_api">
-      <unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="stylus_popup_menu_api">
-      <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group"/>
-     </component>
-     <component unofficial="yes" name="queries_api">
-      <unit bldFile="mw/classicui/classicui_pub/queries_api/group"/>
-     </component>
-     <component unofficial="yes" name="title_pane_api">
-      <unit bldFile="mw/classicui/classicui_pub/title_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="toolbar_api">
-      <unit bldFile="mw/classicui/classicui_pub/toolbar_api/group"/>
-     </component>
-     <component unofficial="yes" name="animation_api">
-      <unit bldFile="mw/classicui/classicui_pub/animation_api/group"/>
-     </component>
-     <component unofficial="yes" name="options_menu_api">
-      <unit bldFile="mw/classicui/classicui_pub/options_menu_api/group"/>
-     </component>
-     <component unofficial="yes" name="lists_api">
-      <unit bldFile="mw/classicui/classicui_pub/lists_api/group"/>
-     </component>
-     <component unofficial="yes" name="server_application_api">
-      <unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="status_pane_api">
-      <unit bldFile="mw/classicui/classicui_pub/status_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="title_pane_touch_observer_api">
-      <unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="hierarchical_lists_api">
-      <unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/ganes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/input_block_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/item_finder_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/list_effects_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/physics_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/popup_form_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/task_list_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/touch_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/tsrc/group"/>
      </component>
     </collection>
    </block>
    <block name="svgt" long-name="SVG Tiny" tech_domain="ui" level="generic" levels="util ui">
     <collection name="svgtopt" long-name="SVGT Opt" level="util">
-     <component name="SVG">
+     <component name="svg">
       <!-- <unit bldFile="mw/svgt/svgtopt/svg/svgrecog/group"/> -->
      </component>
      <component name="nvgdecoder" long-name="NVG Decoder"/>
-     <component name="SVGEngineJI" long-name="SVG Engine JI"/>
-     <component name="SVGTPlugin" long-name="SVGT Plugin">
+     <component name="svgengineji" long-name="SVG Engine JI"/>
+     <component name="svgtplugin" long-name="SVGT Plugin">
       <unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
      </component>
      <component unofficial="yes" name="svgtopt_build" long-name="SVGT Opt Build">
@@ -6674,13 +4227,8 @@
      <component unofficial="yes" name="svgt_build" long-name="SVG Tiny Build">
       <unit bldFile="mw/svgt/group"/>
      </component>
-    </collection>
-    <collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-     <component unofficial="yes" name="nvg_api">
-      <unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_api" long-name="SVG Tiny API">
-      <unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
+     <component unofficial="yes" name="svgt_plat" long-name="SVG Tiny Platform Interfaces" class="api">
+      <unit bldFile="mw/svgt/svgt_plat/group"/>
      </component>
     </collection>
    </block>
@@ -6713,35 +4261,16 @@
      <component unofficial="yes" name="inc">
       <!-- <unit bldFile="mw/uiaccelerator/inc/group"/> -->
      </component>
-     <component unofficial="yes" name="uiaccelerator_test" long-name="UI Accelerator Test">
-      <!-- <unit bldFile="mw/uiaccelerator/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="specific">
-     <component unofficial="yes" name="alf_tracing_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-     </component>
-     <component unofficial="yes" name="uiaccelerator_plat_build" long-name="UI Accelerator Platform API Build">
+     <component unofficial="yes" name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" class="api">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_editors_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/tsrc/group"/>
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/group"/>
      </component>
-     <component unofficial="yes" name="alf_extension_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_extended_visual_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_client_server_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_editors_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_editors_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_core_toolkit_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_visual_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="uiresources" long-name="UI Resources" tech_domain="ui" level="generic" levels="compile plugin framework server generic data">
@@ -6770,22 +4299,22 @@
      </component>
     </collection>
     <collection name="locales" long-name="Locales" level="framework">
-     <component unofficial="yes" name="loce32">
+     <component name="locales_build" long-name="Locales Component">
       <unit bldFile="mw/uiresources/locales/loce32"/>
      </component>
     </collection>
     <collection name="pictographs" long-name="Pictographs" level="data">
-     <component name="AknPictograph" long-name="AKN Picto Graph">
+     <component name="aknpictograph" long-name="AKN Picto Graph">
       <unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
       <!-- <unit bldFile="mw/uiresources/pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
      </component>
     </collection>
     <collection name="skins" long-name="Skins" level="data">
-     <component name="AknSkinContent" long-name="AKN Skin Content">
+     <component name="aknskincontent" long-name="AKN Skin Content">
       <unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
       <!-- <unit bldFile="mw/uiresources/skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
      </component>
-     <component name="AknSkins" long-name="AKN Skins">
+     <component name="aknskins" long-name="AKN Skins">
       <unit bldFile="mw/uiresources/skins/aknskins/group"/>
      </component>
     </collection>
@@ -6804,16 +4333,16 @@
      </component>
     </collection>
     <collection name="uigraphics" long-name="UI Graphics" level="generic">
-     <component name="Bitmaps2" long-name="Bitmaps 2">
+     <component name="bitmaps2" long-name="Bitmaps 2">
       <unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
      </component>
-     <component name="Icons">
+     <component name="icons">
       <unit bldFile="mw/uiresources/uigraphics/icons/group"/>
      </component>
-     <component name="VariatedBitmaps" long-name="Variated Bitmaps">
+     <component name="variatedbitmaps" long-name="Variated Bitmaps">
       <unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
      </component>
-     <component name="AknIcon" long-name="AKN Icon">
+     <component name="aknicon" long-name="AKN Icon">
       <unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
      </component>
      <component name="palette" long-name="Palette">
@@ -6821,104 +4350,55 @@
      </component>
     </collection>
     <collection name="helpthemes" long-name="Help Themes" level="data">
-     <component name="helpthemes compo">
+     <component name="helpthemes_build">
       <unit bldFile="mw/uiresources/helpthemes/group"/>
      </component>
     </collection>
     <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-     <component name="aknlayoutcompiler compo" long-name="AKN Layout Compiler Component"/>
+     <component name="aknlayoutcompiler_build" long-name="AKN Layout Compiler Component">
+      <unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
+     </component>
     </collection>
     <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-     <component name="cdlcompiler compo" long-name="CDL Compiler Component"/>
+     <component name="cdlcompiler_build" long-name="CDL Compiler Component">
+      <unit bldFile="mw/uitools/cdlcompiler/group"/>
+     </component>
     </collection>
     <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-     <component name="cdlcompilertoolkit compo" long-name="CDL Compiler Toolkit Component"/>
+     <component name="cdlcompilertoolkit_build" long-name="CDL Compiler Toolkit Component">
+      <unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
+     </component>
     </collection>
     <collection name="skincompiler" long-name="Skin Compiler" level="compile">
-     <component name="AknSkinDescCompiler" long-name="AKN Skin Desc Compiler">
+     <component name="aknskindesccompiler" long-name="AKN Skin Desc Compiler">
       <unit bldFile="mw/uitools/skincompiler/aknskindesccompiler/group"/>
      </component>
     </collection>
     <collection name="uiresources_info" long-name="UI Resources Info" level="data">
-     <component unofficial="yes" name="uiresources_test" long-name="UI Resources Test">
-      <!-- <unit bldFile="mw/uiresources/tsrc/group"/> -->
+     <component unofficial="yes" name="uiresources_plat" long-name="UI Resources Platform Interfaces" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="uiresources_build" long-name="UI Resources Build">
       <unit bldFile="mw/uiresources/group"/>
      </component>
-    </collection>
-    <collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-     <component unofficial="yes" name="skins_image_attributes_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group"/>
-     </component>
-     <component unofficial="yes" name="mifconv_definitions_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="wallpaper_configuration_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="cdl_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group"/>
-     </component>
-     <component unofficial="yes" name="graphic_configuration_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_skins_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group"/>
-     </component>
-     <component unofficial="yes" name="mif_header_cdl_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_server_plugin_ids_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_system_private_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_and_skins_settings_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="language_code_definitions_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="private_user_area_code_definitions_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_effect_setup_plugin_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_fonts_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_data_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_server_controller_plugin_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-     <component unofficial="yes" name="scalable_icons_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-     </component>
-     <component unofficial="yes" name="graphics_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group"/>
-     </component>
-     <component unofficial="yes" name="skins_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/skins_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_id_definitions_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="font_definition_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="pictograph_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group"/>
+     <component unofficial="yes" name="uiresources_pub" long-name="UI Resources Public Interfaces" class="api">
+      <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/skins_api/tsrc/group"/>
      </component>
     </collection>
    </block>
-   <block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="specific" levels="fw api">
+   <block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="generic" levels="fw api">
     <collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
      <component name="tactilearearegistry" long-name="Tactile Area Registry">
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
@@ -6933,14 +4413,12 @@
       <unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
      </component>
     </collection>
-    <collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-     <component unofficial="yes" name="tactile_feedback_client_api">
-      <unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-     </component>
-    </collection>
-    <collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-     <component unofficial="yes" name="tactile_feedback_server_api">
-      <unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+    <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
+     <component unofficial="yes" name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" class="api">
+      <unit bldFile="mw/hapticsservices/hapticsservices_pub/group"/>
+     </component>
+     <component unofficial="yes" name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" class="api">
+      <unit bldFile="mw/hapticsservices/hapticsservices_plat/group"/>
      </component>
     </collection>
    </block>
@@ -6961,12 +4439,12 @@
      </component>
     </collection>
     <collection name="backsteppingsrv" long-name="Backstepping Service" level="server">
-     <component name="bsengine.exe=binary">
+     <component name="bsengine">
       <unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
      </component>
     </collection>
     <collection name="xcfw" long-name="XCFW" level="framework">
-     <component name="XCFW.dll=binary" long-name="XCFW">
+     <component name="xcfw_build" long-name="XCFW">
       <unit bldFile="mw/homescreensrv/xcfw/group"/>
      </component>
     </collection>
@@ -7016,83 +4494,23 @@
       <unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
      </component>
     </collection>
-    <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="sapi_backstepping">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
-     </component>
-     <component unofficial="yes" name="idlefw_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-     </component>
-     <component unofficial="yes" name="ai_content_model_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="action_handler_plugin_api">
+    <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
+     <component unofficial="yes" name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" class="api">
       <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_menucontent">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
-     </component>
-     <component unofficial="yes" name="ai_plugin_management_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="menu_sat_interface_api">
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_harvester_plugin_api">
       <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="external_home_screen_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_actionhandler">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-     </component>
-     <component unofficial="yes" name="ai_utilities_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="xcfw_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
-     </component>
-     <component unofficial="yes" name="hs_widget_publisher_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/group"/>
       <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="menu_model_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ai_plugin_information_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="menu_content_service_api">
       <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="ai_variation_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_homescreenplugin">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group"/>
-     </component>
-     <component unofficial="yes" name="ai_shortcut_command_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_shortcut_command_api/group"/>
-     </component>
-     <component unofficial="yes" name="shortcutplugin_extension_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/shortcutplugin_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_contentpublishing">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
    <block name="appinstall" long-name="Application Installation" tech_domain="rt" level="generic" levels="tool framework generic api">
     <collection name="appinstaller" long-name="App Installer" level="generic">
-     <component name="AppMngr2" long-name="App Mngr2">
+     <component name="appmngr2" long-name="App Mngr2">
       <unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
      </component>
-     <component name="AppinstUi" long-name="App Installer UI">
+     <component name="appinstui" long-name="App Installer UI">
       <unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
      </component>
      <component unofficial="yes" name="appinstaller_build" long-name="App Installer Build">
@@ -7111,12 +4529,12 @@
      </component>
     </collection>
     <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-     <component name="iaupdateapi_stub compo">
+     <component name="iaupdateapi_stub_build">
       <unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
      </component>
     </collection>
     <collection name="iaupdate" long-name="IA Update" level="api">
-     <component name="IAD">
+     <component name="iad">
       <unit bldFile="mw/appinstall/iaupdate/iad/group"/>
      </component>
      <component name="iaupdate_help" long-name="Help">
@@ -7127,48 +4545,18 @@
      </component>
     </collection>
     <collection name="appinstall_info" long-name="Application Installation Info" level="api">
+     <component unofficial="yes" name="appinstall_pub" long-name="Application Installation Public Interfaces" class="api">
+      <unit bldFile="mw/appinstall/appinstall_pub/group"/>
+      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
+      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
+     </component>
      <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test">
       <!-- <unit bldFile="mw/appinstall/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="appinstall_build" long-name="Application Installation Build">
-      <unit bldFile="mw/appinstall/group"/>
-     </component>
-    </collection>
-    <collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-     <component unofficial="yes" name="iaupdate_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-     </component>
-     <component unofficial="yes" name="appmngr2runtimeapi">
-      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+     <component unofficial="yes" name="appinstall_plat" long-name="Application Installation Platform Interfaces" class="api">
       <!-- <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
-     </component>
-     <component unofficial="yes" name="sw_installer_common_ui_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="task_management_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="task_plugin_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_launcher_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_cr_keys">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_ps_keys">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_ui_plugin_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-     <component unofficial="yes" name="startup_list_management_api">
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
-      <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
+      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
+      <unit bldFile="mw/appinstall/appinstall_plat/group"/>
      </component>
     </collection>
     <collection name="secureswitools">
@@ -7180,7 +4568,7 @@
    </block>
    <block name="serviceapifw" long-name="Service API Framework" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
     <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-     <component name="servicehandler" long-name="Service Handler">
+     <component name="lifwservicehandler" long-name="Service Handler">
       <unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
      </component>
     </collection>
@@ -7198,41 +4586,17 @@
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
      </component>
     </collection>
-    <collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-     <component unofficial="yes" name="liw_criteria_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_generic_parameter_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_service_handler_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_common_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
+     <component unofficial="yes" name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_pub/group"/>
+     </component>
+     <component unofficial="yes" name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/group"/>
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
       <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="liw_service_interface_base_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_client_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_provider_utility_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_utility_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
       <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="liw_service_interface_menu_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-     </component>
-    </collection>
-    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
-     <component unofficial="yes" name="serviceapifw_test" long-name="Service API Framework Test">
-      <!-- <unit bldFile="mw/serviceapifw/tsrc/group"/> -->
-     </component>
      <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build">
       <unit bldFile="mw/serviceapifw/group"/>
      </component>
@@ -7242,8 +4606,8 @@
     <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
      <component name="appmanagerservice" long-name="App Manager Service"/>
      <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build">
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
      </component>
     </collection>
     <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
@@ -7262,11 +4626,11 @@
     <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
      <component name="landmarksservice" long-name="Landmarks Service"/>
      <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
      </component>
     </collection>
     <collection name="sapi_location" long-name="SAPI Location" level="mw2">
@@ -7276,10 +4640,10 @@
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
      </component>
     </collection>
@@ -7302,19 +4666,19 @@
     <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
      <component name="messagingservice" long-name="Messaging Service"/>
      <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
      </component>
     </collection>
@@ -7331,7 +4695,7 @@
      </component>
     </collection>
     <collection name="sapi_serviceregistry" long-name="SAPI Service Registry" level="os">
-     <component name="serviceregistryprovider.dll=binary">
+     <component name="serviceregistryprovider">
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
      </component>
@@ -7408,7 +4772,7 @@
      <component name="pagescaler" long-name="Page Scaler">
       <unit bldFile="mw/web/webengine/pagescaler/group"/>
      </component>
-     <component name="widgetinstaller" long-name="Widget Installer">
+     <component name="webwidgetinstaller" long-name="Widget Installer">
       <unit bldFile="mw/web/webengine/widgetinstaller/group"/>
      </component>
      <component name="widgetregistry" long-name="Widget Registry">
@@ -7496,92 +4860,19 @@
       <unit bldFile="mw/web/codhandler/group"/>
      </component>
     </collection>
-    <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-     <component unofficial="yes" name="favourites_engine_api">
+    <collection name="web_info" long-name="Web Info" level="specific">
+     <component unofficial="yes" name="web_pub" long-name="Web Public Interfaces" class="api">
+      <!-- <unit bldFile="mw/web/web_pub/browser_control_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/web/web_pub/favourites_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_api">
-      <unit bldFile="mw/web/web_pub/settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_control_api">
-      <unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-      <!-- <unit bldFile="mw/web/web_pub/browser_control_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="web_pub_build" long-name="Web Public API Build">
       <unit bldFile="mw/web/web_pub/group"/>
      </component>
-     <component unofficial="yes" name="download_mgr_client_api">
-      <!-- <unit bldFile="mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
-      <unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="download_mgr_ui_api">
-      <unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_plugin_api">
-      <unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="web_info" long-name="Web Info" level="specific">
      <component unofficial="yes" name="web_build" long-name="Web Build">
       <unit bldFile="mw/web/group"/>
      </component>
-    </collection>
-    <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-     <component unofficial="yes" name="launcher_api">
-      <unit bldFile="mw/web/web_plat/launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_dialogs_provider_api">
-      <unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_manager_api">
-      <unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_parser_api">
-      <unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="cxml_library_api">
-      <unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-     </component>
-     <component unofficial="yes" name="cod_handler_api">
-      <unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_plat_build" long-name="Web Platform API Build">
+     <component unofficial="yes" name="web_plat" long-name="Web Platform Interfaces" class="api">
       <unit bldFile="mw/web/web_plat/group"/>
      </component>
-     <component unofficial="yes" name="feeds_engine_api">
-      <unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_platform_api">
-      <unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-     </component>
-     <component unofficial="yes" name="webutils_api">
-      <unit bldFile="mw/web/web_plat/webutils_api/group"/>
-     </component>
-     <component unofficial="yes" name="download_mgr_client_api_extn">
-      <unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-     </component>
-     <component unofficial="yes" name="recent_url_store_api">
-      <unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="scheme_handler_plugin_api">
-      <unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="scriptable_plugin_api">
-      <unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="widget_registry_api">
-      <unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-     </component>
-     <component unofficial="yes" name="rt_gesturehelper_api">
-      <unit bldFile="mw/web/web_plat/rt_gesturehelper_api/group"/>
-     </component>
-     <component unofficial="yes" name="multipart_parser_api">
-      <unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_browser_provider_api">
-      <unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="websrv" long-name="Web Services" tech_domain="rt" level="generic" levels="plugin framework server generic specific">
@@ -7668,64 +4959,44 @@
       <unit bldFile="mw/websrv/webservices/group"/>
      </component>
     </collection>
-    <collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="web_service_description_api">
+    <collection name="websrv_info" long-name="Web Services Info" level="specific">
+     <component unofficial="yes" name="websrv_build" long-name="Web Services Build">
+      <unit bldFile="mw/websrv/group"/>
+     </component>
+     <component unofficial="yes" name="websrv_pub" long-name="Web Services Public Interfaces" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_extensions_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_fragment_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
-     </component>
-     <component unofficial="yes" name="web_service_manager_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
-     </component>
-     <component unofficial="yes" name="hostlet_connection_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_service_messaging_api">
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_service_connection_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
-     </component>
-    </collection>
-    <collection name="websrv_info" long-name="Web Services Info" level="specific">
-     <component unofficial="yes" name="websrv_build" long-name="Web Services Build">
-      <unit bldFile="mw/websrv/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
      </component>
     </collection>
    </block>
@@ -7739,7 +5010,7 @@
      </component>
     </collection>
     <collection name="emulatorlan" long-name="Emulator Lan" level="1">
-     <component name="emulatorlan compo" long-name="Emulator LAN Component">
+     <component name="emulatorlan_build" long-name="Emulator LAN Component">
       <unit bldFile="app/conntools/emulatorlan/group"/>
      </component>
     </collection>
@@ -7769,18 +5040,18 @@
      <component name="gditools" long-name="GDI Tools">
       <unit bldFile="mw/uitools/gfxtools/gditools/group"/>
      </component>
-     <component name="Color">
+     <component name="color">
       <unit bldFile="mw/uitools/gfxtools/color/group"/>
      </component>
     </collection>
     <collection name="reszip" long-name="Reszip" level="encode">
-     <component name="reszip.exe=binary">
+     <component name="reszip_build">
       <unit bldFile="mw/uitools/reszip/group"/>
      </component>
     </collection>
     <collection name="toollibraries" long-name="Tool Libraries" level="tool">
-     <component name="Arabica"/>
-     <component name="XercesC" long-name="Xerces C"/>
+     <component name="arabica"/>
+     <component name="xercesc" long-name="Xerces C"/>
      <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build">
       <!-- <unit bldFile="mw/uitools/toollibraries/group"/> -->
      </component>
@@ -7794,31 +5065,15 @@
      </component>
     </collection>
     <collection name="uitools_info" long-name="UI Tools Info" level="tool">
-     <component unofficial="yes" name="aknlayoutcompiler">
-      <unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-     </component>
-     <component unofficial="yes" name="cdlcompiler">
-      <unit bldFile="mw/uitools/cdlcompiler/group"/>
+     <component unofficial="yes" name="uitools_plat" long-name="UI Tools Platform Interfaces" class="api">
+      <unit bldFile="mw/uitools/uitools_plat/group"/>
+     </component>
+     <component unofficial="yes" name="uitools_pub" long-name="UI Tools Public Interfaces" class="api">
+      <unit bldFile="mw/uitools/uitools_pub/group"/>
      </component>
      <component unofficial="yes" name="uitools_build" long-name="UI Tools Build">
       <unit bldFile="mw/uitools/group"/>
      </component>
-     <component unofficial="yes" name="cdlcompilertoolkit">
-      <unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="tool">
-     <component unofficial="yes" name="layout_system_private_api">
-      <unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-     </component>
-     <component unofficial="yes" name="cdl_api">
-      <unit bldFile="mw/uitools/uitools_plat/cdl_api/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="tool">
-     <component unofficial="yes" name="third_party_bitmap_palette_api">
-      <unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-     </component>
     </collection>
    </block>
   </layer>
@@ -7879,22 +5134,22 @@
      </component>
     </collection>
     <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-     <component name="lmrefapp.exe=binary">
+     <component name="lmrefapp">
       <unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
      </component>
     </collection>
     <collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-     <component name="LmUiRefApp.exe=binary">
+     <component name="lmuirefapp">
       <unit bldFile="app/location/locationlandmarksuirefapp/group"/>
      </component>
     </collection>
     <collection name="locationsatviewrefapp" long-name="Location Sat View Reference App" level="apps">
-     <component name="SatelliteReference.exe=binary">
+     <component name="satellitereference">
       <unit bldFile="app/location/locationsatviewrefapp/group"/>
      </component>
     </collection>
     <collection name="simpsyconfigurator" long-name="SIM PSY Configurator" level="engine">
-     <component name="simpsyui.exe=binary">
+     <component name="simpsyui">
       <unit bldFile="app/location/simpsyconfigurator/group"/>
      </component>
     </collection>
@@ -7904,22 +5159,19 @@
      </component>
     </collection>
     <collection name="location_info" long-name="Location Apps Info" level="apps">
-     <component unofficial="yes" name="landmarks_ui_selector_api">
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
-      <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/group"/>
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="landmarks_ui_addedit_api">
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
-     </component>
      <component unofficial="yes" name="location_build" long-name="Location Apps Build">
       <unit bldFile="app/location/group"/>
      </component>
      <component unofficial="yes" name="location_test" long-name="Location Apps Test">
       <!-- <unit bldFile="app/location/tsrc/group"/> -->
      </component>
+     <component unofficial="yes" name="loc_pub" class="api">
+      <unit bldFile="app/location/loc_pub/group"/>
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
+     </component>
     </collection>
    </block>
    <block name="mmsharinguis" long-name="Multimedia Sharing UIs" tech_domain="vc" level="services" levels="base plugin">
@@ -8002,26 +5254,18 @@
      <component unofficial="yes" name="cenrepeditor">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/cenrepeditor/group"/> -->
      </component>
+     <component unofficial="yes" name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" class="api">
+      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="mustestapp">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/mustestapp/group"/> -->
      </component>
     </collection>
-    <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="multimedia_sharing_resource_api">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_sharing_manager_api">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="multimedia_sharing_settings_api">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="phone" long-name="Phone Apps" tech_domain="vc" level="apps" span="2" levels="engine plugin ui apps">
     <collection name="phoneapp" long-name="Phone App" level="apps">
-     <component name="Blacklist">
+     <component name="blacklist">
       <unit bldFile="app/phone/phoneapp/blacklist/group"/>
      </component>
      <component name="phoneui" long-name="Phone UI">
@@ -8052,7 +5296,7 @@
      </component>
     </collection>
     <collection name="phoneengine" long-name="Phone Engine" level="engine">
-     <component name="PhoneCntFinder" long-name="Phone Contact Finder">
+     <component name="phonecntfinder" long-name="Phone Contact Finder">
       <unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
      </component>
      <component name="audiohandling" long-name="Audio Handling">
@@ -8090,23 +5334,23 @@
       <unit bldFile="app/phone/phoneuis/dialer/group"/>
       <!-- <unit bldFile="app/phone/phoneuis/dialer/tsrc/public/basic/group"/> -->
      </component>
-     <component name="BubbleManager" long-name="Bubble Manager">
+     <component name="bubblemanager" long-name="Bubble Manager">
       <unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
      </component>
-     <component name="ConnectUtil" long-name="Connect Util">
+     <component name="connectutil" long-name="Connect Util">
       <unit bldFile="app/phone/phoneuis/connectutil/group"/>
      </component>
-     <component name="SFIUtils" long-name="SFI Utils">
+     <component name="sfiutils" long-name="SFI Utils">
       <unit bldFile="app/phone/phoneuis/sfiutils/group"/>
       <!-- <unit bldFile="app/phone/phoneuis/sfiutils/tsrc/public/basic/group"/> -->
      </component>
-     <component name="Ussd" long-name="USSD">
+     <component name="ussd" long-name="USSD">
       <unit bldFile="app/phone/phoneuis/ussd/group"/>
      </component>
      <component name="vmbx" long-name="Vmbx">
       <unit bldFile="app/phone/phoneuis/vmbx/group"/>
      </component>
-     <component name="TelephonyDeviceMode" long-name="Telephony Device Mode">
+     <component name="telephonydevicemode" long-name="Telephony Device Mode">
       <unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
      </component>
     </collection>
@@ -8119,67 +5363,14 @@
      <component unofficial="yes" name="phone_build" long-name="Phone Apps Build">
       <unit bldFile="app/phone/group"/>
      </component>
-    </collection>
-    <collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="telephony_microphone_mute_status_api">
-      <unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="3d_ringing_tone_enabler_api">
-      <unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_device_mode_api">
-      <unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_video_mailbox_settings_api">
-      <unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_comms_information_api">
-      <unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialer_keypad_api">
-      <unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_application_voip_commands_api">
-      <unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_matching_extension_api">
-      <unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="sfi_utility_api">
-      <unit bldFile="app/phone/phone_plat/sfi_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_information_api">
-      <unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_menu_extension_api">
-      <unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_bubble_extension_api">
-      <unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_logging_extension_api">
-      <unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_mediator_api">
-      <unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_telephony_mediator_api">
-      <unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_configuration_api">
-      <unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_application_commands_api">
-      <unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_remote_party_information_api">
-      <unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+     <component unofficial="yes" name="phone_plat" long-name="Phone Apps Platform Interfaces" class="api">
+      <unit bldFile="app/phone/phone_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="videotelephony" long-name="Video Telephony Apps" tech_domain="vc" level="apps" levels="engine plugin prot ui">
     <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
-     <component name="PacketVideoEngineBinaries" long-name="Packet Video Engine Binaries"/>
+     <component name="packetvideoenginebinaries" long-name="Packet Video Engine Binaries"/>
     </collection>
     <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
      <component name="videoteleng" long-name="Videotel Engine">
@@ -8203,10 +5394,10 @@
      </component>
     </collection>
     <collection name="vtprotocolplugins" long-name="Video Telephony Protocol Plugins" level="plugin">
-     <component name="DisplaySink" long-name="Display Sink">
+     <component name="displaysink" long-name="Display Sink">
       <unit bldFile="app/videotelephony/vtprotocolplugins/displaysink/group"/>
      </component>
-     <component name="VideoSource" long-name="Video Source">
+     <component name="videosource" long-name="Video Source">
       <unit bldFile="app/videotelephony/vtprotocolplugins/videosource/group"/>
      </component>
      <component unofficial="yes" name="vtprotocolplugins_build" long-name="Video Telephony Protocol Plugins Build">
@@ -8214,19 +5405,16 @@
      </component>
     </collection>
     <collection name="vtprotocols" long-name="Video Telephony Protocols" level="prot">
-     <component name="videotelproto.dll=binary"/>
+     <!-- Empty duplicate component videotelproto.dll=binary removed -->
     </collection>
     <collection name="vtprotocolsstub" long-name="Video Telephony Protocols Stub" level="prot">
-     <component name="videotelproto.dll=binary">
+     <component name="videotelproto">
       <unit bldFile="app/videotelephony/vtprotocolsstub/group"/>
      </component>
     </collection>
-    <collection name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="video_telephony_media_configuration_api">
-      <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_telephony_control_mediator_api">
-      <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+    <collection name="videotelephony_info" long-name="Video Telephony Apps Info" level="ui">
+     <component unofficial="yes" name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" class="api">
+      <unit bldFile="app/videotelephony/videotelephony_plat/group"/>
      </component>
     </collection>
    </block>
@@ -8243,7 +5431,7 @@
      </component>
     </collection>
     <collection name="pocui" long-name="PoC Ui" level="ui">
-     <component name="PoCUiIntgr" long-name="PoC UI Intgr">
+     <component name="pocuiintgr" long-name="PoC UI Intgr">
       <unit bldFile="app/poc/pocui/pocuiintgr/group"/>
       <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
       <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiecomplugin/group"/> -->
@@ -8260,21 +5448,13 @@
      <component unofficial="yes" name="poc_build" long-name="PoC Build">
       <unit bldFile="app/poc/group"/>
      </component>
+     <component unofficial="yes" name="poc_plat" long-name="PoC Platform Interfaces" class="api">
+      <unit bldFile="app/poc/poc_plat/group"/>
+     </component>
      <component unofficial="yes" name="poc_help" long-name="PoC Help">
       <unit bldFile="app/poc/help/group"/>
      </component>
     </collection>
-    <collection name="poc_plat" long-name="PoC Platform Interfaces" level="ui">
-     <component unofficial="yes" name="poc_sessions_api">
-      <unit bldFile="app/poc/poc_plat/poc_sessions_api/group"/>
-     </component>
-     <component unofficial="yes" name="poc_ui_integration_services_api">
-      <unit bldFile="app/poc/poc_plat/poc_ui_integration_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="poc_api" long-name="PoC API">
-      <unit bldFile="app/poc/poc_plat/poc_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="iptelephony" long-name="IP Telephony" tech_domain="vc" level="apps" levels="plugin eng ui">
     <collection name="commsconfig" long-name="Comms Config" level="ui">
@@ -8317,7 +5497,7 @@
      </component>
     </collection>
     <collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="eng">
-     <component name="svp.dll=binary">
+     <component name="svp">
       <unit bldFile="app/iptelephony/sipvoipprovider/group"/>
      </component>
     </collection>
@@ -8381,26 +5561,11 @@
      </component>
     </collection>
     <collection name="iptelephony_info" long-name="IP Telephony Info" level="ui">
-     <component unofficial="yes" name="cch_server_api">
-      <unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="cch_client_api">
-      <unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="vcc_api">
-      <unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-     </component>
      <component unofficial="yes" name="iptelephony_build" long-name="IP Telephony Build">
       <unit bldFile="app/iptelephony/group"/>
      </component>
-     <component unofficial="yes" name="richcallsettingsengine_api">
-      <unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-     </component>
-     <component unofficial="yes" name="csc_settingsui_api">
-      <unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-     </component>
-     <component unofficial="yes" name="vccpropertyhandler_api">
-      <unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+     <component unofficial="yes" name="iptel_plat" class="api">
+      <unit bldFile="app/iptelephony/iptel_plat/group"/>
      </component>
     </collection>
    </block>
@@ -8415,7 +5580,7 @@
      <component name="service" long-name="Service">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
      </component>
-     <component name="gsplugin" long-name="GS Plugin">
+     <component name="dasgsplugin" long-name="GS Plugin">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
      </component>
      <component unofficial="yes" name="defaultapplicationsettings_build" long-name="Default Application Settings Build">
@@ -8428,18 +5593,18 @@
      </component>
     </collection>
     <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
+     <component unofficial="yes" name="devmngt_pub" class="api">
+      <unit bldFile="app/settingsuis/devmngt_pub/group"/>
+     </component>
      <component unofficial="yes" name="settingsuis_build" long-name="Settings UIs Build">
       <unit bldFile="app/settingsuis/group"/>
      </component>
-     <component unofficial="yes" name="default_app_client_api">
-      <!-- <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
-      <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
-     </component>
      <component unofficial="yes" name="settingsuis_test" long-name="Settings UIs Test">
       <!-- <unit bldFile="app/settingsuis/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="services_db_api">
-      <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group"/>
+     <component unofficial="yes" name="devmngt_plat" class="api">
+      <!-- <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
+      <unit bldFile="app/settingsuis/devmngt_plat/group"/>
       <!-- <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/tsrc/servicesdbapitest/group"/> -->
      </component>
     </collection>
@@ -8455,7 +5620,7 @@
      <component name="applicationmanagement_server" long-name="Server">
       <unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
      </component>
-     <component name="RfsPlugin">
+     <component name="rfsplugin">
       <unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
      </component>
      <component name="amadapter2" long-name="AM Adapter2">
@@ -8463,10 +5628,10 @@
      </component>
     </collection>
     <collection name="customization" long-name="Customization" level="2">
-     <component name="DMUtils">
+     <component name="dmutils">
       <unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
      </component>
-     <component name="UISettingsSrv">
+     <component name="uisettingssrv">
       <unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
      </component>
      <component name="isadapter" long-name="IS Adapter">
@@ -8475,19 +5640,19 @@
      <component name="supadapter" long-name="SUPAdapter">
       <unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
      </component>
-     <component name="WallpaperAdapter">
+     <component name="wallpaperadapter">
       <unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
      </component>
-     <component name="OperatorLogoAdapter">
+     <component name="operatorlogoadapter">
       <unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
      </component>
-     <component name="ScreenSaverAdapter">
+     <component name="screensaveradapter">
       <unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
      </component>
-     <component name="ThemesAdapter">
+     <component name="themesadapter">
       <unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
      </component>
-     <component name="EmbeddedLinkAdapter">
+     <component name="embeddedlinkadapter">
       <unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
      </component>
     </collection>
@@ -8504,8 +5669,8 @@
      <component unofficial="yes" name="contentcontrol_build" long-name="Content Control Daemons Build">
       <unit bldFile="app/contentcontrol/group"/>
      </component>
-     <component unofficial="yes" name="oma_ds_presync_plugin_api">
-      <unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+     <component unofficial="yes" name="contentctrl_plat" class="api">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/group"/>
      </component>
     </collection>
    </block>
@@ -8535,6 +5700,9 @@
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
      </component>
+     <component unofficial="yes" name="fotaapp">
+      <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
+     </component>
     </collection>
     <collection name="omadm" long-name="OMA Device Management" level="oma">
      <component name="omadmappui" long-name="OMA DM App UI">
@@ -8568,10 +5736,10 @@
      <component unofficial="yes" name="customization_test">
       <!-- <unit bldFile="app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
      </component>
-     <component unofficial="yes" name="applicationmanagement">
+     <component unofficial="yes" name="applicationmanagement_build">
       <unit bldFile="app/devicecontrol/applicationmanagement/group"/>
      </component>
-     <component unofficial="yes" name="customization">
+     <component unofficial="yes" name="customization_build">
       <unit bldFile="app/devicecontrol/customization/group"/>
      </component>
      <component unofficial="yes" name="applicationmanagement_test">
@@ -8580,11 +5748,11 @@
     </collection>
    </block>
    <block name="printing" long-name="Printing" tech_domain="de" level="services" levels="app">
-    <collection name="ImagePrint" long-name="ImagePrint" level="app">
+    <collection name="imageprint" long-name="ImagePrint" level="app">
      <component name="clog">
       <unit bldFile="app/printing/imageprint/clog/group"/>
      </component>
-     <component name="ImagePrintEngine">
+     <component name="imageprintengine">
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
@@ -8593,7 +5761,7 @@
       <unit bldFile="app/printing/imageprint/imageprintengine/group"/>
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/imageprintserver/group"/> -->
      </component>
-     <component name="ImagePrintUI">
+     <component name="imageprintui">
       <unit bldFile="app/printing/imageprint/imageprintui/group"/>
      </component>
      <component unofficial="yes" name="imageprint_build">
@@ -8611,7 +5779,7 @@
      <component name="filemanager_help" long-name="Help">
       <unit bldFile="app/files/filemanager/help/group"/>
      </component>
-     <component unofficial="yes" name="filemanager_build" long-name="File Manager Build">
+     <component name="filemanager_build">
       <unit bldFile="app/files/filemanager/group"/>
      </component>
     </collection>
@@ -8626,12 +5794,10 @@
       <unit bldFile="app/files/filesystemuis/group"/>
      </component>
     </collection>
-    <collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="memory_scan_popup_ui_api">
-      <unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-     </component>
-    </collection>
     <collection name="files_info" long-name="File Manager Apps Info" level="apps">
+     <component unofficial="yes" name="files_plat" long-name="File Manager Apps Platform Interfaces" class="api">
+      <unit bldFile="app/files/files_plat/group"/>
+     </component>
      <component unofficial="yes" name="files_build" long-name="File Manager Apps Build">
       <unit bldFile="app/files/group"/>
      </component>
@@ -8658,13 +5824,13 @@
      </component>
     </collection>
     <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-     <component name="Phonebook">
+     <component name="phonebook">
       <unit bldFile="app/contacts/phonebookui/phonebook/group"/>
      </component>
-     <component name="Speeddial" long-name="Speed Dial">
+     <component name="speeddial" long-name="Speed Dial">
       <unit bldFile="app/contacts/phonebookui/speeddial/group"/>
      </component>
-     <component name="Phonebook2" long-name="Phone Book 2">
+     <component name="phonebook2" long-name="Phone Book 2">
       <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group"/> -->
       <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group"/> -->
       <unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
@@ -8676,13 +5842,13 @@
      </component>
     </collection>
     <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-     <component name="CntFindPlugin" long-name="Cnt Find Plugin">
+     <component name="cntfindplugin" long-name="Cnt Find Plugin">
       <unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
      </component>
-     <component name="CntSortPlugin" long-name="Cnt Sort Plugin">
+     <component name="cntsortplugin" long-name="Cnt Sort Plugin">
       <unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
      </component>
-     <component name="VirtualPhonebook" long-name="Virtual Phonebook">
+     <component name="virtualphonebook" long-name="Virtual Phonebook">
       <unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
       <!-- <unit bldFile="app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_selectorfactory/group"/> -->
       <!-- <unit bldFile="app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_strcntanalyzer/group"/> -->
@@ -8730,19 +5896,19 @@
      </component>
     </collection>
     <collection name="predictivesearch" long-name="Predictive Search" level="support">
-     <component name="PcsUtils" long-name="PCS Utils">
+     <component name="pcsutils" long-name="PCS Utils">
       <unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
      </component>
-     <component name="PcsServerClientAPI" long-name="PCS Server Client API">
+     <component name="pcsserverclientapi" long-name="PCS Server Client API">
       <unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
      </component>
-     <component name="PcsServer" long-name="PCS Server">
+     <component name="pcsserver" long-name="PCS Server">
       <unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
      </component>
      <component name="adapters" long-name="Adapters">
       <unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
      </component>
-     <component name="PcsAlgorithm" long-name="PCS Algorithm">
+     <component name="pcsalgorithm" long-name="PCS Algorithm">
       <unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
      </component>
      <component unofficial="yes" name="predictivesearch_build" long-name="Predictive Search Build">
@@ -8753,186 +5919,29 @@
      <component unofficial="yes" name="contacts_build" long-name="Contacts Apps Build">
       <unit bldFile="app/contacts/group"/>
      </component>
-    </collection>
-    <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="speed_dial_dialogs_api">
-      <!-- <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_controls_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="logs_engine_api_extensions">
-      <unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-     </component>
-     <component unofficial="yes" name="logs_timers_api">
-      <unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_common_ui_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_image_management_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_data_management_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_plugin_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="cca_launch_api">
+     <component unofficial="yes" name="contacts_plat" long-name="Contacts Apps Platform Interfaces" class="api">
       <!-- <unit bldFile="app/contacts/contacts_plat/cca_launch_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_view_definition_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_configuration_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_definition_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_engine_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="predictivesearch_client_api">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_cache_api">
+      <!-- <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
+      <unit bldFile="app/contacts/contacts_plat/group"/>
+      <!-- <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/contacts/contacts_plat/presence_cache_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_policy_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
+      <!-- <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
       <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="contactpresence_api">
-      <!-- <unit bldFile="app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_ui_utilities_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_vcard_api">
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_common_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_utilities_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_sim_services_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
       <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="predictivesearch_algorithm_api">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_icon_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_store_property_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_thumbnails_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_copy_policy_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_xsp_extension_manager_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_commands_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="logs_ui_command_line_api">
-      <unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_store_api">
       <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_engine_extension_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="cca_view_plugin_api">
-      <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="predictivesearch_adapters_api">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-     </component>
-     <component unofficial="yes" name="cms_contactor_api">
-      <unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_extension_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_ui_controls_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_store_configuration_management_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_presentation_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_appfw_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_public_constants_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_thin_ui_extension_plugin_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_xsp_view_activation_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_migration_support_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="predictivesearch_utils_api">
-      <!-- <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-     </component>
-    </collection>
-    <collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-     <component unofficial="yes" name="phonebook_ui_utilities_api">
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="contacts_pub" long-name="Contacts Apps Public Interfaces" class="api">
+      <unit bldFile="app/contacts/contacts_pub/group"/>
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
       <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_thumbnail_operation_api">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_data_management_api">
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_data_addedit_ui_api">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phonebook_vcard_importexport_api">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
       <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="speed_dial_utility_control_api">
-      <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
       <!-- <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/> -->
      </component>
-     <component unofficial="yes" name="phonebook_fetch_ui_api">
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="organizer" long-name="Organizer Application Suite" tech_domain="pr" level="apps" span="2" levels="support services engine ui">
@@ -8986,7 +5995,7 @@
       <unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
       <unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
      </component>
-     <component name="inc"/>
+     <!-- Empty duplicate component inc removed -->
      <component unofficial="yes" name="calendarui_build" long-name="Calendar UI Build">
       <unit bldFile="app/organizer/calendarui/group"/>
      </component>
@@ -9098,86 +6107,22 @@
       <unit bldFile="app/organizer/searchfw/group"/>
      </component>
     </collection>
-    <collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="ui">
-     <component unofficial="yes" name="notepad_library_api">
-      <unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
+    <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
+     <component unofficial="yes" name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" class="api">
+      <!-- <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
+      <unit bldFile="app/organizer/organizer_pub/group"/>
       <!-- <unit bldFile="app/organizer/organizer_pub/notepad_library_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="calendar_interim_utils2_api">
-      <!-- <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-     </component>
-    </collection>
-    <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
      <component unofficial="yes" name="organizer_build" long-name="Organizer Application Suite Build">
       <unit bldFile="app/organizer/group"/>
      </component>
-    </collection>
-    <collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="ui">
-     <component unofficial="yes" name="calendar_importer_api">
+     <component unofficial="yes" name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" class="api">
+      <!-- <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_ui_secondary_display_api">
-      <unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_const_api">
-      <unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_ui_external_control_api">
-      <unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_custamization_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
-     </component>
-     <component unofficial="yes" name="searchui_launcher_api">
-      <unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_exporter_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="meeting_request_utillities_api">
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_alarm_editor_api">
-      <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
       <!-- <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="meeting_request_viewer_api">
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-     </component>
-     <component unofficial="yes" name="searchfw_launcher_api">
-      <unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="agenda_versit_2_api">
-      <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
-      <!-- <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="meeting_request_mailbox_utilities_api">
+      <unit bldFile="app/organizer/organizer_plat/group"/>
       <!-- <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_common_utils_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="meeting_request_uids_api">
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
-     </component>
-     <component unofficial="yes" name="agenda_entry_ui_api">
-      <unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="clock_settings_api">
-      <unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_launcher_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_settings_keys_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_tones_settings_keys_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
      </component>
     </collection>
    </block>
@@ -9364,94 +6309,33 @@
      </component>-->
     </collection>
     <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-     <component unofficial="yes" name="mms_client_mtm_api">
-      <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
+     <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test">
+      <!-- <unit bldFile="app/messaging/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="msg_plat" class="api">
+      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
+      <unit bldFile="app/messaging/msg_plat/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_editor_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_application_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_conformance_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/tsrc/group"/>
+      <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
+      <unit bldFile="app/messaging/msg_plat/smil_engine_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="msg_pub" class="api">
+      <unit bldFile="app/messaging/msg_pub/group"/>
       <!-- <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="email_domain_utilities_api">
-      <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
-      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
+      <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/group"/>
+      <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
+      <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build">
       <unit bldFile="app/messaging/group"/>
      </component>
-     <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test">
-      <!-- <unit bldFile="app/messaging/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="messaging_media_resolver_api">
-      <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_center_ui_utilities_api">
-      <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_message_notification_api">
-      <unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_status_api">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_new_message_notification_api">
-      <unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_mail_mtm_ui_api">
-      <unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_engine_settings_api">
-      <unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_integration_api">
-      <unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_application_api">
-      <unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="plugin_bio_control_api">
-      <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mms_server_settings_api">
-      <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_meeting_request_api">
-      <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
-      <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-     </component>
-     <component unofficial="yes" name="mail_ui_constants_api">
-      <unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contact_notes_extended_api">
-      <unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="unified_editor_video_conversion_api">
-      <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_secondary_display_api">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_editor_api">
-      <unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_player_launch_api">
-      <unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_codec_client_api">
-      <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_engine_api">
-      <unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_transition_api">
-      <unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_conformance_api">
-      <unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_variables_api">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_editor_constants_api">
-      <unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="commonemail" long-name="Email Apps" tech_domain="pr" level="apps" levels="service support ui app">
@@ -9574,7 +6458,7 @@
      </component>
     </collection>
     <collection name="emailhelp" long-name="Email Help" level="support">
-     <component name="emailhelp compo">
+     <component name="emailhelp_build">
       <!-- <unit bldFile="app/commonemail/emailhelp/group"/> -->
      </component>
     </collection>
@@ -9582,23 +6466,23 @@
      <component name="iad_rofs" long-name="IAD ROFS"/>
      <component name="ls_pt_hack" long-name="ls pt hack"/>
      <component name="settingwizard" long-name="Setting Wizard"/>
-     <component name="starter" long-name="Starter"/>
+     <!-- Empty duplicate component starter removed -->
     </collection>
     <collection name="commonemail_help" long-name="Email Help" level="support">
-     <component name="help compo"/>
+     <component name="help"/>
     </collection>
     <collection name="commonemail_info" long-name="Email Apps Info" level="app">
+     <component unofficial="yes" name="email_plat" class="api">
+      <unit bldFile="app/commonemail/email_plat/group"/>
+     </component>
      <component unofficial="yes" name="commonemail_build" long-name="Email Apps Build">
       <unit bldFile="app/commonemail/group"/>
      </component>
-     <component unofficial="yes" name="email_setup_plugin_api">
-      <unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="conversations" long-name="Conversation Apps" tech_domain="pr" level="apps" levels="settings utils ui">
     <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-     <component name="vimpstsettings.dll=binary">
+     <component name="vimpstsettings">
       <unit bldFile="app/conversations/uiservicetabsettings/group"/>
      </component>
     </collection>
@@ -9666,21 +6550,13 @@
      </component>
     </collection>
     <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
+     <component unofficial="yes" name="conversations_plat" long-name="Conversation Apps Platform Interfaces" class="api">
+      <unit bldFile="app/conversations/conversations_plat/group"/>
+     </component>
      <component unofficial="yes" name="conversations_build" long-name="Conversation Apps Build">
       <unit bldFile="app/conversations/group"/>
      </component>
     </collection>
-    <collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="im_cv_launcher_api">
-      <unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="conversations_plat_build" long-name="Conversation Apps Platform API Build">
-      <unit bldFile="app/conversations/conversations_plat/group"/>
-     </component>
-     <component unofficial="yes" name="im_connection_api">
-      <unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="im" long-name="Instant Messaging Apps" tech_domain="pr" level="apps" levels="support engine apps">
     <collection name="impsengine" long-name="IMPS Engine" level="engine">
@@ -9699,10 +6575,10 @@
      <component name="imlauncher" long-name="IM Launcher">
       <!-- <unit bldFile="app/im/impsengine/imlauncher/group"/> -->
      </component>
-     <component name="ImpsDataChannel" long-name="Imps Data Channel">
+     <component name="impsdatachannel" long-name="Imps Data Channel">
       <!-- <unit bldFile="app/im/impsengine/impsdatachannel/group"/> -->
      </component>
-     <component name="ImpsIpCirWatcher" long-name="Imps Ip Cir Watcher">
+     <component name="impsipcirwatcher" long-name="Imps Ip Cir Watcher">
       <!-- <unit bldFile="app/im/impsengine/impsipcirwatcher/group"/> -->
      </component>
      <component name="messageencoder" long-name="Message Encoder">
@@ -9719,8 +6595,8 @@
      </component>
      <component unofficial="yes" name="impsengine_test" long-name="IMPS Engine Test">
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertimerprocess/group"/> -->
+      <!-- <unit bldFile="app/im/impsengine/tsrc/public/advance/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertest/group"/> -->
-      <!-- <unit bldFile="app/im/impsengine/tsrc/public/advance/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertestplugin/group"/> -->
      </component>
@@ -9729,34 +6605,34 @@
      </component>
     </collection>
     <collection name="pecengine" long-name="Presence Engine" level="engine">
-     <component name="CoreUtilsLib2" long-name="Core Utils Lib 2">
+     <component name="coreutilslib2" long-name="Core Utils Lib 2">
       <!-- <unit bldFile="app/im/pecengine/coreutilslib2/group"/> -->
      </component>
-     <component name="StorageManager2" long-name="Storage Manager 2">
+     <component name="storagemanager2" long-name="Storage Manager 2">
       <!-- <unit bldFile="app/im/pecengine/storagemanager2/group"/> -->
      </component>
-     <component name="Parser2">
+     <component name="pecparser2">
       <!-- <unit bldFile="app/im/pecengine/parser2/group"/> -->
      </component>
-     <component name="AttributeLibrary2" long-name="Attribute Library 2">
+     <component name="attributelibrary2" long-name="Attribute Library 2">
       <!-- <unit bldFile="app/im/pecengine/attributelibrary2/group"/> -->
      </component>
-     <component name="ListLibrary2" long-name="List Library 2">
+     <component name="listlibrary2" long-name="List Library 2">
       <!-- <unit bldFile="app/im/pecengine/listlibrary2/group"/> -->
      </component>
-     <component name="TransferAdapter2" long-name="Transfer Adapter 2">
+     <component name="transferadapter2" long-name="Transfer Adapter 2">
       <!-- <unit bldFile="app/im/pecengine/transferadapter2/group"/> -->
      </component>
-     <component name="PresenceServer2" long-name="Presence Server 2">
+     <component name="presenceserver2" long-name="Presence Server 2">
       <!-- <unit bldFile="app/im/pecengine/presenceserver2/group"/> -->
      </component>
-     <component name="PresenceManager2" long-name="Presence Manager 2">
+     <component name="presencemanager2" long-name="Presence Manager 2">
       <!-- <unit bldFile="app/im/pecengine/presencemanager2/group"/> -->
      </component>
-     <component name="JanitorPlugin2" long-name="Janitor Plugin 2">
+     <component name="janitorplugin2" long-name="Janitor Plugin 2">
       <!-- <unit bldFile="app/im/pecengine/janitorplugin2/group"/> -->
      </component>
-     <component name="PluginServer2" long-name="Plugin Server 2">
+     <component name="pluginserver2" long-name="Plugin Server 2">
       <!-- <unit bldFile="app/im/pecengine/pluginserver2/group"/> -->
      </component>
      <component unofficial="yes" name="pecengine_build" long-name="Presence Engine Build">
@@ -9764,7 +6640,7 @@
      </component>
     </collection>
     <collection name="presadap12" long-name="Presence Adap 12" level="support">
-     <component name="Parser2">
+     <component name="presparser2">
       <!-- <unit bldFile="app/im/presadap12/parser2/group"/> -->
      </component>
      <component name="impsplugin" long-name="IMPS Plugin">
@@ -9775,7 +6651,7 @@
      </component>
     </collection>
     <collection name="wvsettings20" long-name="WV Settings 20" level="support">
-     <component name="WVSAPSettingsStore.dll=binary">
+     <component name="wvsapsettingsstore">
       <unit bldFile="app/im/wvsettings20/group"/>
      </component>
     </collection>
@@ -9783,13 +6659,13 @@
      <component name="imindicatorplugin" long-name="IM Indicator Plugin">
       <!-- <unit bldFile="app/im/wvuing/imindicatorplugin/group"/> -->
      </component>
-     <component name="IMPSConnectionUI" long-name="IMPS Connection UI">
+     <component name="impsconnectionui" long-name="IMPS Connection UI">
       <!-- <unit bldFile="app/im/wvuing/impsconnectionui/group"/> -->
      </component>
-     <component name="IMPSServiceSettingsUI" long-name="IMPS Service Settings UI">
+     <component name="impsservicesettingsui" long-name="IMPS Service Settings UI">
       <!-- <unit bldFile="app/im/wvuing/impsservicesettingsui/group"/> -->
      </component>
-     <component name="IMPSAlwaysOnlinePlugin" long-name="IMPS Always Online Plugin">
+     <component name="impsalwaysonlineplugin" long-name="IMPS Always Online Plugin">
       <!-- <unit bldFile="app/im/wvuing/impsalwaysonlineplugin/group"/> -->
      </component>
      <component name="wvvariant" long-name="Wvvariant">
@@ -9810,7 +6686,7 @@
      <component name="wvuieng" long-name="Wvuieng">
       <!-- <unit bldFile="app/im/wvuing/wvuieng/group"/> -->
      </component>
-     <component name="ImUtils" long-name="Im Utils">
+     <component name="imutils" long-name="Im Utils">
       <!-- <unit bldFile="app/im/wvuing/imutils/group"/> -->
      </component>
      <component name="wvuiprocess" long-name="WV UI Process">
@@ -9825,7 +6701,7 @@
      <component name="wvuiave" long-name="Wvuiave">
       <!-- <unit bldFile="app/im/wvuing/wvuiave/group"/> -->
      </component>
-     <component name="ImLauncher" long-name="IM Launcher">
+     <component name="wvimlauncher" long-name="IM Launcher">
       <!-- <unit bldFile="app/im/wvuing/imlauncher/group"/> -->
      </component>
      <component unofficial="yes" name="wvuing_build" long-name="WV UI NG Build">
@@ -9833,32 +6709,20 @@
      </component>
     </collection>
     <collection name="im_info" long-name="Instant Messaging Apps Info" level="apps">
-     <component unofficial="yes" name="im_test" long-name="Instant Messaging Apps Test">
-      <!-- <unit bldFile="app/im/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="im_build" long-name="Instant Messaging Apps Build">
-      <unit bldFile="app/im/group"/>
-     </component>
-     <component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help">
-      <unit bldFile="app/im/help/group"/>
-     </component>
-    </collection>
-    <collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="wv_sap_settings_api">
-      <unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
-     </component>
-    </collection>
-    <collection name="im_pub" long-name="Instant Messaging Apps Public Interfaces" level="apps">
-     <component unofficial="yes" name="im_application_launch_api">
+     <component unofficial="yes" name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" class="api">
+      <unit bldFile="app/im/im_plat/group"/>
+      <unit bldFile="app/im/im_plat/wv_sap_settings_api/tsrc"/>
+     </component>
+     <component unofficial="yes" name="im_pub" long-name="Instant Messaging Apps Public Interfaces" class="api">
+      <unit bldFile="app/im/im_pub/group"/>
+      <!-- <unit bldFile="app/im/im_pub/im_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertest/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertestplugin/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertimerprocess/group"/> -->
-      <unit bldFile="app/im/im_pub/im_application_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="im_api" long-name="Instant Messaging Apps API">
-      <!-- <unit bldFile="app/im/im_pub/im_api/tsrc/group"/> -->
-      <unit bldFile="app/im/im_pub/im_api/group"/>
+     </component>
+     <component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help">
+      <unit bldFile="app/im/help/group"/>
      </component>
     </collection>
    </block>
@@ -9885,13 +6749,13 @@
    </block>
    <block name="dictionary" long-name="Dictionary" tech_domain="pr" level="services" levels="appl">
     <collection name="userdict" long-name="User Dictionary" level="appl">
-     <component unofficial="yes" name="userdict_build" long-name="User Dictionary Build">
+     <component name="userdict_build" long-name="UserDict Client">
       <unit bldFile="app/dictionary/userdict/group"/>
      </component>
     </collection>
-    <collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="appl">
-     <component unofficial="yes" name="menu_suites_macros_api">
-      <unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+    <collection name="dictionary_info" long-name="Dictionary Info" level="appl">
+     <component unofficial="yes" name="dictionary_plat" long-name="Dictionary Platform Interfaces" class="api">
+      <unit bldFile="app/dictionary/dictionary_plat/group"/>
      </component>
     </collection>
    </block>
@@ -9911,33 +6775,28 @@
      <component unofficial="yes" name="camera_build" long-name="Camera Apps Build">
       <unit bldFile="app/camera/group"/>
      </component>
-    </collection>
-    <collection name="camera_plat" long-name="Camera Apps Platform Interfaces" level="1">
-     <component unofficial="yes" name="camcorder_ui_constants_api">
-      <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+     <component unofficial="yes" name="camera_plat" long-name="Camera Apps Platform Interfaces" class="api">
+      <!-- <unit bldFile="app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="active_palette_2_api">
-      <unit bldFile="app/camera/camera_plat/active_palette_2_api/group"/>
-      <!-- <unit bldFile="app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
+      <unit bldFile="app/camera/camera_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="imgeditor" long-name="Image Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
     <collection name="imageeditor" long-name="Image Editor" level="ui">
-     <component name="PB">
+     <component name="pb">
       <unit bldFile="app/imgeditor/imageeditor/pb/group"/>
      </component>
-     <component name="IEPB">
+     <component name="iepb">
       <unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
      </component>
-     <component name="ImageEditorUI" long-name="Image Editor UI">
+     <component name="imageeditorui" long-name="Image Editor UI">
       <unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
      </component>
-     <component name="ImageEditorManager" long-name="Image Editor Manager">
+     <component name="imageeditormanager" long-name="Image Editor Manager">
       <unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
      </component>
-     <component name="imageeditorApp" long-name="Image Editor App">
+     <component name="imageeditorapp" long-name="Image Editor App">
       <unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
      </component>
      <component name="imageeditor_plugins" long-name="Plugins">
@@ -9959,7 +6818,7 @@
       <unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
       <unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
      </component>
-     <component name="EditorProvider" long-name="Editor Provider">
+     <component name="editorprovider" long-name="Editor Provider">
       <unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
      </component>
      <component unofficial="yes" name="imageeditor_build" long-name="Image Editor Build">
@@ -9989,19 +6848,19 @@
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
      </component>
-     <component name="ImageEditorUtils" long-name="Image Editor Utils">
+     <component name="imageeditorutils" long-name="Image Editor Utils">
       <unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
      </component>
-     <component name="SystemParameters" long-name="System Parameters">
+     <component name="systemparameters" long-name="System Parameters">
       <unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
      </component>
-     <component name="EngineWrapper" long-name="Engine Wrapper">
+     <component name="enginewrapper" long-name="Engine Wrapper">
       <unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
      </component>
-     <component name="JpegRotator" long-name="Jpeg Rotator">
+     <component name="jpegrotator" long-name="Jpeg Rotator">
       <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegrotator/group"/> -->
      </component>
-     <component name="JpegScaler" long-name="Jpeg Scaler">
+     <component name="jpegscaler" long-name="Jpeg Scaler">
       <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegscaler/group"/> -->
      </component>
      <component unofficial="yes" name="imageeditorengine_build" long-name="Image Editor Engine Build">
@@ -10009,49 +6868,35 @@
      </component>
     </collection>
     <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
+     <component unofficial="yes" name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" class="api">
+      <unit bldFile="app/imgeditor/imgeditor_plat/group"/>
+     </component>
      <component unofficial="yes" name="imgeditor_build" long-name="Image Editor Apps Build">
       <unit bldFile="app/imgeditor/group"/>
      </component>
     </collection>
-    <collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="image_processing_engine_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_definitions_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_debug_utilities_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_utilities_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_system_parameters_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videoeditor" long-name="Video Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
     <collection name="videditor" long-name="Video Editor" level="ui">
-     <component name="VideoEditorCommon" long-name="Video Editor Common">
+     <component name="videoeditorcommon" long-name="Video Editor Common">
       <unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
      </component>
-     <component name="VideoEditorUiComponents" long-name="Video Editor UI Components">
+     <component name="videoeditoruicomponents" long-name="Video Editor UI Components">
       <unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
      </component>
-     <component name="SimpleVideoEditor" long-name="Simple Video Editor">
+     <component name="simplevideoeditor" long-name="Simple Video Editor">
       <unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
      </component>
-     <component name="SimpleCutVideo" long-name="Simple Cut Video">
+     <component name="simplecutvideo" long-name="Simple Cut Video">
       <unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
      </component>
-     <component name="VideoProvider" long-name="Video Provider">
+     <component name="videoprovider" long-name="Video Provider">
       <unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
      </component>
-     <component name="ManualVideoEditor" long-name="Manual Video Editor">
+     <component name="manualvideoeditor" long-name="Manual Video Editor">
       <unit bldFile="app/videoeditor/videditor/manualvideoeditor/group"/>
      </component>
-     <component name="TrimForMms" long-name="Trim For MMS">
+     <component name="trimformms" long-name="Trim For MMS">
       <!-- <unit bldFile="app/videoeditor/videditor/trimformms/group"/> -->
      </component>
      <component unofficial="yes" name="videditor_build" long-name="Video Editor Build">
@@ -10068,7 +6913,7 @@
      <component name="h263decoder" long-name="H263 Decoder">
       <unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
      </component>
-     <component name="mp3aacManipLib" long-name="Mp3aac Manip Lib">
+     <component name="mp3aacmaniplib" long-name="Mp3aac Manip Lib">
       <unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
      </component>
      <component name="vedtranscoder" long-name="Ved Transcoder">
@@ -10082,15 +6927,13 @@
      </component>
     </collection>
     <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
+     <component unofficial="yes" name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" class="api">
+      <unit bldFile="app/videoeditor/videoeditor_plat/group"/>
+     </component>
      <component unofficial="yes" name="videoeditor_build" long-name="Video Editor Apps Build">
       <unit bldFile="app/videoeditor/group"/>
      </component>
     </collection>
-    <collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="video_editor_engine_api">
-      <unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="gallery" long-name="Gallery Apps" tech_domain="ma" level="apps" levels="app">
     <collection name="mediagallery" long-name="Media Gallery" level="app">
@@ -10102,38 +6945,24 @@
      <component unofficial="yes" name="gallery_build" long-name="Gallery Apps Build">
       <unit bldFile="app/gallery/group"/>
      </component>
-    </collection>
-    <collection name="gallery_plat" long-name="Gallery Apps Platform Interfaces" level="app">
-     <component unofficial="yes" name="album_manager_api">
-      <unit bldFile="app/gallery/gallery_plat/album_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_file_notification">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_file_notification/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_main_view_extension_api">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_main_view_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_api">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_file_api">
-      <unit bldFile="app/gallery/gallery_plat/media_file_api/group"/>
+     <component unofficial="yes" name="gallery_plat" long-name="Gallery Apps Platform Interfaces" class="api">
+      <unit bldFile="app/gallery/gallery_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="videoplayer" long-name="Video Player Apps" tech_domain="ma" level="apps" levels="support apps">
     <collection name="lwplayer" long-name="LW Player" level="apps">
-     <component name="LWPlayer.exe=binary" long-name="LW Player">
+     <component name="lwplayer_build" long-name="LW Player">
       <unit bldFile="app/videoplayer/lwplayer/group"/>
      </component>
     </collection>
     <collection name="mediaplayer" long-name="Media Player" level="apps">
-     <component unofficial="yes" name="mediaplayer_build" long-name="Media Player Build">
+     <component name="mediaplayer_build">
       <unit bldFile="app/videoplayer/mediaplayer/group"/>
      </component>
     </collection>
     <collection name="mediasettings" long-name="Media Settings" level="support">
-     <component unofficial="yes" name="mediasettings_build" long-name="Media Settings Build">
+     <component name="mediasettings_build">
       <unit bldFile="app/videoplayer/mediasettings/group"/>
      </component>
     </collection>
@@ -10141,6 +6970,11 @@
      <component unofficial="yes" name="videoplayer_help" long-name="Video Player Apps Help">
       <unit bldFile="app/videoplayer/help/group"/>
      </component>
+     <component unofficial="yes" name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" class="api">
+      <unit bldFile="app/videoplayer/videoplayer_plat/group"/>
+      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/tsrc/group"/>
+      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/tsrc/group"/>
+     </component>
      <component unofficial="yes" name="videoplayer_test" long-name="Video Player Apps Test">
       <!-- <unit bldFile="app/videoplayer/tsrc/group"/> -->
      </component>
@@ -10148,14 +6982,6 @@
       <unit bldFile="app/videoplayer/group"/>
      </component>
     </collection>
-    <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="media_player_engine_api">
-      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_player_file_details_dialog_api">
-      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="photos" long-name="Photos" tech_domain="ma" level="apps" levels="support fw ui app">
     <collection name="photosgallery" long-name="Photos Gallery" level="app">
@@ -10172,11 +6998,11 @@
      <component name="photosgallery_commonui" long-name="Common UI">
       <unit bldFile="app/photos/photosgallery/commonui/group"/>
      </component>
-     <component name="collectionframework" long-name="Collection Framework">
+     <component name="photoscollectionfw" long-name="Collection Framework">
       <unit bldFile="app/photos/photosgallery/collectionframework/group"/>
       <!-- <unit bldFile="app/photos/photosgallery/collectionframework/plugins/glxcollectionpluginalbums/group"/> -->
      </component>
-     <component name="viewframework" long-name="View Framework">
+     <component name="photosviewfw" long-name="View Framework">
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerbase/tsrc/group"/> -->
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/group"/> -->
       <!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/t_glxupnprenderer/group"/> -->
@@ -10196,7 +7022,7 @@
      <component name="controllers" long-name="Controllers">
       <unit bldFile="app/photos/photosgallery/controllers/group"/>
      </component>
-     <component name="gallery" long-name="Gallery">
+     <component name="photogallery" long-name="Gallery">
       <unit bldFile="app/photos/photosgallery/gallery/group"/>
      </component>
      <component name="slideshow" long-name="Slideshow">
@@ -10213,7 +7039,7 @@
      <!--<component name="memoryplugin" long-name="Memory Plugin">
        <unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
      </component>-->
-     <component unofficial="yes" name="icons">
+     <component unofficial="yes" name="photosicons">
       <unit bldFile="app/photos/photosgallery/icons"/>
      </component>
      <component unofficial="yes" name="photosgallery_build" long-name="Photos Gallery Build">
@@ -10221,39 +7047,21 @@
      </component>
     </collection>
     <collection name="photos_info" long-name="Photos Info" level="app">
+     <component unofficial="yes" name="photos_plat" long-name="Photos Platform Interfaces" class="api">
+      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ui_metadatadialog/group"/> -->
+      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
+      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
+      <unit bldFile="app/photos/photos_plat/group"/>
+     </component>
      <component unofficial="yes" name="photos_build" long-name="Photos Build">
       <unit bldFile="app/photos/group"/>
      </component>
     </collection>
-    <collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-     <component unofficial="yes" name="gallery_utilities_api">
-      <unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="collection_plugins_api">
-      <unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
-     </component>
-     <component unofficial="yes" name="controllers_collection_api">
-      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ui_metadatadialog/group"/> -->
-      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
-      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
-      <unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
-     </component>
-     <component unofficial="yes" name="photos_plat_build" long-name="Photos Platform API Build">
-      <unit bldFile="app/photos/photos_plat/group"/>
-     </component>
-     <component unofficial="yes" name="slideshow_ui_constants_api">
-      <unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="views_metadatadialog_api">
-      <unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videocenter" long-name="Video Center" tech_domain="ma" level="apps" levels="eng ui app">
     <collection name="mpxmyvideoscollection" long-name="MPX My Videos Collection" level="app">
-     <component name="mpx_common_api" long-name="MPX Common_Api">
+     <component name="mpx_common_api" long-name="MPX Common_Api" class="api">
       <unit bldFile="app/videocenter/mpxmyvideoscollection/mpx_common_api/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
      </component>
      <component unofficial="yes" name="mpxmyvideoscollection_build" long-name="MPX My Videos Collection Build">
       <unit bldFile="app/videocenter/mpxmyvideoscollection/group"/>
@@ -10397,14 +7205,9 @@
      <component unofficial="yes" name="videocenter_build" long-name="Video Center Build">
       <unit bldFile="app/videocenter/group"/>
      </component>
-    </collection>
-    <collection name="videocenter_plat" long-name="Video Center Platform Interfaces" level="app">
-     <component unofficial="yes" name="videocenter_plat_build" long-name="Video Center Platform API Build">
+     <component unofficial="yes" name="videocenter_plat" long-name="Video Center Platform Interfaces" class="api">
       <unit bldFile="app/videocenter/videocenter_plat/group"/>
      </component>
-     <component unofficial="yes" name="videocenter_player_api">
-      <unit bldFile="app/videocenter/videocenter_plat/videocenter_player_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="musicplayer" long-name="Music Player Apps" tech_domain="ma" level="apps" levels="plugins support apps">
@@ -10470,39 +7273,15 @@
       <unit bldFile="app/musicplayer/mpxplugins/group"/>
      </component>
     </collection>
-    <collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="mpx_music_store_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_shop_ui_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_media_key_handler_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_wap_adapter_cenrep_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-     </component>
-     <component unofficial="yes" name="music_visualization_plugin_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_application_features_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_remote_control_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_app_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_commonui_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-     </component>
-     <component unofficial="yes" name="music_content_publisher_plugin_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-     </component>
-    </collection>
     <collection name="musicplayer_info" long-name="Music Player Apps Info" level="apps">
+     <component unofficial="yes" name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/tsrc/group"/>
+     </component>
      <component unofficial="yes" name="musicplayer_test" long-name="Music Player Apps Test">
       <!-- <unit bldFile="app/musicplayer/tsrc/group"/> -->
      </component>
@@ -10525,9 +7304,7 @@
      <component name="fmradiomcpplugin" long-name="FM Radio MCP Plugin">
       <unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
      </component>
-     <component name="FMRadio">
-      <unit bldFile="app/radio/fmradio/fmradio/group"/>
-     </component>
+     
      <component name="fmradio_help" long-name="Help">
       <unit bldFile="app/radio/fmradio/help/group"/>
      </component>
@@ -10538,13 +7315,13 @@
    </block>
    <block name="voicerec" long-name="Voice Recorder Apps" tech_domain="ma" level="apps" levels="empty 1">
     <collection name="voicerecorder" long-name="Voice Recorder" level="1">
-     <component name="gsplugin" long-name="GS Plugin">
+     <component name="voicerecordergsplugin" long-name="GS Plugin">
       <!-- <unit bldFile="app/voicerec/voicerecorder/gsplugin/group"/> -->
      </component>
      <component name="voicerecorder_help" long-name="Help">
       <unit bldFile="app/voicerec/voicerecorder/help/group"/>
      </component>
-     <component unofficial="yes" name="voicerecorder_build" long-name="Voice Recorder Build">
+     <component name="voicerecorder_build">
       <unit bldFile="app/voicerec/voicerecorder/group"/>
      </component>
     </collection>
@@ -10555,13 +7332,9 @@
      <component unofficial="yes" name="voicerec_test" long-name="Voice Recorder Apps Test">
       <!-- <unit bldFile="app/voicerec/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces" level="1">
-     <component unofficial="yes" name="new_file_service_api">
-      <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="voicerecorder_public_constants_api">
-      <unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+     <component unofficial="yes" name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces" class="api">
+      <unit bldFile="app/voicerec/voicerec_plat/group"/>
+      <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -10570,7 +7343,7 @@
      <component name="imageviewer_help" long-name="Help">
       <unit bldFile="app/imgvieweruis/imageviewer/help/group"/>
      </component>
-     <component unofficial="yes" name="imageviewer_build" long-name="Image Viewer Build">
+     <component name="imageviewer_build">
       <unit bldFile="app/imgvieweruis/imageviewer/group"/>
      </component>
     </collection>
@@ -10589,9 +7362,7 @@
       <unit bldFile="app/screensaver/scrsaver/screensaveraiwplugin/group"/>
      </component>
     </collection>
-    <collection name="screensaver.exe=binary" long-name="Screen Saver" level="plugin">
-     <component name="screensaver.exe=binary compo"/>
-    </collection>
+    
     <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="plugin">
      <component unofficial="yes" name="screensaver_build" long-name="Screen Saver Apps Build">
       <unit bldFile="app/screensaver/group"/>
@@ -10639,16 +7410,14 @@
      <component unofficial="yes" name="homescreen_test" long-name="Home Screen Apps Test">
       <!-- <unit bldFile="app/homescreen/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="menu_settings_api">
-      <unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
+     <component unofficial="yes" name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" class="api">
+      <unit bldFile="app/homescreen/homescreen_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="graphicsuis" long-name="Graphics UIs" tech_domain="ui" level="services" levels="util ui">
     <collection name="svgtviewer" long-name="SVGT Viewer" level="ui">
-     <component name="SvgtViewerPlugin" long-name="SVGT Viewer Plugin">
+     <component name="svgtviewerplugin" long-name="SVGT Viewer Plugin">
       <unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
      </component>
      <component unofficial="yes" name="svgtviewer_build" long-name="SVGT Viewer Build">
@@ -10659,22 +7428,14 @@
      <component unofficial="yes" name="graphicsuis_build" long-name="Graphics UIs Build">
       <unit bldFile="app/graphicsuis/group"/>
      </component>
-    </collection>
-    <collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-     <component unofficial="yes" name="svg_application_observer_utility_api">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_file_view_details_dialog_api">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_viewer_ui_api">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+     <component unofficial="yes" name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" class="api">
+      <unit bldFile="app/graphicsuis/graphicsuis_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="profile" long-name="Profile" tech_domain="ui" level="apps" levels="app">
     <collection name="profilesapplication" long-name="Profiles Application" level="app">
-     <component name="Profiles" long-name="Profiles">
+     <component name="profiles" long-name="Profiles">
       <unit bldFile="app/profile/profilesapplication/profiles/group"/>
       <!-- <unit bldFile="app/profile/profilesapplication/profiles/gsprofilesplugin/group"/> -->
       <!-- <unit bldFile="app/profile/profilesapplication/profiles/profileaiwprovider/group"/> -->
@@ -10686,14 +7447,9 @@
       <!-- <unit bldFile="app/profile/profilesapplication/tsrc/public/basic/group"/> -->
      </component>
     </collection>
-    <collection name="profile_plat" long-name="Profile Platform Interfaces" level="app">
-     <component unofficial="yes" name="profiles_settings_view_api">
-      <unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-     </component>
-    </collection>
     <collection name="profile_info" long-name="Profile Info" level="app">
-     <component unofficial="yes" name="profile_test" long-name="Profile Test">
-      <!-- <unit bldFile="app/profile/tsrc/group"/> -->
+     <component unofficial="yes" name="profile_plat" long-name="Profile Platform Interfaces" class="api">
+      <unit bldFile="app/profile/profile_plat/group"/>
      </component>
      <component unofficial="yes" name="profile_help" long-name="Profile Help">
       <unit bldFile="app/profile/help/group"/>
@@ -10794,89 +7550,6 @@
       <unit bldFile="app/speechsrv/srsf/group"/>
      </component>
     </collection>
-    <collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
-     <component unofficial="yes" name="voice_commands_resource_header_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="ui_voice_recognition_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_tts_common_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_devasr_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-     </component>
-     <component unofficial="yes" name="srsf_secondarydisplay_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-     </component>
-     <component unofficial="yes" name="tts_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_ui_accessory_button_handling_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-     </component>
-     <component unofficial="yes" name="vocman_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="asrs_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="vcommand_settings_cenrep_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-     </component>
-     <component unofficial="yes" name="adaptation_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_srs_custom_commands_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_synthesis_clientserver_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-     </component>
-     <component unofficial="yes" name="grcompiler_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="recognition_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_ui_plugin_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="vas_contact_handler_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="vas_vcommand_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_devtts_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-     </component>
-     <component unofficial="yes" name="srsf_cenrep_settings_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_srs_utility_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="ttp_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_mmf_tts_custom_commands_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_si_speech_recognition_data_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="nlp_hw_device">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-     </component>
-     <component unofficial="yes" name="vas_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_tts_utility_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
-     </component>
-    </collection>
     <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
      <component unofficial="yes" name="speechsrv_test" long-name="Speech Recognition UIs Test">
       <!-- <unit bldFile="app/speechsrv/tsrc/group"/> -->
@@ -10884,21 +7557,25 @@
      <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build">
       <unit bldFile="app/speechsrv/group"/>
      </component>
+     <component unofficial="yes" name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/group"/>
+      <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/tsrc/group"/>
+     </component>
     </collection>
    </block>
    <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
     <collection name="dtdinstaller" long-name="DTD Installer" level="install">
-     <component name="dtdinstaller compo">
+     <component name="dtdinstaller_build">
       <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
      </component>
     </collection>
     <collection name="themeinstaller" long-name="Theme Installer" level="install">
-     <component name="themeinstaller compo">
+     <component name="themeinstaller_build">
       <unit bldFile="tools/homescreentools/themeinstaller/group"/>
      </component>
     </collection>
     <collection name="themetool" long-name="Theme Tool" level="tool">
-     <component name="themetool compo">
+     <component name="themetool_build">
       <unit bldFile="tools/homescreentools/themetool/group"/>
      </component>
     </collection>
@@ -10942,7 +7619,7 @@
      <component name="pushmtm_help" long-name="Help">
       <unit bldFile="app/webuis/pushmtm/help/group"/>
      </component>
-     <component name="Plugins">
+     <component name="plugins">
       <unit bldFile="app/webuis/pushmtm/plugins/group"/>
      </component>
      <component unofficial="yes" name="pushmtm_build" long-name="Push MTM Build">
@@ -10970,21 +7647,21 @@
      <component name="iferecognizers" long-name="Ife Recognizers"/>
     </collection>
     <collection name="javalegacy" long-name="Java Legacy" level="util">
-     <component name="JcfCommon" long-name="Jcf Common"/>
+     <component name="jcfcommon" long-name="Jcf Common"/>
      <component name="j2me" long-name="J2ME"/>
     </collection>
     <collection name="javamanager" long-name="Java Manager" level="framework">
      <component name="javabackup" long-name="Java Backup"/>
-     <component name="javaregistry" long-name="Java Registry"/>
+     <!-- Empty duplicate component javaregistry removed -->
      <component name="javadrmmanager" long-name="Java DRM Manager"/>
      <component name="javasettings" long-name="Java Settings"/>
     </collection>
     <collection name="javaruntime" long-name="Java Runtime" level="rt">
-     <component name="javaruntime_common" long-name="Common"/>
+     <!-- Empty duplicate component common removed -->
      <component name="temp_j2me_root" long-name="Temp J2me Root"/>
      <component name="jvm" long-name="JVM"/>
      <component name="eventserver" long-name="Event Server"/>
-     <component name="javaruntime_utils" long-name="Utilities"/>
+     <!-- Empty duplicate component utils removed -->
      <component name="midp2ams" long-name="Midp2ams"/>
      <component name="redirserver" long-name="Redirect Server"/>
     </collection>
@@ -10992,15 +7669,13 @@
      <component name="jarfiledecoder" long-name="JAR File Decoder"/>
      <component name="javareader" long-name="Java Reader"/>
      <component name="javapackagelookup" long-name="Java Package Lookup"/>
-     <component name="javautils_common" long-name="Common"/>
+     <!-- Empty duplicate component common removed -->
      <component name="integrityserver" long-name="Integrity Server"/>
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javadrmutils" long-name="Java DRM Utils"/>-->
+     <!-- Empty duplicate component javadrmutils removed -->
      <component name="javarecognizer" long-name="Java Recognizer"/>
      <component name="iconconverter" long-name="Icon Converter"/>
      <component name="adt" long-name="ADT"/>
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javaenvinfo" long-name="Java Environment Info"/>-->
+     <!-- Empty duplicate component javaenvinfo removed -->
     </collection>
     <collection name="java_stubs" long-name="Java Stubs" level="util">
      <!--component manually moved to javautils collection-->
@@ -11025,22 +7700,14 @@
      <component unofficial="yes" name="java_build" long-name="Java Build">
       <unit bldFile="app/java/group"/>
      </component>
-    </collection>
-    <collection name="java_plat" long-name="Java Platform Interfaces" level="rt">
-     <component unofficial="yes" name="java_registry_api">
-      <unit bldFile="app/java/java_plat/java_registry_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_superd_parser_api">
-      <unit bldFile="app/java/java_plat/java_superd_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_env_info_api">
-      <unit bldFile="app/java/java_plat/java_env_info_api/group"/>
+     <component unofficial="yes" name="java_plat" long-name="Java Platform Interfaces" class="api">
+      <unit bldFile="app/java/java_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
     <collection name="creator" long-name="Creator" level="app">
-     <component name="creator.exe=binary">
+     <component name="creator_build">
       <unit bldFile="tools/rndtools/creator/group"/>
      </component>
     </collection>
@@ -11051,22 +7718,22 @@
      <component name="fileopclient" long-name="File Op Client">
       <unit bldFile="tools/rndtools/filebrowser/fileopclient/group"/>
      </component>
-     <component unofficial="yes" name="filebrowser_build" long-name="File Browser Build">
+     <component name="filebrowser_build">
       <unit bldFile="tools/rndtools/filebrowser/group"/>
      </component>
     </collection>
     <collection name="launcher" long-name="Launcher" level="specific">
-     <component name="Launcher.exe=binary">
+     <component name="launcher_build">
       <unit bldFile="tools/rndtools/launcher/group"/>
      </component>
     </collection>
     <collection name="screengrabber" long-name="Screen Grabber" level="specific">
-     <component name="ScreenGrabber.exe=binary">
+     <component name="screengrabber_build">
       <unit bldFile="tools/rndtools/screengrabber/group"/>
      </component>
     </collection>
     <collection name="stifui" long-name="STIF UI" level="generic">
-     <component name="stifui" long-name="STIF UI">
+     <component name="stifui_stifui" long-name="STIF UI">
       <unit bldFile="tools/rndtools/stifui/stifui/group"/>
      </component>
      <component name="uitestserverstarter" long-name="UI Test Server Starter">
@@ -11077,25 +7744,25 @@
      </component>
     </collection>
     <collection name="loadgen" long-name="Load Generator" level="app">
-     <component name="LoadGen.exe=binary">
+     <component name="loadgen_build">
       <unit bldFile="tools/rndtools/loadgen/group"/>
      </component>
     </collection>
     <collection name="perfmon" long-name="Performance Monitor" level="app">
-     <component name="PerfMon.exe=binary">
+     <component name="perfmon_build">
       <unit bldFile="tools/rndtools/perfmon/group"/>
      </component>
     </collection>
     <collection name="htiui" long-name="HTI UI" level="generic">
-     <component name="HtiCommPlugins" long-name="HTI Comm Plugins"/>
-     <component name="HtiServicePlugins" long-name="HTI Service Plugins"/>
-     <component name="HtiDeviceReboot" long-name="HTI DeviceR eboot">
+     <!-- Empty duplicate component HtiCommPlugins removed -->
+     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="htidevicereboot" long-name="HTI DeviceR eboot">
       <unit bldFile="tools/rndtools/htiui/htidevicereboot/group"/>
      </component>
-     <component name="HtiStartupWait" long-name="HTI Startup Wait">
+     <component name="htistartupwait" long-name="HTI Startup Wait">
       <unit bldFile="tools/rndtools/htiui/htistartupwait/group"/>
      </component>
-     <component name="HtiAdmin" long-name="HTI Admin">
+     <component name="htiadmin" long-name="HTI Admin">
       <unit bldFile="tools/rndtools/htiui/htiadmin/group"/>
      </component>
      <component unofficial="yes" name="htiui_build" long-name="HTI UI Build">
@@ -11103,14 +7770,14 @@
      </component>
     </collection>
     <collection name="memspyui" long-name="Memspy UI" level="generic">
-     <component name="memspyui.exe=binary">
+     <component name="memspyui_build">
       <unit bldFile="tools/rndtools/memspyui/group"/>
      </component>
     </collection>
    </block>
    <block name="helps" long-name="Help Apps" tech_domain="ui" level="apps" span="2" levels="eng tools unused  ui">
     <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="ui">
-     <component name="AiwHelpProvider" long-name="Aiw Help Provider">
+     <component name="aiwhelpprovider" long-name="Aiw Help Provider">
       <!-- <unit bldFile="app/helps/csxhelp/aiwhelpprovider/group"/> -->
      </component>
      <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build">