--- a/symbian2/single/sysdefs/system_model.xml	Tue Dec 01 16:14:10 2009 +0000
+++ b/symbian2/single/sysdefs/system_model.xml	Wed Dec 02 17:45:10 2009 +0000
@@ -18,11 +18,6 @@
       <unit bldFile="tools/homescreentools/themetool/group"/>
      </component>
     </collection>
-    <collection name="homescreentools_info" long-name="Home Screen Tools Info" level="install">
-     <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="foundation">
-      <unit bldFile="tools/homescreentools/group"/>
-     </component>
-    </collection>
    </block>
    <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
     <collection name="creator" long-name="Creator" level="app">
@@ -73,8 +68,20 @@
      </component>
     </collection>
     <collection name="htiui" long-name="HTI UI" level="generic">
-     <!-- Empty duplicate component HtiCommPlugins removed -->
-     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
+      <unit bldFile="tools/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
+     </component>
+     <component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
+      <!-- can only have a single unit. Should #include from a common bld.inf file -->
+      <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+      <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+      <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+      <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+      <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+      <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+      <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+      <unit bldFile="tools/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+     </component>
      <component name="htidevicereboot" long-name="HTI DeviceR eboot" origin-model="foundation">
       <unit bldFile="tools/rndtools/htiui/htidevicereboot/group"/>
      </component>
@@ -103,11 +110,6 @@
       <unit bldFile="tools/platformtools/gfxconversion/mifconv/group"/>
      </component>
     </collection>
-    <collection name="platformtools_info" long-name="Platform Tools Info">
-     <component unofficial="yes" name="platformtools_build" long-name="Platform Tools Build" origin-model="foundation">
-      <unit bldFile="tools/platformtools/group"/>
-     </component>
-    </collection>
    </block>
    <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
     <collection name="gid_pc_tool" long-name="GID PC Tool">
@@ -225,9 +227,6 @@
      </component>
     </collection>
     <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
-     <component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build" origin-model="foundation">
-      <unit bldFile="ostools/osrndtools/group"/>
-     </component>
     <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
       <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
      </component>
@@ -249,10 +248,10 @@
    </block>
   </layer>
   <layer name="adaptation" long-name="Adaptation">
-    <block name="syborg_adaptation" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
+    <block name="qemu" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
       <collection id="baseport" name="Baseport" level="hw-if"> 
         <component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
-          <unit bldFile="adaptation/QEMU/baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
+          <unit bldFile="adaptation/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
         </component>
       </collection>
     </block>