--- a/symbian4/os/osrndtools/package_definition.xml	Tue Oct 05 15:15:00 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Tue Oct 05 15:41:20 2010 +0100
@@ -1,40 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace analysis">
-  <collection id="memspy" name="MemSpy" level="trace">
-    <component id="memspy_plat" filter="s60" name="MemSpy Platform Interfaces" class="api" purpose="development">
-    <meta rel="Api" href="memspy/memspy_plat/memspy_api/memspy_api.metaxml"/>
-      <unit bldFile="memspy/memspy_plat/group"/>
-    </component>
-   <component id="driver" filter="s60" name="MemSpy Driver" purpose="development">
-    <unit bldFile="memspy/driver/group"/>
-   </component>
-   <component id="memspy_engine" filter="s60" name="MemSpy Engine" purpose="development">
-    <unit bldFile="memspy/engine/group"/>
-   </component>
-   <component id="commandline" filter="s60" name="MemSpy Command Line" purpose="development">
-    <unit bldFile="memspy/commandline/group"/>
-   </component>
-   <component id="memspyserver" filter="s60" name="MemSpy Server" purpose="development" introduced="^4">
-    <unit bldFile="memspy/MemSpyServer/group"/>
-   </component>
-   <component id="memspyclient" filter="s60" name="MemSpy Client" purpose="development" introduced="^4">
-    <unit bldFile="memspy/MemSpyClient/group"/>
-   </component>
-   <component id="memspy_build" filter="s60" name="MemSpy Build" purpose="development">
-    <!--  move exports into self-contained component.-->
-    <unit bldFile="memspy/group"/>
-   </component>
-  </collection>
-  <collection id="piprofiler" name="Performance Investigator Profiler" level="analysis">
-     <component id="piprofiler_build" name="Performance Investigator Profiler Build" introduced="^4">
-      <unit bldFile="piprofiler/group"/>
-     </component>
-  </collection>
-  <collection id="analyzetool" name="Analyze Tool" level="analysis">
-     <component id="analyzetool_build" name="Analyze Tool Build" introduced="^4">
-      <unit bldFile="analyzetool/group"/>
-     </component>
-  </collection>
- </package>
-</SystemDefinition>
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="osrndtools" name="OS R&amp;D Tools" levels="trace analysis">
+    <collection id="debugsrv" name="Debug Services" level="trace">
+      <component id="runmodedebug" filter="s60" name="Run Mode Debug" purpose="development">
+        <unit bldFile="debugsrv/runmodedebug/group"/>
+      </component>
+    </collection>
+    <collection id="perfsrv" name="Performance Services" level="analysis">
+      <component id="analyzetool" filter="s60" name="AnalyzeTool" purpose="development">
+        <unit bldFile="perfsrv/analyzetool/group"/>
+      </component>
+      <component id="memspy" filter="s60" name="MemSpy" purpose="development">
+        <unit bldFile="perfsrv/memspy/group"/>
+      </component>
+      <component id="piprofiler" filter="s60" name="Performance Investigator Profiler" purpose="development">
+        <unit bldFile="perfsrv/piprofiler/group"/>
+      </component>
+    </collection>
+    <collection id="tracefw" name="Trace Framework" level="trace">
+      <component id="tracecompiler" filter="s60" name="TraceCompiler" purpose="development">
+        <unit bldFile="tracefw/tracecompiler/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>