diff -r 2d9cac8919d3 -r 392f7045e621 package_definition.xml
--- a/package_definition.xml	Mon Oct 18 16:30:05 2010 +0300
+++ b/package_definition.xml	Mon Oct 18 16:32:38 2010 +0300
@@ -1,5 +1,5 @@
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="rndtools" name="R&amp;D tools" levels="support generic test util">
+  <package id="rndtools" name="R&amp;D tools" levels="generic util">
     <collection id="perfapps" name="Performance Applications" level="generic">
 			<component id="memspyui" filter="s60" name="Memspy UI" purpose="development" target="device" class="tool">
 				<unit bldFile="perfapps/memspyui" qt:proFile="memspyui.pro" />
@@ -11,36 +11,23 @@
 				<unit bldFile="perfapps/piprofilerui" qt:proFile="piprofilerui.pro" />
 			</component>
 		</collection>
-    <collection id="creator" name="Creator" level="support">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
-        <unit bldFile="creator" qt:proFile="creator.pro"/>
+    <collection id="utilityapps" name="Utility Applications" level="util">	
+      <component id="creator" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
+        <unit bldFile="utilityapps/creator" qt:proFile="creator.pro"/>
       </component>
-    </collection>
-    <collection id="filebrowser" name="File Browser" level="util">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="filebrowser_build" filter="s60" name="File Browser Build" purpose="development" target="device" class="tool">
-        <unit bldFile="filebrowser" qt:proFile="filebrowser.pro" />
+      <component id="filebrowser" filter="s60" name="File Browser" purpose="development" target="device" class="tool">
+        <unit bldFile="utilityapps/filebrowser" qt:proFile="filebrowser.pro" />
       </component>
-    </collection>
-    <collection id="launcher" name="Launcher" level="util">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
-        <unit bldFile="launcher" qt:proFile="launcher.pro" />
+      <component id="launcher" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
+        <unit bldFile="utilityapps/launcher" qt:proFile="launcher.pro" />
       </component>
-    </collection>
-    <collection id="loadgen" name="Load Generator" level="test">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
-        <unit bldFile="loadgen" qt:proFile="loadgen.pro" />
-      </component>
-    </collection>
-    <collection id="screengrabber" name="Screen Grabber" level="util">
-	   	<!-- collection is really a component. Should move down a directory -->
-      <component id="screengrabber_build" filter="s60"  name="ScreenGrabber" purpose="development" target="device" class="tool">
-		    <unit bldFile="screengrabber" qt:proFile="screengrabber.pro"/>
-      </component>
-    </collection>
+      <component id="loadgen" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
+        <unit bldFile="utilityapps/loadgen" qt:proFile="loadgen.pro" />
+      </component>	
+      <component id="screengrabber" filter="s60"  name="ScreenGrabber" purpose="development" target="device" class="tool">
+		    <unit bldFile="utilityapps/screengrabber" qt:proFile="screengrabber.pro"/>
+      </component>    
+    </collection>    
     <collection id="debugapps" name="Debug Applications" level="generic">
 			<component id="appregexec" filter="s60" name="AppRegExec" purpose="development" target="device" class="tool">
 				<unit bldFile="debugapps/appregexec/group" />