diff -r 96f7513ad2d7 -r fc38b048ab2f foundation_system/system_model/system_definition.xml
--- a/foundation_system/system_model/system_definition.xml	Fri Apr 16 16:15:22 2010 +0300
+++ b/foundation_system/system_model/system_definition.xml	Mon May 03 13:39:39 2010 +0300
@@ -99,7 +99,7 @@
 	"root" attribute will usually be inserted by tools when merging models, although it can be set manually-->
 ]>
 <SystemDefinition schema="3.0.0">
-  <systemModel name="Symbian^3">
+  <systemModel name="Symbian^4">
     <layer id="os" name="OS" levels="hw services">
       <package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition.xml"/>
       <package id="boardsupport" level="hw" tech-domain="hb" href="../../../../os/boardsupport/package_definition.xml"/>
@@ -107,7 +107,7 @@
       <package id="ossrv" level="services" tech-domain="hb" href="../../../../os/ossrv/package_definition.xml"/>
       <package id="security" level="services" tech-domain="se" href="../../../../os/security/package_definition.xml"/>
       <package id="persistentdata" level="services" tech-domain="hb" href="../../../../os/persistentdata/package_definition.xml"/>
-      <package id="devicesrv" level="services" tech-domain="hb" href="../../../../os/devicesrv/package_definition.xml"/>
+      <package id="devicesrv" level="services" tech-domain="hb" href="../../../../os/devicesrv/package_definition_v2.xml"/>
       <package id="lbs" level="services" tech-domain="lo" href="../../../../os/lbs/package_definition.xml"/>
       <package id="commsfw" level="services" tech-domain="dc" href="../../../../os/commsfw/package_definition.xml"/>
       <package id="networkingsrv" level="services" tech-domain="dc" href="../../../../os/networkingsrv/package_definition.xml"/>
@@ -117,7 +117,7 @@
       <package id="usb" level="services" tech-domain="de" href="../../../../os/usb/package_definition.xml"/> 
       <package id="mm" level="services" tech-domain="mm" href="../../../../os/mm/package_definition.xml"/>
       <package id="imagingext" level="services" tech-domain="mm" href="../../../../os/imagingext/package_definition.xml"/>
-      <package id="graphics" level="services" tech-domain="ui" href="../../../../os/graphics/package_definition.xml"/>
+      <package id="graphics" level="services" tech-domain="ui" href="../../../../os/graphics/package_definition_v2.xml"/>
       <package id="textandloc" level="services" tech-domain="ui" href="../../../../os/textandloc/package_definition.xml"/>
       <package id="xmlsrv" level="services" tech-domain="rt" href="../../../../os/xmlsrv/package_definition.xml"/>
       <package id="deviceplatformrelease" level="services" tech-domain="to" href="../../../../os/deviceplatformrelease/package_definition.xml"/>
@@ -165,7 +165,7 @@
       <package id="hapticsservices" level="generic" tech-domain="ui" href="../../../../mw/hapticsservices/package_definition.xml"/>
       <package id="gsprofilesrv" level="generic" tech-domain="ui" href="../../../../mw/gsprofilesrv/package_definition.xml"/>
       <package id="homescreensrv" level="specific" tech-domain="ui" href="../../../../mw/homescreensrv/package_definition.xml"/>
-      <package id="appinstall" level="generic" tech-domain="rt" href="../../../../mw/appinstall/package_definition.xml"/>
+      <package id="appinstall" level="generic" tech-domain="rt" href="../../../../mw/appinstall/package_definition_v2.xml"/>
       <package id="serviceapifw" level="specific" tech-domain="rt" href="../../../../mw/serviceapifw/package_definition.xml"/>
       <package id="serviceapi" level="specific" tech-domain="rt" href="../../../../mw/serviceapi/package_definition.xml"/>
       <package id="web" level="specific" tech-domain="rt" href="../../../../mw/web/package_definition.xml"/>
@@ -188,7 +188,7 @@
       <package id="contacts" level="apps" span="2" tech-domain="pr" href="../../../../app/contacts/package_definition.xml"/>
       <package id="organizer" level="apps" span="2" tech-domain="pr" href="../../../../app/organizer/package_definition.xml"/>
       <package id="messaging" level="apps" span="2" tech-domain="pr" href="../../../../app/messaging/package_definition.xml"/>
-      <package id="commonemail" level="apps" tech-domain="pr" href="../../../../app/commonemail/package_definition.xml"/>
+      <package id="commonemail" level="apps" span="2" tech-domain="pr" href="../../../../app/commonemail/package_definition.xml"/>
       <package id="conversations" level="apps" tech-domain="pr" href="../../../../app/conversations/package_definition.xml"/>
       <package id="im" level="apps" tech-domain="pr" href="../../../../app/im/package_definition.xml"/>
       <package id="utils" level="apps" tech-domain="pr" href="../../../../app/utils/package_definition.xml"/>
@@ -215,7 +215,7 @@
       <package id="conntools" level="services" tech-domain="dc" href="../../../../app/conntools/package_definition.xml"/>
       <package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition.xml"/>
       <package id="helps" level="apps" span="2" tech-domain="ui" href="../../../../app/helps/package_definition.xml"/>
-      <package id="techview" level="apps" span="2" tech-domain="ui" href="../../../../app/techview/package_definition.xml"/>
+      <package id="techview" level="apps" span="2" tech-domain="ui" href="../../../../app/techview/package_definition_v2.xml"/>
     </layer>
   </systemModel>
 </SystemDefinition>