# HG changeset patch
# User Chetan Kapoor<chetank@symbian.org>
# Date 1287149594 -3600
# Node ID cd43afbd61915d8cbce696cc43b85453441a2f54
# Parent  43b28893dd71eb72a9336003c0354ea6bc57113d
Changed sf/adaptation to sf/adapt.

diff -r 43b28893dd71 -r cd43afbd6191 RCL_3/single/sources.csv
--- a/RCL_3/single/sources.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/RCL_3/single/sources.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -1,8 +1,8 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,layers.sysdef.xml
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sources.csv
--- a/symbian3/single/sources.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sources.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -1,8 +1,8 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,layers.sysdef.xml
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sources_compiler_compatibility.csv
--- a/symbian3/single/sources_compiler_compatibility.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sources_compiler_compatibility.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -6,7 +6,7 @@
 //v800020/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800020/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800020/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
@@ -111,8 +111,8 @@
 http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,CompilerCompatibility,
 http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sources_good.csv
--- a/symbian3/single/sources_good.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sources_good.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -5,7 +5,7 @@
 //v800020/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
 //v800020/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800020/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,S3_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,tag,S3_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,tag,S3_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,tag,S3_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,tag,S3_LATESTGOOD,layers.sysdef.xml
@@ -110,8 +110,8 @@
 http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,tag,S3_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tag,S3_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,tag,S3_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,tag,S3_LATESTGOOD,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,tag,S3_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,tag,S3_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,tag,S3_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,tag,S3_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,tag,S3_LATESTGOOD,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,tag,S3_LATESTGOOD,layers.sysdef.xml
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sources_staging.csv
--- a/symbian3/single/sources_staging.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sources_staging.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -1,8 +1,8 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.staging.foundationhost.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.staging.foundationhost.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,RCL_3,layers.sysdef.xml
 http://developer.staging.foundationhost.org/oss/MCL/sf/app/camera/,/sf/app/camera,branch,RCL_3,layers.sysdef.xml
 http://developer.staging.foundationhost.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,RCL_3,layers.sysdef.xml
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sysdefs/auto/system_model.xml
--- a/symbian3/single/sysdefs/auto/system_model.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sysdefs/auto/system_model.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -1,211 +1,211 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/group"/>
 </component>
 <component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="adapt/stubs/btaudioadaptation_stub/group"/>
 </component>
 <component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
 </component>
 <component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
 </component>
 <component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 <component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 <component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/group"/>
 </component>
 <component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 <component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/group"/>
 </component>
 <component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 <component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </block>
 <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
 <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
 <block name="naviengine.nec" level="low" long-name="NaviEngine" levels="hw-if">
 <collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
 <component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb"/>
+<unit bldFile="adapt/naviengine.nec/navienginebsp/ne1_tb"/>
 </component>
 <component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb/single"/>
+<unit bldFile="adapt/naviengine.nec/navienginebsp/ne1_tb/single"/>
 </component>
 <component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/naviengine.nec/navienginebspflexible"/>
+<unit bldFile="adapt/naviengine.nec/navienginebspflexible"/>
 </component>
 <component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/naviengine.nec/navienginebootldr"/>
+<unit bldFile="adapt/naviengine.nec/navienginebootldr"/>
 </component>
 </collection>
 </block>
 <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
 <collection name="utilities" long-name="Aricent Utilities">
 <component name="ariprocessengine" long-name="Aricent Process Engine">
-<unit bldFile="adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/ariprocessengine/group"/>
 </component>
 <component name="aristatemachine" long-name="Aricent State Machine">
-<unit bldFile="adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/aristatemachine/group"/>
 </component>
 </collection>
 <collection name="aaclc_enc" level="plugin">
 <component name="ariaaclcencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_dec" level="plugin">
 <component name="ariamrnbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_enc" level="plugin">
 <component name="ariamrnbencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrwb_dec" level="plugin">
 <component name="ariamrwbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="h264_dec" level="plugin">
 <component name="arih264dechwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
 </component>
 </collection>
 <collection name="h264_enc" level="plugin">
 <component name="arih264enchwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
 </component>
 </collection>
 <collection name="heaac_dec" level="plugin">
 <component name="ariheaacdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp3_dec" level="plugin">
 <component name="arimp3decmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp4asp_dec" level="plugin">
 <component name="arimpeg4aspdechwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
 </component>
 </collection>
 <collection name="mp4sp_enc" level="plugin">
 <component name="arimp4spenchwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
 </component>
 </collection>
 </block>
@@ -730,7 +730,7 @@
 <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="os/ossrv/ofdbus/group"/>
 </component>
@@ -1148,7 +1148,7 @@
 <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
 </component>
 <component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
 <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
 </component>
@@ -1162,7 +1162,7 @@
 <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
 <component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
 <unit bldFile="os/devicesrv/resourcemgmt/group"/>
 </component>
@@ -2179,7 +2179,7 @@
 <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2585,7 +2585,7 @@
 </component>
 </collection>
 <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
+<!-- components in this collection need to be moved to the right collection.
     		Either move into the units' directories, or create a new textandlocutils directory -->
 <component name="numbergrouping" filter="s60" long-name="Number Grouping">
 <unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
@@ -2631,8 +2631,8 @@
 <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
 <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
 <component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -3027,7 +3027,7 @@
 </component>
 </collection>
 <collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component name="cfw" filter="s60" long-name="Context Framework">
 <!--<unit bldFile="contextframework/cfw/group"/> -->
@@ -4096,8 +4096,8 @@
 </component>
 </collection>
 <collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
 <unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
@@ -5039,7 +5039,7 @@
 <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
 </component>
 <component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
+<!-- move exports to other components.
 				This is needed for #includes of configured component until congigiration is in place -->
 <unit bldFile="mw/remotestorage/remotestoragefw/group"/>
 </component>
@@ -5294,9 +5294,9 @@
 <collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
 <component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
 <!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
         <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
 </component>
 <component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
@@ -5494,15 +5494,15 @@
 <component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
 <unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
 <unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5608,7 +5608,7 @@
 <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
 <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
 <component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
 	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
 </component>
 <component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
@@ -5624,11 +5624,11 @@
 <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
 </component>
 <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
 </component>
 <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
 </component>
 <component name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform Interface Build" filter="s60" class="api">
@@ -6158,11 +6158,11 @@
 <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
 </component>
 <component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
 	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
 </component>
 <component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
     <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
 </component>
 <component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
@@ -6196,7 +6196,7 @@
 </collection>
 <collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
 <component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -7148,10 +7148,10 @@
 <component name="fontprovider" filter="s60" long-name="Font Provider">
 <unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component name="fontutils" filter="sf_build" long-name="Font Utils">
 <unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7416,7 +7416,7 @@
 <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
 </component>
 <component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
 </component>
@@ -7438,7 +7438,7 @@
 <unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
 </component>
 <component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
 </component>
@@ -7847,7 +7847,7 @@
 <unit bldFile="mw/web/codhandler/roapapp/group"/>
 </component>
 <component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="mw/web/codhandler/group"/>
 </component>
@@ -7876,7 +7876,7 @@
 <!--<unit bldFile="widgets/widgetstartup/group"/>-->
 </component>
 <component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="mw/web/widgets/group"/>
 </component>
@@ -8461,7 +8461,7 @@
 <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
 </component>
 <component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!--  consider distributing this into the above components, or collapse the collection into a single component. 
+<!--  consider distributing this into the above components, or collapse the collection into a single component. 
       		The latter is a better option since clients and sevrers are rarely separate components -->
 <unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
 </component>
@@ -8617,7 +8617,7 @@
 <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
 </component>
 <component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- can the exports be moved to one of the other components?
+<!-- can the exports be moved to one of the other components?
 			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
 <unit bldFile="app/devicecontrol/devicediagnostics/group"/>
 </component>
@@ -9654,7 +9654,7 @@
 <unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
 <component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
+<!-- can the exports be broken up into the other components ?
 			alternatively, move the exports into a RM Config component-->
 <unit bldFile="app/commonemail/meetingrequest/group"/>
 </component>
@@ -9886,8 +9886,8 @@
 <unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
 <unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
 <unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
          -->
 </component>
 <component name="editorprovider" filter="s60" long-name="Image Editor Provider">
@@ -9921,8 +9921,8 @@
 <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
 <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
 <unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
          -->
 </component>
 <component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
@@ -10286,7 +10286,7 @@
 <collection name="scrsaver" long-name="Screen Saver" level="plugin">
 <component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
 <!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
         <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
 </component>
 <component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
@@ -10646,7 +10646,7 @@
 <unit bldFile="app/webuis/pushmtm/plugins/group"/>
 </component>
 <component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
 			component and move it down a diretcory, or make separate independent components in this collection -->
 <unit bldFile="app/webuis/pushmtm/group"/>
 </component>
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sysdefs/auto/system_model_3.0.xml
--- a/symbian3/single/sysdefs/auto/system_model_3.0.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sysdefs/auto/system_model_3.0.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -5,57 +5,57 @@
 <package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
 <collection id="s60_stubs" level="stub">
 <component id="audiostubs" name="Audio Stubs">
-<unit bldFile="/adaptation/stubs/audiostubs/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/group"/>
 </component>
 <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/btaudioadaptation_stub/group"/>
 </component>
 <component id="drm_stubs" name="DRM Stubs">
-<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="/adapt/stubs/drm_stubs/group"/>
 </component>
 <component id="ocrsrv_stub" name="OCR Services Stub">
-<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
 </component>
 <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
-<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 <component id="srsfenginestub" name="SRSF Engine Stub">
-<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="/adapt/stubs/srsfenginestub/group"/>
 </component>
 <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
-<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 <component id="systemswstubs" name="System Software Stubs">
-<unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+<unit bldFile="/adapt/stubs/systemswstubs/group"/>
 </component>
 <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
-<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
-<unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="/adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </package>
 <package id="beagleboard" tech-domain="hb" level="low" name="Beagle Board" levels="hw-if">
 <collection id="omap3530" name="OMAP 3530" level="hw-if">
 <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="/adapt/beagleboard/omap3530" mrp="/adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </package>
 <package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
 <collection id="qemu_baseport" name="Baseport" level="hw-if">
 <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="/adapt/qemu/baseport/syborg" mrp="/adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </package>
@@ -583,7 +583,7 @@
 <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="/os/ossrv/ofdbus/group"/>
 </component>
@@ -1006,7 +1006,7 @@
 <meta rel="config">
 <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
 </meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
 <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
 </component>
@@ -1020,7 +1020,7 @@
 <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
 <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
 <unit bldFile="/os/devicesrv/resourcemgmt/group"/>
 </component>
@@ -2041,7 +2041,7 @@
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2469,7 +2469,7 @@
 
 </collection>
 <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
+<!-- components in this collection need to be moved to the right collection.
     		Either move into the units' directories, or create a new textandlocutils directory -->
 <component id="numbergrouping" filter="s60" name="Number Grouping">
 <unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
@@ -2515,8 +2515,8 @@
 <package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
 <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
 <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -2913,7 +2913,7 @@
 </component>
 </collection>
 <collection id="contextframework" name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component id="cfw" filter="s60" name="Context Framework">
 <meta rel="config">
@@ -4008,8 +4008,8 @@
 </component>
 </collection>
 <collection id="vpnengine" name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
 <unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
@@ -4974,7 +4974,7 @@
 <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
 </component>
 <component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
-<!-- move exports to other components.
+<!-- move exports to other components.
 				This is needed for #includes of configured component until congigiration is in place -->
 <unit bldFile="/mw/remotestorage/remotestoragefw/group"/>
 </component>
@@ -5256,9 +5256,9 @@
 </meta>
 <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
 <!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
         <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
 </component>
 <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
@@ -5466,15 +5466,15 @@
 <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
 <unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
 <unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5585,7 +5585,7 @@
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
 	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
 </component>
 <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
@@ -5604,14 +5604,14 @@
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
 </component>
 <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
 </component>
 <component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
@@ -6176,14 +6176,14 @@
 <meta rel="config">
 <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
 </meta>
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
 	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
 </component>
 <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
 <meta rel="config">
 <defined condition="__WINDOWS_MEDIA"/>
 </meta>
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
     <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
 </component>
 <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
@@ -6217,7 +6217,7 @@
 </collection>
 <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
 <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -7325,10 +7325,10 @@
 <component id="fontprovider" filter="s60" name="Font Provider">
 <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component id="fontutils" filter="sf_build" name="Font Utils">
 <unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7608,7 +7608,7 @@
 <unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
 </component>
 <component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="/mw/homescreensrv/contentpublishingsrv/group"/>
 </component>
@@ -7630,7 +7630,7 @@
 <unit bldFile="/mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
 </component>
 <component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="/mw/homescreensrv/contentcontrolsrv/group"/>
 </component>
@@ -8047,7 +8047,7 @@
 <unit bldFile="/mw/web/codhandler/roapapp/group"/>
 </component>
 <component id="codhandler_build" filter="s60" name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/codhandler/group"/>
 </component>
@@ -8100,7 +8100,7 @@
 <!--<unit bldFile="widgets/widgetstartup/group"/>-->
 </component>
 <component id="widgets_build" filter="s60" name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/widgets/group"/>
 </component>
@@ -8688,7 +8688,7 @@
 <unit bldFile="/app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
 </component>
 <component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
-<!--  consider distributing this into the above components, or collapse the collection into a single component. 
+<!--  consider distributing this into the above components, or collapse the collection into a single component. 
       		The latter is a better option since clients and sevrers are rarely separate components -->
 <unit bldFile="/app/iptelephony/convergedconnectionhandler/group"/>
 </component>
@@ -8845,7 +8845,7 @@
 <unit bldFile="/app/devicecontrol/devicediagnostics/diagsuites/group"/>
 </component>
 <component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build">
-<!-- can the exports be moved to one of the other components?
+<!-- can the exports be moved to one of the other components?
 			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
 <unit bldFile="/app/devicecontrol/devicediagnostics/group"/>
 </component>
@@ -9901,7 +9901,7 @@
 <unit bldFile="/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
 <component id="meetingrequest_build" filter="s60" name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
+<!-- can the exports be broken up into the other components ?
 			alternatively, move the exports into a RM Config component-->
 <unit bldFile="/app/commonemail/meetingrequest/group"/>
 </component>
@@ -10138,8 +10138,8 @@
 <unit bldFile="/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
 <unit bldFile="/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
 <unit bldFile="/app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
          -->
 </component>
 <component id="editorprovider" filter="s60" name="Image Editor Provider">
@@ -10173,8 +10173,8 @@
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
          -->
 </component>
 <component id="imageeditorutils" filter="s60" name="Image Editor Utilities">
@@ -10561,7 +10561,7 @@
 <defined condition="__SERIES60_NATIVE_BROWSER"/>
 </meta>
 <!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
         <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
 </component>
 <component id="scrsaver_slideshowplugin" filter="s60" name="Screen Saver Slideshow Plugin" class="plugin">
@@ -10944,7 +10944,7 @@
 <unit bldFile="/app/webuis/pushmtm/plugins/group"/>
 </component>
 <component id="pushmtm_build" filter="s60" name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
 			component and move it down a diretcory, or make separate independent components in this collection -->
 <unit bldFile="/app/webuis/pushmtm/group"/>
 </component>
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -4,57 +4,57 @@
 <package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
 <collection id="s60_stubs" level="stub">
 <component id="audiostubs" name="Audio Stubs">
-<unit bldFile="/adaptation/stubs/audiostubs/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/group"/>
 </component>
 <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/btaudioadaptation_stub/group"/>
 </component>
 <component id="drm_stubs" name="DRM Stubs">
-<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="/adapt/stubs/drm_stubs/group"/>
 </component>
 <component id="ocrsrv_stub" name="OCR Services Stub">
-<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
 </component>
 <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
-<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 <component id="srsfenginestub" name="SRSF Engine Stub">
-<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="/adapt/stubs/srsfenginestub/group"/>
 </component>
 <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
-<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 <component id="systemswstubs" name="System Software Stubs">
-<unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+<unit bldFile="/adapt/stubs/systemswstubs/group"/>
 </component>
 <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
-<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
-<unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="/adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </package>
 <package id="beagleboard" tech-domain="hb" level="low" name="Beagle Board" levels="hw-if">
 <collection id="omap3530" name="OMAP 3530" level="hw-if">
 <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="/adapt/beagleboard/omap3530" mrp="/adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </package>
 <package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
 <collection id="qemu_baseport" name="Baseport" level="hw-if">
 <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="/adapt/qemu/baseport/syborg" mrp="/adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </package>
@@ -586,7 +586,7 @@
 <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="/os/ossrv/ofdbus/group"/>
 </component>
@@ -1011,7 +1011,7 @@
 <meta rel="config">
 <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
 </meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
 <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
 </component>
@@ -1025,7 +1025,7 @@
 <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
 <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
 <unit bldFile="/os/devicesrv/resourcemgmt/group"/>
 </component>
@@ -2107,7 +2107,7 @@
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2571,7 +2571,7 @@
 </component>
 </collection>
 <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
+<!-- components in this collection need to be moved to the right collection.
     		Either move into the units' directories, or create a new textandlocutils directory -->
 <component id="numbergrouping" filter="s60" name="Number Grouping">
 <unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
@@ -2617,8 +2617,8 @@
 <package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
 <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
 <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -3015,7 +3015,7 @@
 </component>
 </collection>
 <collection id="contextframework" name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component id="cfw" filter="s60" name="Context Framework">
 <meta rel="config">
@@ -4120,8 +4120,8 @@
 </component>
 </collection>
 <collection id="vpnengine" name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
 <unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
@@ -5092,7 +5092,7 @@
 <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
 </component>
 <component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
-<!-- move exports to other components.
+<!-- move exports to other components.
 				This is needed for #includes of configured component until congigiration is in place -->
 <unit bldFile="/mw/remotestorage/remotestoragefw/group"/>
 </component>
@@ -5374,9 +5374,9 @@
 </meta>
 <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
 <!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
         <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
 </component>
 <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
@@ -5590,15 +5590,15 @@
 <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
 <unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
 <unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5711,7 +5711,7 @@
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
 	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
 </component>
 <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
@@ -5730,14 +5730,14 @@
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
 </component>
 <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
 </component>
 <component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
@@ -6308,14 +6308,14 @@
 <meta rel="config">
 <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
 </meta>
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
 	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
 </component>
 <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
 <meta rel="config">
 <defined condition="__WINDOWS_MEDIA"/>
 </meta>
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
     <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
 </component>
 <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
@@ -6349,7 +6349,7 @@
 </collection>
 <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
 <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -7462,10 +7462,10 @@
 <component id="fontprovider" filter="s60" name="Font Provider">
 <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component id="fontutils" filter="sf_build" name="Font Utils">
 <unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7745,7 +7745,7 @@
 <unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
 </component>
 <component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="/mw/homescreensrv/contentpublishingsrv/group"/>
 </component>
@@ -7767,7 +7767,7 @@
 <unit bldFile="/mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
 </component>
 <component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="/mw/homescreensrv/contentcontrolsrv/group"/>
 </component>
@@ -8188,7 +8188,7 @@
 <unit bldFile="/mw/web/codhandler/roapapp/group"/>
 </component>
 <component id="codhandler_build" filter="s60" name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/codhandler/group"/>
 </component>
@@ -8241,7 +8241,7 @@
 <!--<unit bldFile="widgets/widgetstartup/group"/>-->
 </component>
 <component id="widgets_build" filter="s60" name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/widgets/group"/>
 </component>
@@ -8829,7 +8829,7 @@
 <unit bldFile="/app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
 </component>
 <component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
-<!--  consider distributing this into the above components, or collapse the collection into a single component. 
+<!--  consider distributing this into the above components, or collapse the collection into a single component. 
       		The latter is a better option since clients and sevrers are rarely separate components -->
 <unit bldFile="/app/iptelephony/convergedconnectionhandler/group"/>
 </component>
@@ -8986,7 +8986,7 @@
 <unit bldFile="/app/devicecontrol/devicediagnostics/diagsuites/group"/>
 </component>
 <component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build">
-<!-- can the exports be moved to one of the other components?
+<!-- can the exports be moved to one of the other components?
 			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
 <unit bldFile="/app/devicecontrol/devicediagnostics/group"/>
 </component>
@@ -10042,7 +10042,7 @@
 <unit bldFile="/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
 <component id="meetingrequest_build" filter="s60" name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
+<!-- can the exports be broken up into the other components ?
 			alternatively, move the exports into a RM Config component-->
 <unit bldFile="/app/commonemail/meetingrequest/group"/>
 </component>
@@ -10283,8 +10283,8 @@
 <unit bldFile="/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
 <unit bldFile="/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
 <unit bldFile="/app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
          -->
 </component>
 <component id="editorprovider" filter="s60" name="Image Editor Provider">
@@ -10318,8 +10318,8 @@
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
          -->
 </component>
 <component id="imageeditorutils" filter="s60" name="Image Editor Utilities">
@@ -10728,7 +10728,7 @@
 <defined condition="__SERIES60_NATIVE_BROWSER"/>
 </meta>
 <!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
         <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
 </component>
 <component id="scrsaver_slideshowplugin" filter="s60" name="Screen Saver Slideshow Plugin" class="plugin">
@@ -11117,7 +11117,7 @@
 <unit bldFile="/app/webuis/pushmtm/plugins/group"/>
 </component>
 <component id="pushmtm_build" filter="s60" name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
 			component and move it down a diretcory, or make separate independent components in this collection -->
 <unit bldFile="/app/webuis/pushmtm/group"/>
 </component>
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -1,195 +1,195 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
-<unit bldFile="adaptation/stubs/audiostubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/group"/>
 </component>
 <component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="adapt/stubs/btaudioadaptation_stub/group"/>
 </component>
 <component name="drm_stubs" long-name="DRM Stubs">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
 </component>
 <component name="ocrsrv_stub" long-name="OCR Services Stub">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
 </component>
 <component name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 <component name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 <component name="srsfenginestub" long-name="SRSF Engine Stub">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/group"/>
 </component>
 <component name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 <component name="systemswstubs" long-name="System Software Stubs">
-<unit bldFile="adaptation/stubs/systemswstubs/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/group"/>
 </component>
 <component name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 <component name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </block>
 <block name="beagleboard" level="low" long-name="Beagle Board" levels="hw-if">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
 <block name="qemu" level="low" long-name="QEMU and Baseport" levels="hw-if">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
 <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
 <collection name="utilities" long-name="Aricent Utilities">
 <component name="ariprocessengine" long-name="Aricent Process Engine">
-<unit bldFile="adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/ariprocessengine/group"/>
 </component>
 <component name="aristatemachine" long-name="Aricent State Machine">
-<unit bldFile="adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/aristatemachine/group"/>
 </component>
 </collection>
 <collection name="aaclc_enc" level="plugin">
 <component name="ariaaclcencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_dec" level="plugin">
 <component name="ariamrnbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_enc" level="plugin">
 <component name="ariamrnbencmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrwb_dec" level="plugin">
 <component name="ariamrwbdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="h264_dec" level="plugin">
 <component name="arih264dechwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
 </component>
 </collection>
 <collection name="h264_enc" level="plugin">
 <component name="arih264enchwdevice">
-<unit bldFile="adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
 </component>
 </collection>
 <collection name="heaac_dec" level="plugin">
 <component name="ariheaacdecmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp3_dec" level="plugin">
 <component name="arimp3decmmfcodec">
-<unit bldFile="adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp4asp_dec" level="plugin">
 <component name="arimpeg4aspdechwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
 </component>
 </collection>
 <collection name="mp4sp_enc" level="plugin">
 <component name="arimp4spenchwdevice">
-<unit bldFile="adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
 </component>
 </collection>
 </block>
@@ -714,7 +714,7 @@
 <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component name="ofdbus_rom" filter="s60" long-name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="os/ossrv/ofdbus/group"/>
 </component>
@@ -1132,7 +1132,7 @@
 <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/>
 </component>
 <component name="hwrmtargetmodifierplugin" filter="s60" long-name="HWRM Target Modifier Plugin" plugin="Y">
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
 <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
 </component>
@@ -1146,7 +1146,7 @@
 <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
 <component name="resourcemgmt_build" filter="s60" long-name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
 <unit bldFile="os/devicesrv/resourcemgmt/group"/>
 </component>
@@ -2163,7 +2163,7 @@
 <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component name="effectspresets_utils" filter="s60" long-name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2569,7 +2569,7 @@
 </component>
 </collection>
 <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
+<!-- components in this collection need to be moved to the right collection.
     		Either move into the units' directories, or create a new textandlocutils directory -->
 <component name="numbergrouping" filter="s60" long-name="Number Grouping">
 <unit bldFile="os/textandloc/charconvfw/numbergrouping/group"/>
@@ -2615,8 +2615,8 @@
 <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
 <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
 <component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -3011,7 +3011,7 @@
 </component>
 </collection>
 <collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component name="cfw" filter="s60" long-name="Context Framework">
 <!--<unit bldFile="contextframework/cfw/group"/> -->
@@ -4080,8 +4080,8 @@
 </component>
 </collection>
 <collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
 <unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
@@ -5023,7 +5023,7 @@
 <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
 </component>
 <component name="remotestoragefw_build" filter="s60" long-name="Remote Storage Framework Build">
-<!-- move exports to other components.
+<!-- move exports to other components.
 				This is needed for #includes of configured component until congigiration is in place -->
 <unit bldFile="mw/remotestorage/remotestoragefw/group"/>
 </component>
@@ -5278,9 +5278,9 @@
 <collection name="upnpharvester" long-name="UPnP Harvester" level="ctrl">
 <component name="upnpharvester_common" filter="s60" long-name="UPnP Harvester Common" introduced="^2" deprecated="^3" class="placeholder">
 <!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
         <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
 </component>
 <component name="cdssync" filter="s60" long-name="CDS Sync" introduced="^2" deprecated="^3" class="placeholder">
@@ -5478,15 +5478,15 @@
 <component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
 <unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
 <unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5592,7 +5592,7 @@
 <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
 <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
 <component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
 	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
 </component>
 <component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
@@ -5608,11 +5608,11 @@
 <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
 </component>
 <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
 </component>
 <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
 </component>
 <component name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform Interface Build" filter="s60" class="api">
@@ -6142,11 +6142,11 @@
 <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
 </component>
 <component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
 	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
 </component>
 <component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
     <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
 </component>
 <component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
@@ -6180,7 +6180,7 @@
 </collection>
 <collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
 <component name="mmappcomponents_build" filter="s60" long-name="Multimedia App Components Build" introduced="^1">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -7132,10 +7132,10 @@
 <component name="fontprovider" filter="s60" long-name="Font Provider">
 <unit bldFile="mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component name="fontutils" filter="sf_build" long-name="Font Utils">
 <unit bldFile="mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7400,7 +7400,7 @@
 <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
 </component>
 <component name="contentpublishingsrv_build" filter="s60" long-name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
 </component>
@@ -7422,7 +7422,7 @@
 <unit bldFile="mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
 </component>
 <component name="contentcontrolsrv_build" long-name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
 </component>
@@ -7831,7 +7831,7 @@
 <unit bldFile="mw/web/codhandler/roapapp/group"/>
 </component>
 <component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="mw/web/codhandler/group"/>
 </component>
@@ -7860,7 +7860,7 @@
 <!--<unit bldFile="widgets/widgetstartup/group"/>-->
 </component>
 <component name="widgets_build" filter="s60" long-name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="mw/web/widgets/group"/>
 </component>
@@ -8445,7 +8445,7 @@
 <unit bldFile="app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
 </component>
 <component name="convergedconnectionhandler_build" filter="s60" long-name="CCH Build" introduced="^2">
-<!--  consider distributing this into the above components, or collapse the collection into a single component. 
+<!--  consider distributing this into the above components, or collapse the collection into a single component. 
       		The latter is a better option since clients and sevrers are rarely separate components -->
 <unit bldFile="app/iptelephony/convergedconnectionhandler/group"/>
 </component>
@@ -8601,7 +8601,7 @@
 <unit bldFile="app/devicecontrol/devicediagnostics/diagsuites/group"/>
 </component>
 <component name="devicediagnostics_build" filter="s60" long-name="Device Diagnostics Build">
-<!-- can the exports be moved to one of the other components?
+<!-- can the exports be moved to one of the other components?
 			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
 <unit bldFile="app/devicecontrol/devicediagnostics/group"/>
 </component>
@@ -9638,7 +9638,7 @@
 <unit bldFile="app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
 <component name="meetingrequest_build" filter="s60" long-name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
+<!-- can the exports be broken up into the other components ?
 			alternatively, move the exports into a RM Config component-->
 <unit bldFile="app/commonemail/meetingrequest/group"/>
 </component>
@@ -9870,8 +9870,8 @@
 <unit bldFile="app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
 <unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
 <unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
          -->
 </component>
 <component name="editorprovider" filter="s60" long-name="Image Editor Provider">
@@ -9905,8 +9905,8 @@
 <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
 <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
 <unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
          -->
 </component>
 <component name="imageeditorutils" filter="s60" long-name="Image Editor Utilities">
@@ -10270,7 +10270,7 @@
 <collection name="scrsaver" long-name="Screen Saver" level="plugin">
 <component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
 <!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
         <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
 </component>
 <component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
@@ -10630,7 +10630,7 @@
 <unit bldFile="app/webuis/pushmtm/plugins/group"/>
 </component>
 <component name="pushmtm_build" filter="s60" long-name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
 			component and move it down a diretcory, or make separate independent components in this collection -->
 <unit bldFile="app/webuis/pushmtm/group"/>
 </component>
diff -r 43b28893dd71 -r cd43afbd6191 symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -5,57 +5,57 @@
 <package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
 <collection id="s60_stubs" level="stub">
 <component id="audiostubs" name="Audio Stubs">
-<unit bldFile="/adaptation/stubs/audiostubs/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/group"/>
 </component>
 <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/btaudioadaptation_stub/group"/>
 </component>
 <component id="drm_stubs" name="DRM Stubs">
-<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="/adapt/stubs/drm_stubs/group"/>
 </component>
 <component id="ocrsrv_stub" name="OCR Services Stub">
-<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
 </component>
 <component id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation">
-<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 <component id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" class="plugin">
-<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 <component id="srsfenginestub" name="SRSF Engine Stub">
-<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="/adapt/stubs/srsfenginestub/group"/>
 </component>
 <component id="power_save_display_mode_stub" name="Power Save Display Mode Stub">
-<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 <component id="systemswstubs" name="System Software Stubs">
-<unit bldFile="/adaptation/stubs/systemswstubs/group"/>
+<unit bldFile="/adapt/stubs/systemswstubs/group"/>
 </component>
 <component id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" class="plugin">
-<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 <component id="wlanhwinit_stub" name="WLAN Hardware Init Stub">
-<unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="/adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </package>
 <package id="beagleboard" tech-domain="hb" level="low" name="Beagle Board" levels="hw-if">
 <collection id="omap3530" name="OMAP 3530" level="hw-if">
 <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="/adapt/beagleboard/omap3530" mrp="/adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </package>
 <package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
 <collection id="qemu_baseport" name="Baseport" level="hw-if">
 <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="/adapt/qemu/baseport/syborg" mrp="/adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </package>
@@ -583,7 +583,7 @@
 <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="/os/ossrv/ofdbus/group"/>
 </component>
@@ -1006,7 +1006,7 @@
 <meta rel="config">
 <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
 </meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
 <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
 </component>
@@ -1020,7 +1020,7 @@
 <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
 <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
 <unit bldFile="/os/devicesrv/resourcemgmt/group"/>
 </component>
@@ -2041,7 +2041,7 @@
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2469,7 +2469,7 @@
 
 </collection>
 <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
-<!-- components in this collection need to be moved to the right collection.
+<!-- components in this collection need to be moved to the right collection.
     		Either move into the units' directories, or create a new textandlocutils directory -->
 <component id="numbergrouping" filter="s60" name="Number Grouping">
 <unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
@@ -2515,8 +2515,8 @@
 <package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
 <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
 <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -2913,7 +2913,7 @@
 </component>
 </collection>
 <collection id="contextframework" name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component id="cfw" filter="s60" name="Context Framework">
 <meta rel="config">
@@ -4008,8 +4008,8 @@
 </component>
 </collection>
 <collection id="vpnengine" name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
 <unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
@@ -4974,7 +4974,7 @@
 <!--   <unit bldFile="remotestoragefw/remotedriveconfigurationbiocontrol/group"/>-->
 </component>
 <component id="remotestoragefw_build" filter="s60" name="Remote Storage Framework Build">
-<!-- move exports to other components.
+<!-- move exports to other components.
 				This is needed for #includes of configured component until congigiration is in place -->
 <unit bldFile="/mw/remotestorage/remotestoragefw/group"/>
 </component>
@@ -5256,9 +5256,9 @@
 </meta>
 <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
 <!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
         <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
 </component>
 <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
@@ -5466,15 +5466,15 @@
 <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
 <unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
 <unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5585,7 +5585,7 @@
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
 	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
 </component>
 <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
@@ -5604,14 +5604,14 @@
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
 </component>
 <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
 <meta rel="config">
 <not-defined condition="RD_MDS_2_5"/>
 </meta>
-<!-- Leave commented out until confguration is in use
+<!-- Leave commented out until confguration is in use
     <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
 </component>
 <component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
@@ -6176,14 +6176,14 @@
 <meta rel="config">
 <defined condition="IAD_INCLUDE_BACKSTEPPING"/>
 </meta>
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
 	 <unit bldFile="mmappfw_plat/mpx_backstepping_utility_api/group"/> -->
 </component>
 <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
 <meta rel="config">
 <defined condition="__WINDOWS_MEDIA"/>
 </meta>
-<!-- uncomment when configuration is put in place
+<!-- uncomment when configuration is put in place
     <unit bldFile="mmappfw_plat/asx_parser_api/group"/> -->
 </component>
 <component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
@@ -6217,7 +6217,7 @@
 </collection>
 <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
 <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -7325,10 +7325,10 @@
 <component id="fontprovider" filter="s60" name="Font Provider">
 <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component id="fontutils" filter="sf_build" name="Font Utils">
 <unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7608,7 +7608,7 @@
 <unit bldFile="/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
 </component>
 <component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="/mw/homescreensrv/contentpublishingsrv/group"/>
 </component>
@@ -7630,7 +7630,7 @@
 <unit bldFile="/mw/homescreensrv/contentcontrolsrv/hscontentinfo/group"/>
 </component>
 <component id="contentcontrolsrv_build" name="Content Control Service Build" filter="s60" introduced="^3">
-<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
+<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component). 
       		If keeping, it need to move down a directory.-->
 <unit bldFile="/mw/homescreensrv/contentcontrolsrv/group"/>
 </component>
@@ -8047,7 +8047,7 @@
 <unit bldFile="/mw/web/codhandler/roapapp/group"/>
 </component>
 <component id="codhandler_build" filter="s60" name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/codhandler/group"/>
 </component>
@@ -8100,7 +8100,7 @@
 <!--<unit bldFile="widgets/widgetstartup/group"/>-->
 </component>
 <component id="widgets_build" filter="s60" name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/widgets/group"/>
 </component>
@@ -8688,7 +8688,7 @@
 <unit bldFile="/app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
 </component>
 <component id="convergedconnectionhandler_build" filter="s60" name="CCH Build" introduced="^2">
-<!--  consider distributing this into the above components, or collapse the collection into a single component. 
+<!--  consider distributing this into the above components, or collapse the collection into a single component. 
       		The latter is a better option since clients and sevrers are rarely separate components -->
 <unit bldFile="/app/iptelephony/convergedconnectionhandler/group"/>
 </component>
@@ -8845,7 +8845,7 @@
 <unit bldFile="/app/devicecontrol/devicediagnostics/diagsuites/group"/>
 </component>
 <component id="devicediagnostics_build" filter="s60" name="Device Diagnostics Build">
-<!-- can the exports be moved to one of the other components?
+<!-- can the exports be moved to one of the other components?
 			or all  #includes removed from here, and it renamed Device Diagnostics ROM -->
 <unit bldFile="/app/devicecontrol/devicediagnostics/group"/>
 </component>
@@ -9901,7 +9901,7 @@
 <unit bldFile="/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
 </component>
 <component id="meetingrequest_build" filter="s60" name="MR Build" introduced="^2">
-<!-- can the exports be broken up into the other components ?
+<!-- can the exports be broken up into the other components ?
 			alternatively, move the exports into a RM Config component-->
 <unit bldFile="/app/commonemail/meetingrequest/group"/>
 </component>
@@ -10138,8 +10138,8 @@
 <unit bldFile="/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
 <unit bldFile="/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
 <unit bldFile="/app/imgeditor/imageeditor/plugins/textplugin/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditor/plugins/drawplugin/group"/>
          -->
 </component>
 <component id="editorprovider" filter="s60" name="Image Editor Provider">
@@ -10173,8 +10173,8 @@
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
 <unit bldFile="/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-<!-- conditionally #included in imageeditor_build: need to fix
-        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
+<!-- conditionally #included in imageeditor_build: need to fix
+        <unit bldFile="imageeditorengine/filters/filterdraw/group"/>
          -->
 </component>
 <component id="imageeditorutils" filter="s60" name="Image Editor Utilities">
@@ -10561,7 +10561,7 @@
 <defined condition="__SERIES60_NATIVE_BROWSER"/>
 </meta>
 <!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
-<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+<!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
         <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
 </component>
 <component id="scrsaver_slideshowplugin" filter="s60" name="Screen Saver Slideshow Plugin" class="plugin">
@@ -10944,7 +10944,7 @@
 <unit bldFile="/app/webuis/pushmtm/plugins/group"/>
 </component>
 <component id="pushmtm_build" filter="s60" name="Push MTM Build">
-<!-- Some content is at collection level and some is at comopnent level. Either make this a single
+<!-- Some content is at collection level and some is at comopnent level. Either make this a single
 			component and move it down a diretcory, or make separate independent components in this collection -->
 <unit bldFile="/app/webuis/pushmtm/group"/>
 </component>
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sources.csv
--- a/symbian4/single/sources.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sources.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -1,9 +1,9 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,NON-NOKIA
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/openmaxil.nokia/,/sf/adaptation/openmaxil.nokia,tag,tip_bulk,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/openmaxil.nokia/,/sf/adapt/openmaxil.nokia,tag,tip_bulk,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,tag,tip_bulk,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/calendarwidget/,/sf/app/calendarwidget,tag,tip_bulk,layers.sysdef.xml
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sources_proposed.csv
--- a/symbian4/single/sources_proposed.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sources_proposed.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -1,10 +1,10 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adaptation/beagleboard,tag,S4_PROPOSED,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adapt/codecs.aricent/,/sf/adaptation/codecs.aricent,tag,S4_PROPOSED,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adapt/naviengine.nec/,/sf/adaptation/naviengine.nec,tag,S4_PROPOSED,
-http://developer.symbian.org/oss/FCL/sf/adapt/openmaxil.nokia/,/sf/adaptation/openmaxil.nokia,tag,S4_PROPOSED,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adaptation/qemu,tag,S4_PROPOSED,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adaptation/stubs,tag,S4_PROPOSED,201036
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,tag,S4_PROPOSED,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,tag,S4_PROPOSED,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/naviengine.nec/,/sf/adapt/naviengine.nec,tag,S4_PROPOSED,
+http://developer.symbian.org/oss/FCL/sf/adapt/openmaxil.nokia/,/sf/adapt/openmaxil.nokia,tag,S4_PROPOSED,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,tag,S4_PROPOSED,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,tag,S4_PROPOSED,201036
 http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,tag,S4_PROPOSED,201037_03
 http://developer.symbian.org/oss/FCL/sf/app/calendarwidget/,/sf/app/calendarwidget,tag,S4_PROPOSED,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,tag,S4_PROPOSED,201037_1
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sources_surge.csv
--- a/symbian4/single/sources_surge.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sources_surge.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -1,8 +1,8 @@
 source,dst,type,pattern,sysdef
 http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,GCC_SURGE,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,GCC_SURGE,modified-FCL
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,GCC_SURGE,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,GCC_SURGE,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,GCC_SURGE,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,branch,GCC_SURGE,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,branch,GCC_SURGE,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,branch,GCC_SURGE,layers.sysdef.xml
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sysdefs/auto/system_model.xml
--- a/symbian4/single/sysdefs/auto/system_model.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -1,284 +1,284 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
 <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
 <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
 </component>
 </collection>
 <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
 <component name="drm_stubs_build" long-name="DRM Stubs Build" purpose="optional">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
 </component>
 </collection>
 <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
 <component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
 </component>
 </collection>
 <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 <component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 </collection>
 <collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
 <component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 </collection>
 <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
 <component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/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_build" long-name="Power Save Display Mode Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
 <collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
 <component name="tvoutconfig" long-name="TV Out Config" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
 </component>
 <component name="accessorypolicyreference" long-name="Accessory Policy Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
 </component>
 <component name="asyreference" long-name="ASY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
 </component>
 <component name="examplecommonisc" long-name="Example Common ISC" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
 </component>
 <component name="exampledsy" long-name="Example DSY" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
 </component>
 <component name="featuremanagerstub" long-name="Feature Manager Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
 </component>
 <component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
 </component>
 <component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
 </component>
 <component name="sensorchannelsreference" long-name="Sensor Channels Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
 </component>
 <component name="ssyreference" long-name="SSY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
 </component>
 <component name="startupadaptationstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
 </component>
 <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
 </component>
 <component name="tvoutbehaviour" long-name="TV Out Behaviour" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
 </component>
 <component name="wiredbearerreference" long-name="Wired Bearer Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
 </component>
 </collection>
 <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
 <component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 </collection>
 <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
 <component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </block>
 <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
 <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
 <block name="naviengine.nec" level="low" levels="hw-if" long-name="NaviEngine">
 <collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
 <component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb"/>
+<unit bldFile="adapt/naviengine.nec/navienginebsp/ne1_tb"/>
 </component>
 <component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb/single"/>
+<unit bldFile="adapt/naviengine.nec/navienginebsp/ne1_tb/single"/>
 </component>
 <component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebspflexible"/>
+<unit bldFile="adapt/naviengine.nec/navienginebspflexible"/>
 </component>
 <component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebootldr"/>
+<unit bldFile="adapt/naviengine.nec/navienginebootldr"/>
 </component>
 </collection>
 </block>
 <block name="codecs.aricent" level="low" levels="util plugin" long-name="Aricent Codecs">
 <collection name="aricent_utilities" long-name="Aricent Utilities" level="util">
 <component name="ariprocessengine" long-name="Aricent Process Engine" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/ariprocessengine/group"/>
 </component>
 <component name="aristatemachine" long-name="Aricent State Machine" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/aristatemachine/group"/>
 </component>
 </collection>
 <collection name="aaclc_enc" long-name="AAC LC Encoding" level="plugin">
 <component name="ariaaclcencmmfcodec" long-name="Aricent AAC LC Encoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_dec" long-name="AMR NB Decoding" level="plugin">
 <component name="ariamrnbdecmmfcodec" long-name="Aricent AMR NB Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_enc" long-name="AMR NB Encoding" level="plugin">
 <component name="ariamrnbencmmfcodec" long-name="Aricent AMR NB Encoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrwb_dec" long-name="AMR WB Decoding" level="plugin">
 <component name="ariamrwbdecmmfcodec" long-name="Aricent AMR WB Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="h264_dec" long-name="H264 Decoding" level="plugin">
 <component name="arih264dechwdevice" long-name="Aricent H264 Decoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
 </component>
 </collection>
 <collection name="h264_enc" long-name="H264 Encoding" level="plugin">
 <component name="arih264enchwdevice" long-name="Aricent H264 Encoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
 </component>
 </collection>
 <collection name="heaac_dec" long-name="HE AAC Decoding" level="plugin">
 <component name="ariheaacdecmmfcodec" long-name="Aricent HE AAC Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp3_dec" long-name="MP3 Decoding" level="plugin">
 <component name="arimp3decmmfcodec" long-name="Aricent MP3 Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp4asp_dec" long-name="MP4 ASP Decoding" level="plugin">
 <component name="arimpeg4aspdechwdevice" long-name="Aricent MP4 ASP Decoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
 </component>
 </collection>
 <collection name="mp4sp_enc" long-name="MP4 SP Encoding" level="plugin">
 <component name="arimp4spenchwdevice" long-name="MP4 SP Encoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
 </component>
 </collection>
 </block>
 <block name="openmaxil.nokia" level="mw" levels="adaptation hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
 <collection name="omxilcomp" long-name="OpenMAX IL Components" level="adaptation">
 <component name="omxilgeneric" long-name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
 </component>
 <component name="omxilaudioemulator" long-name="OpenMAX IL Audio Emulator" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
 </component>
 <component name="omxiltestcomp" long-name="OpenMAX IL Test Components" introduced="^3" purpose="development" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
 </component>
 </collection>
 </block>
@@ -646,7 +646,7 @@
 <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component name="ofdbus_rom" long-name="D-Bus ROM" filter="s60" purpose="optional">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="os/ossrv/ofdbus/group"/>
 </component>
@@ -2071,7 +2071,7 @@
 <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component name="effectspresets_utils" long-name="Effects Presets Utils" filter="s60" purpose="optional">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -3395,9 +3395,9 @@
 <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
 </component>
 <component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" purpose="optional" class="api placeholder">
-<!-- placeholder
-    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
 	 -->
 </component>
 <component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" purpose="optional" class="api">
@@ -5629,7 +5629,7 @@
 </collection>
 <collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
 <component name="mmappcomponents_build" long-name="Multimedia App Components Build" introduced="^1" filter="s60" purpose="optional">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -7116,7 +7116,7 @@
 <unit bldFile="mw/web/codhandler/roapapp/group"/>
 </component>
 <component name="codhandler_build" long-name="COD Handler Build" filter="s60" purpose="optional">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="mw/web/codhandler/group"/>
 </component>
@@ -7992,14 +7992,14 @@
 <collection name="calendarwidgetinstaller" long-name="Calendar Widget Installer" level="build">
 <!-- collection is really a component, need to move down a directory -->
 <component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" introduced="^4" filter="dfs_build" purpose="optional" class="placeholder">
-<!--  built by calendarwidget_rom
+<!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
 </component>
 </collection>
 <collection name="calendarwidgetplugin" long-name="Calendar Widget Plugin" level="app">
 <!-- collection is really a component, need to move down a directory -->
 <component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" introduced="^4" filter="dfs_build" purpose="optional" plugin="Y" class="placeholder">
-<!--  built by calendarwidget_rom
+<!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
 </component>
 <component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" introduced="^4" filter="dfs_build" purpose="optional">
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sysdefs/auto/system_model_3.0.xml
--- a/symbian4/single/sysdefs/auto/system_model_3.0.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model_3.0.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -5,104 +5,104 @@
 <package id="stubs" tech-domain="hb" level="high" span="2" name="Stubs" levels="adaptation plugin mid engine">
 <collection id="audiostubs" name="Audio Stubs" level="adaptation">
 <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
-<unit bldFile="/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
 <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub">
-<unit bldFile="/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="/adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
 </component>
 </collection>
 <collection id="btaudioadaptation_stub" name="Bluetooth Audio Adaptation Stub" level="adaptation">
 <component id="btaudioadaptation_stub_build" name="Bluetooth Audio Adaptation Stub Build" filter="oem_build">
-<unit bldFile="/adaptation/stubs/btaudioadaptation_stub/group"/>
+<unit bldFile="/adapt/stubs/btaudioadaptation_stub/group"/>
 </component>
 </collection>
 <collection id="drm_stubs" name="DRM Stubs" level="plugin">
 <component id="drm_stubs_build" name="DRM Stubs Build">
-<unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="/adapt/stubs/drm_stubs/group"/>
 </component>
 </collection>
 <collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
 <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build">
-<unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
 </component>
 </collection>
 <collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build">
-<unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 </collection>
 <collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
 <component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin">
-<unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 </collection>
 <collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
 <component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs">
-<unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="/adapt/stubs/srsfenginestub/group"/>
 </component>
 </collection>
 <collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
 <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build">
-<unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
 <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
 <component id="ddcaccessstub" name="DDC Access Stub">
-<unit bldFile="/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="/adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
 <component id="tvoutconfig" name="TV Out Config">
-<unit bldFile="/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
 </component>
 <component id="accessorypolicyreference" name="Accessory Policy Reference">
 <meta rel="config">
 <defined condition="__ACCESSORY_FW"/>
 </meta>
-<unit bldFile="/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
 </component>
 <component id="asyreference" name="ASY Reference" class="plugin">
 <meta rel="config">
 <defined condition="__ACCESSORY_FW"/>
 </meta>
-<unit bldFile="/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
 </component>
 <component id="examplecommonisc" name="Example Common ISC">
-<unit bldFile="/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
 </component>
 <component id="exampledsy" name="Example DSY">
 <meta rel="config">
 <defined condition="RD_STARTUP_CHANGE"/>
 </meta>
-<unit bldFile="/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
 </component>
 <component id="featuremanagerstub" name="Feature Manager Stub">
-<unit bldFile="/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
 </component>
 <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin">
-<unit bldFile="/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
 </component>
 <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin">
-<unit bldFile="/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
 </component>
 <component id="sensorchannelsreference" name="Sensor Channels Reference">
-<unit bldFile="/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
 </component>
 <component id="ssyreference" name="SSY Reference" class="plugin">
 <meta rel="config">
 <defined condition="RD_SENSOR_FW"/>
 </meta>
-<unit bldFile="/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
 </component>
 <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin">
-<unit bldFile="/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
 </component>
 <component id="tiltcompensationstub" name="Tilt Compensation Stub">
-<unit bldFile="/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
 </component>
 <component id="tvoutbehaviour" name="TV Out Behaviour">
-<unit bldFile="/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
 </component>
 <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin">
-<unit bldFile="/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="/adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
 </component>
 </collection>
 <collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
@@ -110,32 +110,32 @@
 <defined condition="RD_TACTILE_FEEDBACK"/>
 </meta>
 <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin">
-<unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 </collection>
 <collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
 <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build">
-<unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="/adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </package>
 <package id="beagleboard" tech-domain="hb" level="low" name="Beagle Board" levels="hw-if">
 <collection id="omap3530" name="OMAP 3530" level="hw-if">
 <component id="omap3530_build" name="Beagle Board Common" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="/adapt/beagleboard/omap3530" mrp="/adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </package>
 <package id="qemu" tech-domain="hb" level="low" name="QEMU and Baseport" levels="hw-if">
 <collection id="qemu_baseport" name="Baseport" level="hw-if">
 <component id="syborg" name="Syborg" introduced="^2" purpose="optional" filter="sf_build">
-<unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="/adapt/qemu/baseport/syborg" mrp="/adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </package>
@@ -503,7 +503,7 @@
 <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="/os/ossrv/ofdbus/group"/>
 </component>
@@ -935,7 +935,7 @@
 <meta rel="config">
 <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
 </meta>
-<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
 <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
 </component>
@@ -949,7 +949,7 @@
 <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
 <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-<!-- Move exports to a self-contained component.
+<!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
 <unit bldFile="/os/devicesrv/resourcemgmt/group"/>
 </component>
@@ -1975,7 +1975,7 @@
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2453,8 +2453,8 @@
 <package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
 <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
 <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -2788,7 +2788,7 @@
 </component>
 </collection>
 <collection id="contextframework" name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
+<!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component id="cfw" filter="s60" name="Context Framework">
 <meta rel="config">
@@ -3762,8 +3762,8 @@
 </component>
 </collection>
 <collection id="vpnengine" name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
 <unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group"/>
@@ -4944,9 +4944,9 @@
 </meta>
 <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
 <!-- need to merge or #include these to a single bld.inf -->
-<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
-        <unit bldFile="upnpharvester/common/cmsettings/group"/>
-        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
         <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
 </component>
 <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
@@ -5162,15 +5162,15 @@
 <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
 <unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
 <unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5785,7 +5785,7 @@
 </collection>
 <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
 <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -6913,10 +6913,10 @@
 <component id="fontprovider" filter="s60" name="Font Provider">
 <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component id="fontutils" filter="sf_build" name="Font Utils">
 <unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7567,7 +7567,7 @@
 <unit bldFile="/mw/web/codhandler/roapapp/group"/>
 </component>
 <component id="codhandler_build" filter="s60" name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/codhandler/group"/>
 </component>
@@ -7603,7 +7603,7 @@
 <!--<unit bldFile="widgets/widgetstartup/group"/>-->
 </component>
 <component id="widgets_build" filter="s60" name="Widgets Build">
-<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/widgets/group"/>
 </component>
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sysdefs/system_model.good.xml
--- a/symbian4/single/sysdefs/system_model.good.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.good.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -1,284 +1,284 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
 <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
 <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
 </component>
 </collection>
 <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
 <component name="drm_stubs_build" long-name="DRM Stubs Build" purpose="optional">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
 </component>
 </collection>
 <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
 <component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
 </component>
 </collection>
 <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 <component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 </collection>
 <collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
 <component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 </collection>
 <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
 <component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/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_build" long-name="Power Save Display Mode Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
 <collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
 <component name="tvoutconfig" long-name="TV Out Config" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
 </component>
 <component name="accessorypolicyreference" long-name="Accessory Policy Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
 </component>
 <component name="asyreference" long-name="ASY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
 </component>
 <component name="examplecommonisc" long-name="Example Common ISC" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
 </component>
 <component name="exampledsy" long-name="Example DSY" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
 </component>
 <component name="featuremanagerstub" long-name="Feature Manager Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
 </component>
 <component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
 </component>
 <component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
 </component>
 <component name="sensorchannelsreference" long-name="Sensor Channels Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
 </component>
 <component name="ssyreference" long-name="SSY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
 </component>
 <component name="startupadaptationstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
 </component>
 <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
 </component>
 <component name="tvoutbehaviour" long-name="TV Out Behaviour" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
 </component>
 <component name="wiredbearerreference" long-name="Wired Bearer Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
 </component>
 </collection>
 <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
 <component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 </collection>
 <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
 <component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </block>
 <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
 <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
 <block name="naviengine.nec" level="low" levels="hw-if" long-name="NaviEngine">
 <collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
 <component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb"/>
+<unit bldFile="adapt/naviengine.nec/navienginebsp/ne1_tb"/>
 </component>
 <component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb/single"/>
+<unit bldFile="adapt/naviengine.nec/navienginebsp/ne1_tb/single"/>
 </component>
 <component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebspflexible"/>
+<unit bldFile="adapt/naviengine.nec/navienginebspflexible"/>
 </component>
 <component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebootldr"/>
+<unit bldFile="adapt/naviengine.nec/navienginebootldr"/>
 </component>
 </collection>
 </block>
 <block name="codecs.aricent" level="low" levels="util plugin" long-name="Aricent Codecs">
 <collection name="aricent_utilities" long-name="Aricent Utilities" level="util">
 <component name="ariprocessengine" long-name="Aricent Process Engine" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/ariprocessengine/group"/>
 </component>
 <component name="aristatemachine" long-name="Aricent State Machine" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/aristatemachine/group"/>
 </component>
 </collection>
 <collection name="aaclc_enc" long-name="AAC LC Encoding" level="plugin">
 <component name="ariaaclcencmmfcodec" long-name="Aricent AAC LC Encoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_dec" long-name="AMR NB Decoding" level="plugin">
 <component name="ariamrnbdecmmfcodec" long-name="Aricent AMR NB Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_enc" long-name="AMR NB Encoding" level="plugin">
 <component name="ariamrnbencmmfcodec" long-name="Aricent AMR NB Encoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrwb_dec" long-name="AMR WB Decoding" level="plugin">
 <component name="ariamrwbdecmmfcodec" long-name="Aricent AMR WB Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="h264_dec" long-name="H264 Decoding" level="plugin">
 <component name="arih264dechwdevice" long-name="Aricent H264 Decoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
 </component>
 </collection>
 <collection name="h264_enc" long-name="H264 Encoding" level="plugin">
 <component name="arih264enchwdevice" long-name="Aricent H264 Encoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
 </component>
 </collection>
 <collection name="heaac_dec" long-name="HE AAC Decoding" level="plugin">
 <component name="ariheaacdecmmfcodec" long-name="Aricent HE AAC Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp3_dec" long-name="MP3 Decoding" level="plugin">
 <component name="arimp3decmmfcodec" long-name="Aricent MP3 Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp4asp_dec" long-name="MP4 ASP Decoding" level="plugin">
 <component name="arimpeg4aspdechwdevice" long-name="Aricent MP4 ASP Decoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
 </component>
 </collection>
 <collection name="mp4sp_enc" long-name="MP4 SP Encoding" level="plugin">
 <component name="arimp4spenchwdevice" long-name="MP4 SP Encoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
 </component>
 </collection>
 </block>
 <block name="openmaxil.nokia" level="mw" levels="adaptation hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
 <collection name="omxilcomp" long-name="OpenMAX IL Components" level="adaptation">
 <component name="omxilgeneric" long-name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
 </component>
 <component name="omxilaudioemulator" long-name="OpenMAX IL Audio Emulator" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
 </component>
 <component name="omxiltestcomp" long-name="OpenMAX IL Test Components" introduced="^3" purpose="development" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
 </component>
 </collection>
 </block>
@@ -646,7 +646,7 @@
 <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component name="ofdbus_rom" long-name="D-Bus ROM" filter="s60" purpose="optional">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="os/ossrv/ofdbus/group"/>
 </component>
@@ -2071,7 +2071,7 @@
 <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component name="effectspresets_utils" long-name="Effects Presets Utils" filter="s60" purpose="optional">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -3405,9 +3405,9 @@
 <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
 </component>
 <component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" purpose="optional" class="api placeholder">
-<!-- placeholder
-    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
 	 -->
 </component>
 <component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" purpose="optional" class="api">
@@ -5663,7 +5663,7 @@
 </collection>
 <collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
 <component name="mmappcomponents_build" long-name="Multimedia App Components Build" introduced="^1" filter="s60" purpose="optional">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -6666,15 +6666,15 @@
 </collection>
 <collection name="controlpanel" long-name="Control Panel" level="generic">
 <component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60" purpose="optional" class="placeholder">
-<!-- Need to create a real .pro file for this 
+<!-- Need to create a real .pro file for this 
 	  <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 <component name="controlpanel_config" long-name="Control Panel Config" introduced="^4" filter="s60" purpose="optional" class="config placeholder">
-<!-- Need to create a real .pro file for this 
+<!-- Need to create a real .pro file for this 
 	  <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 <component name="controlpanel_source" long-name="Control Panel Source" filter="s60" purpose="optional" class="placeholder">
-<!-- Uncomment when controlpanel_build is removed
+<!-- Uncomment when controlpanel_build is removed
 	  <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
 </component>
 <component name="controlpanel_build" long-name="Control Panel Build" filter="s60" purpose="optional">
@@ -7151,7 +7151,7 @@
 <unit bldFile="mw/web/codhandler/roapapp/group"/>
 </component>
 <component name="codhandler_build" long-name="COD Handler Build" filter="s60" purpose="optional">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="mw/web/codhandler/group"/>
 </component>
@@ -8027,14 +8027,14 @@
 <collection name="calendarwidgetinstaller" long-name="Calendar Widget Installer" level="build">
 <!-- collection is really a component, need to move down a directory -->
 <component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" introduced="^4" filter="dfs_build" purpose="optional" class="placeholder">
-<!--  built by calendarwidget_rom
+<!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
 </component>
 </collection>
 <collection name="calendarwidgetplugin" long-name="Calendar Widget Plugin" level="app">
 <!-- collection is really a component, need to move down a directory -->
 <component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" introduced="^4" filter="dfs_build" purpose="optional" plugin="Y" class="placeholder">
-<!--  built by calendarwidget_rom
+<!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
 </component>
 <component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" introduced="^4" filter="dfs_build" purpose="optional">
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sysdefs/system_model.surge.xml
--- a/symbian4/single/sysdefs/system_model.surge.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.surge.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -78,117 +78,117 @@
 <block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
 <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
 <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
 </component>
 </collection>
 <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
 <component name="drm_stubs_build" long-name="DRM Stubs Build" purpose="optional">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
 </component>
 </collection>
 <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
 <component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
 </component>
 </collection>
 <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 <component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 </collection>
 <collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
 <component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 </collection>
 <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
 <component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/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_build" long-name="Power Save Display Mode Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
 <collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
 <component name="tvoutconfig" long-name="TV Out Config" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
 </component>
 <component name="accessorypolicyreference" long-name="Accessory Policy Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
 </component>
 <component name="asyreference" long-name="ASY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
 </component>
 <component name="examplecommonisc" long-name="Example Common ISC" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
 </component>
 <component name="exampledsy" long-name="Example DSY" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
 </component>
 <component name="featuremanagerstub" long-name="Feature Manager Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
 </component>
 <component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
 </component>
 <component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
 </component>
 <component name="sensorchannelsreference" long-name="Sensor Channels Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
 </component>
 <component name="ssyreference" long-name="SSY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
 </component>
 <component name="startupadaptationstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
 </component>
 <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
 </component>
 <component name="tvoutbehaviour" long-name="TV Out Behaviour" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
 </component>
 <component name="wiredbearerreference" long-name="Wired Bearer Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
 </component>
 </collection>
 <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
 <component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 </collection>
 <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
 <component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </block>
 <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
 <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -1,284 +1,284 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
+<!DOCTYPE SystemDefinition [
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) "N"
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED
+>
+]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
 <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
 <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+<unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
 </component>
 </collection>
 <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
 <component name="drm_stubs_build" long-name="DRM Stubs Build" purpose="optional">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
 </component>
 </collection>
 <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
 <component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
 </component>
 </collection>
 <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 <component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 </collection>
 <collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
 <component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 </collection>
 <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
 <component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/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_build" long-name="Power Save Display Mode Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
 <collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
 <component name="tvoutconfig" long-name="TV Out Config" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
 </component>
 <component name="accessorypolicyreference" long-name="Accessory Policy Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
 </component>
 <component name="asyreference" long-name="ASY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
 </component>
 <component name="examplecommonisc" long-name="Example Common ISC" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
 </component>
 <component name="exampledsy" long-name="Example DSY" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
 </component>
 <component name="featuremanagerstub" long-name="Feature Manager Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
 </component>
 <component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
 </component>
 <component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
 </component>
 <component name="sensorchannelsreference" long-name="Sensor Channels Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
 </component>
 <component name="ssyreference" long-name="SSY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
 </component>
 <component name="startupadaptationstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
 </component>
 <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
 </component>
 <component name="tvoutbehaviour" long-name="TV Out Behaviour" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
 </component>
 <component name="wiredbearerreference" long-name="Wired Bearer Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
 </component>
 </collection>
 <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
 <component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+<unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
 </component>
 </collection>
 <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
 <component name="wlanhwinit_stub_build" long-name="WLAN Hardware Init Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </block>
 <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530" mrp="adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="adapt/beagleboard/omap3530" mrp="adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
 <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="adapt/qemu/baseport/syborg" mrp="adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
 <block name="naviengine.nec" level="low" levels="hw-if" long-name="NaviEngine">
 <collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
 <component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb"/>
+<unit bldFile="adapt/naviengine.nec/navienginebsp/ne1_tb"/>
 </component>
 <component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebsp/ne1_tb/single"/>
+<unit bldFile="adapt/naviengine.nec/navienginebsp/ne1_tb/single"/>
 </component>
 <component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebspflexible"/>
+<unit bldFile="adapt/naviengine.nec/navienginebspflexible"/>
 </component>
 <component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/naviengine.nec/navienginebootldr"/>
+<unit bldFile="adapt/naviengine.nec/navienginebootldr"/>
 </component>
 </collection>
 </block>
 <block name="codecs.aricent" level="low" levels="util plugin" long-name="Aricent Codecs">
 <collection name="aricent_utilities" long-name="Aricent Utilities" level="util">
 <component name="ariprocessengine" long-name="Aricent Process Engine" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/ariprocessengine/group"/>
 </component>
 <component name="aristatemachine" long-name="Aricent State Machine" introduced="^4" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+<unit bldFile="adapt/codecs.aricent/utilities/aristatemachine/group"/>
 </component>
 </collection>
 <collection name="aaclc_enc" long-name="AAC LC Encoding" level="plugin">
 <component name="ariaaclcencmmfcodec" long-name="Aricent AAC LC Encoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_dec" long-name="AMR NB Decoding" level="plugin">
 <component name="ariamrnbdecmmfcodec" long-name="Aricent AMR NB Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrnb_enc" long-name="AMR NB Encoding" level="plugin">
 <component name="ariamrnbencmmfcodec" long-name="Aricent AMR NB Encoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
 </component>
 </collection>
 <collection name="amrwb_dec" long-name="AMR WB Decoding" level="plugin">
 <component name="ariamrwbdecmmfcodec" long-name="Aricent AMR WB Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="h264_dec" long-name="H264 Decoding" level="plugin">
 <component name="arih264dechwdevice" long-name="Aricent H264 Decoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
 </component>
 </collection>
 <collection name="h264_enc" long-name="H264 Encoding" level="plugin">
 <component name="arih264enchwdevice" long-name="Aricent H264 Encoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
 </component>
 </collection>
 <collection name="heaac_dec" long-name="HE AAC Decoding" level="plugin">
 <component name="ariheaacdecmmfcodec" long-name="Aricent HE AAC Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp3_dec" long-name="MP3 Decoding" level="plugin">
 <component name="arimp3decmmfcodec" long-name="Aricent MP3 Decoding MMF Codec" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+<unit bldFile="adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
 </component>
 </collection>
 <collection name="mp4asp_dec" long-name="MP4 ASP Decoding" level="plugin">
 <component name="arimpeg4aspdechwdevice" long-name="Aricent MP4 ASP Decoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
 </component>
 </collection>
 <collection name="mp4sp_enc" long-name="MP4 SP Encoding" level="plugin">
 <component name="arimp4spenchwdevice" long-name="MP4 SP Encoding Hardware Device" introduced="^4" filter="sf_build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+<unit bldFile="adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
 </component>
 </collection>
 </block>
 <block name="openmaxil.nokia" level="mw" levels="adaptation hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
 <collection name="omxilcomp" long-name="OpenMAX IL Components" level="adaptation">
 <component name="omxilgeneric" long-name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
 </component>
 <component name="omxilaudioemulator" long-name="OpenMAX IL Audio Emulator" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
 </component>
 <component name="omxiltestcomp" long-name="OpenMAX IL Test Components" introduced="^3" purpose="development" plugin="Y">
-<unit bldFile="adaptation/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
+<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
 </component>
 </collection>
 </block>
@@ -646,7 +646,7 @@
 <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component name="ofdbus_rom" long-name="D-Bus ROM" filter="s60" purpose="optional">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="os/ossrv/ofdbus/group"/>
 </component>
@@ -2071,7 +2071,7 @@
 <unit bldFile="os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component name="effectspresets_utils" long-name="Effects Presets Utils" filter="s60" purpose="optional">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -3395,9 +3395,9 @@
 <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
 </component>
 <component name="supl_pos_message_plugin_api" long-name="SUPL POS Message Plugin API" filter="s60" purpose="optional" class="api placeholder">
-<!-- placeholder
-    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
 	 -->
 </component>
 <component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" purpose="optional" class="api">
@@ -5629,7 +5629,7 @@
 </collection>
 <collection name="mmappcomponents" long-name="Multimedia App Components" level="utils">
 <component name="mmappcomponents_build" long-name="Multimedia App Components Build" introduced="^1" filter="s60" purpose="optional">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -7116,7 +7116,7 @@
 <unit bldFile="mw/web/codhandler/roapapp/group"/>
 </component>
 <component name="codhandler_build" long-name="COD Handler Build" filter="s60" purpose="optional">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="mw/web/codhandler/group"/>
 </component>
@@ -7992,14 +7992,14 @@
 <collection name="calendarwidgetinstaller" long-name="Calendar Widget Installer" level="build">
 <!-- collection is really a component, need to move down a directory -->
 <component name="calendarwidgetinstaller_build" long-name="Calendar Widget Installer Build" introduced="^4" filter="dfs_build" purpose="optional" class="placeholder">
-<!--  built by calendarwidget_rom
+<!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
 </component>
 </collection>
 <collection name="calendarwidgetplugin" long-name="Calendar Widget Plugin" level="app">
 <!-- collection is really a component, need to move down a directory -->
 <component name="calendarwidgetplugin_build" long-name="Calendar Widget Plugin Build" introduced="^4" filter="dfs_build" purpose="optional" plugin="Y" class="placeholder">
-<!--  built by calendarwidget_rom
+<!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
 </component>
 <component name="calendarwidgetplugin_test" long-name="Calendar Widget Plugin Test" introduced="^4" filter="dfs_build" purpose="optional">
diff -r 43b28893dd71 -r cd43afbd6191 symbian4/single/sysdefs/system_model_3.0.xml
--- a/symbian4/single/sysdefs/system_model_3.0.xml	Wed Oct 13 17:34:06 2010 +0100
+++ b/symbian4/single/sysdefs/system_model_3.0.xml	Fri Oct 15 14:33:14 2010 +0100
@@ -1,193 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- this DTD describes schema="3.0.1" --><!-- all relative paths are relative to this file
-	all absolute paths are relative to the environment variable specified by the root attribute, or SRCROOT if not.  --><!-- Container for metadata
-	meta, if present, should always be the first element in the parent 
-	 --><!-- systemModel element has name but no ID --><!-- All items from layer down to component should have either @href or at least one valid child item.
-	Anything else will be considered a placeholder
-	--><!-- Nested packages are for backwards compatibility only --><!-- contains units or is a placeholder --><!--
-	"origin-model" attribute is only to be inserted by tools when merging models
- 	recommended class values are: doc, config, plugin, tool, api --><!-- priority is deprecated 
+<?xml version="1.0" encoding="UTF-8"?><!-- this DTD describes schema="3.0.1" --><!-- all relative paths are relative to this file
+	all absolute paths are relative to the environment variable specified by the root attribute, or SRCROOT if not.  --><!-- Container for metadata
+	meta, if present, should always be the first element in the parent 
+	 --><!-- systemModel element has name but no ID --><!-- All items from layer down to component should have either @href or at least one valid child item.
+	Anything else will be considered a placeholder
+	--><!-- Nested packages are for backwards compatibility only --><!-- contains units or is a placeholder --><!--
+	"origin-model" attribute is only to be inserted by tools when merging models
+ 	recommended class values are: doc, config, plugin, tool, api --><!-- priority is deprecated 
 	"root" attribute will usually be inserted by tools when merging models, although it can be set manually--><SystemDefinition xmlns:qt="http://www.nokia.com/qt" schema="3.0.1" id-namespace="http://www.symbian.org/system-definition">
   <systemModel name="Symbian^4">
     <layer id="adaptation" name="Adaptation" levels="low mw high">
       <package id="stubs" tech-domain="hb" level="high" span="2" levels="adaptation plugin mid engine" name="Stubs">
     <collection id="audiostubs" name="Audio Stubs" level="adaptation">
      <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+      <unit bldFile="/adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
      </component>
      <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+      <unit bldFile="/adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
      </component>
     </collection>
    <collection id="drm_stubs" name="DRM Stubs" level="plugin">
      <component id="drm_stubs_build" name="DRM Stubs Build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+      <unit bldFile="/adapt/stubs/drm_stubs/group"/>
      </component>
     </collection>
     <collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
      <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+      <unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
      </component>
     </collection>
     <collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 	 <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+      <unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
      </component>
     </collection>
     <collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
      <component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+      <unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
      </component>
     </collection>
     <collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
      <component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs" target="device" purpose="optional">
-	    <unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+	    <unit bldFile="/adapt/stubs/srsfenginestub/group"/>
      </component>
     </collection>
     <collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
      <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
+      <unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
      </component>
     </collection>
     <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
      <component id="ddcaccessstub" name="DDC Access Stub" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/ddcaccessstub/group"/>
      </component>
      <component id="tvoutconfig" name="TV Out Config" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
      </component>
      <component id="accessorypolicyreference" name="Accessory Policy Reference" target="device" purpose="optional">
  	  
-      <unit bldFile="/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
      </component>
      <component id="asyreference" name="ASY Reference" class="plugin" target="device" purpose="optional">
  	  
-      <unit bldFile="/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
      </component>
      <component id="examplecommonisc" name="Example Common ISC" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
      </component>
      <component id="exampledsy" name="Example DSY" target="device" purpose="optional">
  	  
-      <unit bldFile="/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
      </component>
      <component id="featuremanagerstub" name="Feature Manager Stub" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
      </component>
      <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
      </component>
      <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
      </component>
      <component id="sensorchannelsreference" name="Sensor Channels Reference" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
      </component>
      <component id="ssyreference" name="SSY Reference" class="plugin" target="device" purpose="optional">
  	  
-      <unit bldFile="/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
      </component>
      <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
      </component>
      <component id="tiltcompensationstub" name="Tilt Compensation Stub" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
      </component>
      <component id="tvoutbehaviour" name="TV Out Behaviour" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
      </component>
      <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
      </component>
     </collection>
     <collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
  	  
      <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+      <unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
      </component>
     </collection>
     <collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
      <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+      <unit bldFile="/adapt/stubs/wlanhwinit_stub/group"/>
      </component>
     </collection>
   </package>
       <package id="beagleboard" tech-domain="hb" level="low" levels="hw-if" name="Beagle Board">
     <collection id="omap3530" name="OMAP 3530" level="hw-if">
       <component id="omap3530_build" name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional" target="device">
-        <unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+        <unit bldFile="/adapt/beagleboard/omap3530" mrp="/adapt/beagleboard/omap3530/base_beagle.mrp"/>
       </component>
       <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional" target="device">
-        <unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+        <unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
       </component>
       <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional" target="device">
-        <unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+        <unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
       </component>
     </collection>
   </package>
       <package id="qemu" tech-domain="hb" level="low" levels="hw-if" name="QEMU and Baseport">
     <collection id="qemu_baseport" name="Baseport" level="hw-if">
       <component id="syborg" name="Syborg" introduced="^2" filter="sf_build" purpose="optional" target="device">
-        <unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+        <unit bldFile="/adapt/qemu/baseport/syborg" mrp="/adapt/qemu/baseport/syborg/syborg.mrp"/>
       </component>
     </collection>
   </package>
       <package id="codecs.aricent" tech-domain="mm" level="low" levels="util plugin" name="Aricent Codecs">
     <collection id="aricent_utilities" name="Aricent Utilities" level="util">
       <component id="ariprocessengine" name="Aricent Process Engine" introduced="^4" filter="sf_build" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
+        <unit bldFile="/adapt/codecs.aricent/utilities/ariprocessengine/group"/>
       </component>
       <component id="aristatemachine" name="Aricent State Machine" introduced="^4" filter="sf_build" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
+        <unit bldFile="/adapt/codecs.aricent/utilities/aristatemachine/group"/>
       </component>
     </collection>
     <collection id="aaclc_enc" name="AAC LC Encoding" level="plugin">
       <component id="ariaaclcencmmfcodec" name="Aricent AAC LC Encoding MMF Codec" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
+        <unit bldFile="/adapt/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
       </component>
     </collection>
     <collection id="amrnb_dec" name="AMR NB Decoding" level="plugin">
       <component id="ariamrnbdecmmfcodec" name="Aricent AMR NB Decoding MMF Codec" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
+        <unit bldFile="/adapt/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
       </component>
     </collection>
     <collection id="amrnb_enc" name="AMR NB Encoding" level="plugin">
       <component id="ariamrnbencmmfcodec" name="Aricent AMR NB Encoding MMF Codec" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
+        <unit bldFile="/adapt/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
       </component>
     </collection>
     <collection id="amrwb_dec" name="AMR WB Decoding" level="plugin">
       <component id="ariamrwbdecmmfcodec" name="Aricent AMR WB Decoding MMF Codec" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
+        <unit bldFile="/adapt/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
       </component>
     </collection>
     <collection id="h264_dec" name="H264 Decoding" level="plugin">
       <component id="arih264dechwdevice" name="Aricent H264 Decoding Hardware Device" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
+        <unit bldFile="/adapt/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
       </component>
     </collection>
     <collection id="h264_enc" name="H264 Encoding" level="plugin">
       <component id="arih264enchwdevice" name="Aricent H264 Encoding Hardware Device" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
+        <unit bldFile="/adapt/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
       </component>
     </collection>
     <collection id="heaac_dec" name="HE AAC Decoding" level="plugin">
       <component id="ariheaacdecmmfcodec" name="Aricent HE AAC Decoding MMF Codec" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
+        <unit bldFile="/adapt/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
       </component>
     </collection>
     <collection id="mp3_dec" name="MP3 Decoding" level="plugin">
       <component id="arimp3decmmfcodec" name="Aricent MP3 Decoding MMF Codec" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
+        <unit bldFile="/adapt/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
       </component>
     </collection>
     <collection id="mp4asp_dec" name="MP4 ASP Decoding" level="plugin">
       <component id="arimpeg4aspdechwdevice" name="Aricent MP4 ASP Decoding Hardware Device" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
+        <unit bldFile="/adapt/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
       </component>
     </collection>
     <collection id="mp4sp_enc" name="MP4 SP Encoding" level="plugin">
       <component id="arimp4spenchwdevice" name="MP4 SP Encoding Hardware Device" introduced="^4" filter="sf_build" class="plugin" target="device" purpose="optional">
-        <unit bldFile="/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
+        <unit bldFile="/adapt/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
       </component>
     </collection>
   </package>
@@ -195,15 +195,15 @@
 
     <collection id="omxilcomp" name="OpenMAX IL Components" level="adaptation">
          <component id="omxilgeneric" name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" class="plugin" target="device">
-        <unit bldFile="/adaptation/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
+        <unit bldFile="/adapt/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
       </component>
 
           <component id="omxilaudioemulator" name="OpenMAX IL Audio Emulator" introduced="^3" purpose="optional" class="plugin" target="device">
-        <unit bldFile="/adaptation/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
+        <unit bldFile="/adapt/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
       </component>
 
           <component id="omxiltestcomp" name="OpenMAX IL Test Components" introduced="^3" purpose="development" class="plugin" target="device">
-        <unit bldFile="/adaptation/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
+        <unit bldFile="/adapt/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
       </component>
     </collection>
 
@@ -609,7 +609,7 @@
     <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
    </component>
    <component id="ofdbus_rom" name="D-Bus ROM" filter="s60" target="device" purpose="optional">
-    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
     <unit bldFile="/os/ossrv/ofdbus/group"/>
    </component>
@@ -2262,7 +2262,7 @@
     <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
    </component>
    <component id="effectspresets_utils" name="Effects Presets Utils" filter="s60" target="device" purpose="optional">
-    <!-- need to #include the lot from a single bld.inf
+    <!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
     <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
     <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -3762,9 +3762,9 @@
     <unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
    </component>
    <component id="supl_pos_message_plugin_api" name="SUPL POS Message Plugin API" filter="s60" class="api" target="device" purpose="optional">
-	<!-- placeholder
-    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+	<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
 	 -->
    </component>
    <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" filter="s60" class="api" target="device" purpose="optional">
@@ -6378,7 +6378,7 @@
   </collection>
   <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
    <component id="mmappcomponents_build" name="Multimedia App Components Build" introduced="^1" filter="s60" target="device" purpose="optional">
-    <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+    <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
     <unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
    </component>
@@ -7724,15 +7724,15 @@
   <collection id="controlpanel" name="Control Panel" level="generic">
     
    <component id="controlpanel_rom" name="Control Panel ROM" filter="s60" target="device" purpose="optional">
-      <!-- Need to create a real .pro file for this 
+      <!-- Need to create a real .pro file for this 
 	  <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
    </component>
    <component id="controlpanel_config" name="Control Panel Config" introduced="^4" filter="s60" class="config" target="device" purpose="optional">
-      <!-- Need to create a real .pro file for this 
+      <!-- Need to create a real .pro file for this 
 	  <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
    </component>
    <component id="controlpanel_source" name="Control Panel Source" filter="s60" target="device" purpose="optional">
-      <!-- Uncomment when controlpanel_build is removed
+      <!-- Uncomment when controlpanel_build is removed
 	  <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
    </component>
    <component id="controlpanel_build" name="Control Panel Build" filter="s60" target="device" purpose="optional">
@@ -8265,7 +8265,7 @@
     <unit bldFile="/mw/web/codhandler/roapapp/group"/>
    </component>
    <component id="codhandler_build" name="COD Handler Build" filter="s60" target="device" purpose="optional">
-    <!-- Exports need to go into another component or make this self-contained.
+    <!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
     <unit bldFile="/mw/web/codhandler/group"/>
    </component>
@@ -9210,14 +9210,14 @@
     <collection id="calendarwidgetinstaller" name="Calendar Widget Installer" level="build">
 		<!-- collection is really a component, need to move down a directory -->
      <component id="calendarwidgetinstaller_build" name="Calendar Widget Installer Build" introduced="^4" filter="dfs_build" target="device" purpose="optional">
-      <!--  built by calendarwidget_rom
+      <!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
      </component>
     </collection>
     <collection id="calendarwidgetplugin" name="Calendar Widget Plugin" level="app">
 		<!-- collection is really a component, need to move down a directory -->
      <component id="calendarwidgetplugin_build" name="Calendar Widget Plugin Build" introduced="^4" filter="dfs_build" class="plugin" target="device" purpose="optional">
-      <!--  built by calendarwidget_rom
+      <!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
      </component>
      <component id="calendarwidgetplugin_test" name="Calendar Widget Plugin Test" introduced="^4" filter="dfs_build" target="device" purpose="optional">
diff -r 43b28893dd71 -r cd43afbd6191 tip_pbc/single/sources.csv
--- a/tip_pbc/single/sources.csv	Wed Oct 13 17:34:06 2010 +0100
+++ b/tip_pbc/single/sources.csv	Fri Oct 15 14:33:14 2010 +0100
@@ -1,9 +1,9 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,NON-NOKIA
-http://developer.symbian.org/oss/FCL/sf/adaptation/openmaxil.nokia/,/sf/adaptation/openmaxil.nokia,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,modified-FCL
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,tag,tip_pbc,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,NON-NOKIA
+http://developer.symbian.org/oss/FCL/sf/adapt/openmaxil.nokia/,/sf/adapt/openmaxil.nokia,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,default,modified-FCL
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,tag,tip_pbc,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,tag,tip_pbc,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,tag,tip_pbc,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/calendarwidget/,/sf/app/calendarwidget,branch,default,layers.sysdef.xml