--- 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>