--- a/symbian3/single/sources_fcl.csv	Tue Mar 02 20:08:17 2010 +0000
+++ b/symbian3/single/sources_fcl.csv	Wed Mar 03 13:36:36 2010 +0000
@@ -115,6 +115,6 @@
 http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,RCL_3,layers.sysdef.xml

--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Tue Mar 02 20:08:17 2010 +0000
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Wed Mar 03 13:36:36 2010 +0000
@@ -6970,6 +6970,9 @@
      <component id="email_plat" filter="s60" class="api" name="Email Apps Platform Interfaces">
       <unit bldFile="/app/commonemail/email_plat/group"/>
      </component>
+     <component id="email_pub" filter="s60" class="api" name="Email Apps Public Interfaces">
+      <unit bldFile="/app/commonemail/email_pub/group"/>
+     </component>
     </collection>
    </package>
    <package id="conversations" level="apps" tech-domain="pr" name="Conversation Apps" levels="settings utils plugin ui">
@@ -7863,26 +7866,21 @@
      <!-- collection is really a component. Needs to be moved down a directory -->
      <!-- this needs to be built first, does build order need to be forced with filters? -->
      <component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
-      <unit bldFile="/tools/homescreentools/dtdinstaller/group"/>
+      <unit bldFile="/app/homescreentools/dtdinstaller/group"/>
      </component>
     </collection>
     <collection id="themeinstaller" name="Theme Installer" level="install">
      <!-- collection is really a component. Needs to be moved down a directory -->
      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
-      <unit bldFile="/tools/homescreentools/themeinstaller/group"/>
+      <unit bldFile="/app/homescreentools/themeinstaller/group"/>
      </component>
     </collection>
     <collection id="widgettools" name="Widget Tools" level="install">
      <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
-      <unit bldFile="/tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
+      <unit bldFile="/app/homescreentools/widgettools/hspluginspreinstaller/group"/>
      </component>
      <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
-      <unit bldFile="/tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-     </component>
-    </collection>
-    <collection id="themetool" name="Theme Tool" level="tool">
-     <component id="themetool_build" filter="s60" name="Theme Tool Build" target="desktop" class="tool">
-      <unit bldFile="/tools/homescreentools/themetool/group"/>
+      <unit bldFile="/app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
      </component>
     </collection>
    </package>

--- a/symbian3/single/sysdefs/system_model.xml	Tue Mar 02 20:08:17 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Wed Mar 03 13:36:36 2010 +0000
@@ -6467,6 +6467,9 @@
      <component name="email_plat" filter="s60" long-name="Email Apps Platform Interfaces" class="api">
       <unit bldFile="app/commonemail/email_plat/group"/>
      </component>
+     <component name="email_pub" filter="s60" long-name="Email Apps Public Interfaces" class="api">
+      <unit bldFile="app/commonemail/email_pub/group"/>
+     </component>
     </collection>
    </block>
    <block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
@@ -7283,26 +7286,21 @@
      <!-- collection is really a component. Needs to be moved down a directory -->
      <!-- this needs to be built first, does build order need to be forced with filters? -->
      <component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-      <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
+      <unit bldFile="app/homescreentools/dtdinstaller/group"/>
      </component>
     </collection>
     <collection name="themeinstaller" long-name="Theme Installer" level="install">
      <!-- collection is really a component. Needs to be moved down a directory -->
      <component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-      <unit bldFile="tools/homescreentools/themeinstaller/group"/>
+      <unit bldFile="app/homescreentools/themeinstaller/group"/>
      </component>
     </collection>
     <collection name="widgettools" long-name="Widget Tools" level="install">
      <component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-      <unit bldFile="tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
+      <unit bldFile="app/homescreentools/widgettools/hspluginspreinstaller/group"/>
      </component>
      <component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-      <unit bldFile="tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-     </component>
-    </collection>
-    <collection name="themetool" long-name="Theme Tool" level="tool">
-     <component name="themetool_build" filter="s60" long-name="Theme Tool Build" class="tool PC">
-      <unit bldFile="tools/homescreentools/themetool/group"/>
+      <unit bldFile="app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
      </component>
     </collection>
    </block>

--- a/symbian3/single/sysdefs/system_model_3.0.xml	Tue Mar 02 20:08:17 2010 +0000
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Wed Mar 03 13:36:36 2010 +0000
@@ -6627,6 +6627,9 @@
      <component id="email_plat" filter="s60" class="api" name="Email Apps Platform Interfaces">
       <unit bldFile="/app/commonemail/email_plat/group"/>
      </component>
+     <component id="email_pub" filter="s60" class="api" name="Email Apps Public Interfaces">
+      <unit bldFile="/app/commonemail/email_pub/group"/>
+     </component>
     </collection>
    </package>
    <package id="conversations" level="apps" tech-domain="pr" name="Conversation Apps" levels="settings utils plugin ui">
@@ -7478,26 +7481,21 @@
      <!-- collection is really a component. Needs to be moved down a directory -->
      <!-- this needs to be built first, does build order need to be forced with filters? -->
      <component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
-      <unit bldFile="/tools/homescreentools/dtdinstaller/group"/>
+      <unit bldFile="/app/homescreentools/dtdinstaller/group"/>
      </component>
     </collection>
     <collection id="themeinstaller" name="Theme Installer" level="install">
      <!-- collection is really a component. Needs to be moved down a directory -->
      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
-      <unit bldFile="/tools/homescreentools/themeinstaller/group"/>
+      <unit bldFile="/app/homescreentools/themeinstaller/group"/>
      </component>
     </collection>
     <collection id="widgettools" name="Widget Tools" level="install">
      <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
-      <unit bldFile="/tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
+      <unit bldFile="/app/homescreentools/widgettools/hspluginspreinstaller/group"/>
      </component>
      <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
-      <unit bldFile="/tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-     </component>
-    </collection>
-    <collection id="themetool" name="Theme Tool" level="tool">
-     <component id="themetool_build" filter="s60" name="Theme Tool Build" target="desktop" class="tool">
-      <unit bldFile="/tools/homescreentools/themetool/group"/>
+      <unit bldFile="/app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
      </component>
     </collection>
    </package>