diff -r 5149853062ae -r 7975a56cd8c7 symbian4/os/osrndtools/package_definition.xml
--- a/symbian4/os/osrndtools/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,10 +50,10 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="os" long-name="OS" levels="hw services">
-   <block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace">
+   <block name="osrndtools" level="services" long-name="OS R&amp;D tools" levels="fw trace analysis">
 <collection name="stif" long-name="STIF" level="fw">
 <component name="stif_plat" filter="s60" long-name="STIF Platform Interfaces" purpose="development" class="api">
 <unit bldFile="/sf/os/osrndtools/stif/stif_plat/group"/>
@@ -95,31 +95,36 @@
 <unit bldFile="/sf/os/osrndtools/stif/suevent/group"/>
 </component>
 <component name="stifkerneltestclassbase" filter="s60" long-name="STIF Kernel Test Class Base" purpose="development">
-<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+<unit bldFile="/sf/os/osrndtools/stif/stifkerneltestclassbase/group"/>
 </component>
-<component name="stif_build" filter="s60" long-name="STIF Build" purpose="development">
-<!--  move exports into self-contained component. Remove this when configuration is in place-->
+<component name="stif_data" filter="s60" long-name="STIF Data" purpose="development" class="config">
+<!--  This is a component. Should move down a directory. or move into other STIF components-->
 <unit bldFile="/sf/os/osrndtools/stif/group"/>
 </component>
 </collection>
-<collection name="memspy" long-name="Memspy" level="trace">
-<component name="memspy_plat" filter="s60" long-name="Memspy Platform Interfaces" purpose="development" class="api">
+<collection name="memspy" long-name="MemSpy" level="trace">
+<component name="memspy_plat" filter="s60" long-name="MemSpy Platform Interfaces" purpose="development" class="api">
 <unit bldFile="/sf/os/osrndtools/memspy/memspy_plat/group"/>
 </component>
-<component name="driver" filter="s60" long-name="Memspy Driver" purpose="development">
+<component name="driver" filter="s60" long-name="MemSpy Driver" purpose="development">
 <unit bldFile="/sf/os/osrndtools/memspy/driver/group"/>
 </component>
-<component name="memspy_engine" filter="s60" long-name="Memspy Engine" purpose="development">
+<component name="memspy_engine" filter="s60" long-name="MemSpy Engine" purpose="development">
 <unit bldFile="/sf/os/osrndtools/memspy/engine/group"/>
 </component>
-<component name="commandline" filter="s60" long-name="Memspy Command Line" purpose="development">
+<component name="commandline" filter="s60" long-name="MemSpy Command Line" purpose="development">
 <unit bldFile="/sf/os/osrndtools/memspy/commandline/group"/>
 </component>
-<component name="console" filter="s60" long-name="Memspy Console" purpose="development">
+<component name="console" filter="s60" long-name="MemSpy Console" purpose="development">
 <unit bldFile="/sf/os/osrndtools/memspy/console/group"/>
 </component>
-<component name="memspy_build" filter="s60" long-name="Memspy Build" purpose="development">
+<component name="memspyserver" filter="s60" long-name="MemSpy Server" purpose="development" introduced="^4">
+<unit bldFile="/sf/os/osrndtools/memspy/MemSpyServer/group"/>
+</component>
+<component name="memspyclient" filter="s60" long-name="MemSpy Client" purpose="development" introduced="^4">
+<unit bldFile="/sf/os/osrndtools/memspy/MemSpyClient/group"/>
+</component>
+<component name="memspy_build" filter="s60" long-name="MemSpy Build" purpose="development">
 <!--  move exports into self-contained component.-->
 <unit bldFile="/sf/os/osrndtools/memspy/group"/>
 </component>
@@ -163,6 +168,16 @@
 <unit bldFile="/sf/os/osrndtools/hti/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">
+<unit bldFile="/sf/os/osrndtools/piprofiler/group"/>
+</component>
+</collection>
+<collection name="analyzetool" long-name="Analyze Tool" level="analysis">
+<component name="analyzetool_build" long-name="Analyze Tool Build" introduced="^4">
+<unit bldFile="/sf/os/osrndtools/analyzetool/group"/>
+</component>
+</collection>
 <collection name="osrndtools_info" long-name="OS R&amp;D tools Info" level="trace">
 <component name="osrndtools_metadata" long-name="OS R&amp;D tools Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="/sf/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>