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