--- a/layers.sysdef.xml	Fri Aug 27 11:37:29 2010 +0300
+++ b/layers.sysdef.xml	Mon Sep 06 15:00:47 2010 +0300
@@ -7,15 +7,21 @@
   <systemModel>
     <layer name="os_layer">
       <module name="osrndtools">
-      	<component name="osrndtools">
-        	<unit unitID="tools.osrndtools" mrp="" bldFile="&layer_real_source_path;/group" name="osrndtools" />
-        </component>
         <component name="tracecompiler">
           <unit unitID="tools.tracecompiler" mrp="" bldFile="&layer_real_source_path;/tracefw/tracecompiler/group" name="tracecompiler" />
         </component>
         <component name="runmodedebug">
           <unit unitID="tools.runmodedebug" mrp="" bldFile="&layer_real_source_path;/debugsrv/runmodedebug/group" name="runmodedebug" />
-        </component>        
+        </component>       
+        <component name="piprofiler">
+          <unit unitID="tools.piprofiler" mrp="" bldFile="&layer_real_source_path;/perfsrv/piprofiler/group" name="piprofiler" />
+        </component>   
+        <component name="memspy">
+          <unit unitID="tools.memspy" mrp="" bldFile="&layer_real_source_path;/perfsrv/memspy/group" name="memspy" />
+        </component>   
+        <component name="analyzetool">
+          <unit unitID="tools.analyzetool" mrp="" bldFile="&layer_real_source_path;/perfsrv/analyzetool/group" name="analyzetool" />
+        </component>    
       </module>
     </layer>
   </systemModel>