--- a/symbian4/os/osrndtools/package_definition.xml	Mon Oct 04 18:03:42 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Tue Oct 05 18:03:43 2010 +0100
@@ -53,39 +53,26 @@
 <SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
-   <block name="osrndtools" level="services" levels="fw trace analysis" long-name="OS R&amp;D tools">
-<collection name="memspy" long-name="MemSpy" level="trace">
-<component name="memspy_plat" long-name="MemSpy Platform Interfaces" filter="s60" purpose="development" class="api">
-<unit bldFile="/sf/os/osrndtools/memspy/memspy_plat/group"/>
-</component>
-<component name="driver" long-name="MemSpy Driver" filter="s60" purpose="development">
-<unit bldFile="/sf/os/osrndtools/memspy/driver/group"/>
-</component>
-<component name="memspy_engine" long-name="MemSpy Engine" filter="s60" purpose="development">
-<unit bldFile="/sf/os/osrndtools/memspy/engine/group"/>
-</component>
-<component name="commandline" long-name="MemSpy Command Line" filter="s60" purpose="development">
-<unit bldFile="/sf/os/osrndtools/memspy/commandline/group"/>
-</component>
-<component name="memspyserver" long-name="MemSpy Server" introduced="^4" filter="s60" purpose="development">
-<unit bldFile="/sf/os/osrndtools/memspy/MemSpyServer/group"/>
-</component>
-<component name="memspyclient" long-name="MemSpy Client" introduced="^4" filter="s60" purpose="development">
-<unit bldFile="/sf/os/osrndtools/memspy/MemSpyClient/group"/>
-</component>
-<component name="memspy_build" long-name="MemSpy Build" filter="s60" purpose="development">
-<!--  move exports into self-contained component.-->
-<unit bldFile="/sf/os/osrndtools/memspy/group"/>
+   <block name="osrndtools" level="services" levels="trace analysis" long-name="OS R&amp;D Tools">
+<collection name="debugsrv" long-name="Debug Services" level="trace">
+<component name="runmodedebug" long-name="Run Mode Debug" filter="s60" purpose="development">
+<unit bldFile="/sf/os/osrndtools/debugsrv/runmodedebug/group"/>
 </component>
 </collection>
-<collection name="piprofiler" long-name="Performance Investigator Profiler" level="analysis">
-<component name="piprofiler_build" long-name="Performance Investigator Profiler Build" introduced="^4" purpose="optional">
-<unit bldFile="/sf/os/osrndtools/piprofiler/group"/>
+<collection name="perfsrv" long-name="Performance Services" level="analysis">
+<component name="analyzetool" long-name="AnalyzeTool" filter="s60" purpose="development">
+<unit bldFile="/sf/os/osrndtools/perfsrv/analyzetool/group"/>
+</component>
+<component name="memspy" long-name="MemSpy" filter="s60" purpose="development">
+<unit bldFile="/sf/os/osrndtools/perfsrv/memspy/group"/>
+</component>
+<component name="piprofiler" long-name="Performance Investigator Profiler" filter="s60" purpose="development">
+<unit bldFile="/sf/os/osrndtools/perfsrv/piprofiler/group"/>
 </component>
 </collection>
-<collection name="analyzetool" long-name="Analyze Tool" level="analysis">
-<component name="analyzetool_build" long-name="Analyze Tool Build" introduced="^4" purpose="optional">
-<unit bldFile="/sf/os/osrndtools/analyzetool/group"/>
+<collection name="tracefw" long-name="Trace Framework" level="trace">
+<component name="tracecompiler" long-name="TraceCompiler" filter="s60" purpose="development">
+<unit bldFile="/sf/os/osrndtools/tracefw/tracecompiler/group"/>
 </component>
 </collection>
 </block>