--- a/layers.sysdef.xml	Thu Aug 19 10:13:44 2010 +0300
+++ b/layers.sysdef.xml	Tue Aug 31 15:30:51 2010 +0300
@@ -1,32 +1,28 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
   <!ENTITY layer_real_source_path "sf/mw/homescreensrv" >
 ]>
 
-<SystemDefinition name="homescreensrv" schema="1.4.0">
+<SystemDefinition name="homescreensrv" schema="1.5.1">
   <systemModel>
-  
-    <layer name="mw_layer">
-      <module name="homescreensrv">
-        <unit unitID="hs.homescreensrv" mrp="" bldFile="&layer_real_source_path;/group" name="homescreensrv" />
+
+    <layer name="tools_layer">
+      <module name="homescreensrvconf">
+        <unit name="homescreensrvconf" unitID="hs.homescreensrvconf" mrp="" bldFile="&layer_real_source_path;/group"/>
       </module>
     </layer>
-		<layer name="api_test_layer">
-  		<module name="homescreensrv_api_tests">
-  			<unit unitID="hsdo.content_harvester.test" name="content_harvester.test" bldFile="&layer_real_source_path;/homescreensrv_plat/content_harvester_plugin_api/tsrc/group" mrp="" />
-  			<unit unitID="hsdo.menu_content_service.test" name="menu_content_service.test" bldFile="&layer_real_source_path;/homescreensrv_plat/menu_content_service_api/tsrc/group" mrp="" />
-  			<unit unitID="hsdo.action_handler_plugin_api.test" name="action_handler_plugin_api.test" bldFile="&layer_real_source_path;/homescreensrv_plat/action_handler_plugin_api/tsrc/group" mrp="" />
-  			<unit unitID="hsdo.menu_sat_interface_api.test" name="menu_sat_interface_api.test" bldFile="&layer_real_source_path;/homescreensrv_plat/menu_sat_interface_api/tsrc/group" mrp="" />
-  			<unit unitID="hsdo.sapi_homescreenplugin.test" name="sapi_homescreenplugin.test" bldFile="&layer_real_source_path;/homescreensrv_plat/sapi_homescreenplugin/tsrc/group" mrp="" />
-			</module>
-		</layer>
-		
+    
+    <layer name="mw_layer">
+      <module name="homescreensrv">
+        <unit unitID="hs.homescreensrv" mrp="" bldFile="&layer_real_source_path;" name="homescreensrv" proFile="homescreensrv.pro" qmakeArgs="-r"/>
+      </module>
+    </layer>
+
     <layer name="unit_test_layer">
-      <module name="homescreensrv_unit_tests">
-  			<unit unitID="hsdo.idlefw.test" name="idlefw.test" bldFile="&layer_real_source_path;/idlefw/Internal/tsrc/group" mrp="" />
+      <module name="hs_unit_test">
+        <unit unitID="hsdo.hs_unit_test" name="hs_unit_test" bldFile="&layer_real_source_path;/tsrc" mrp="" proFile="tsrc.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
       </module>
-    </layer>		
-		
+    </layer>
 
   </systemModel>
 </SystemDefinition>