diff --git a/plugins/games/b3error_ b/plugins/bigbrother/b3error_
similarity index 100%
rename from plugins/games/b3error_
rename to plugins/bigbrother/b3error_
diff --git a/plugins/java/jstat__gccount b/plugins/jvm/jstat__gccount
similarity index 99%
rename from plugins/java/jstat__gccount
rename to plugins/jvm/jstat__gccount
index 6c6a4292..165b4118 100755
--- a/plugins/java/jstat__gccount
+++ b/plugins/jvm/jstat__gccount
@@ -86,7 +86,7 @@ config_common()
   echo 'graph_vlabel GC Count(times)'
   echo 'graph_total total'
   echo 'graph_info GC Count'
-  echo 'graph_category java'
+  echo 'graph_category virtualization'
 }
 
 config_sun_jdk()
diff --git a/plugins/java/jstat__gctime b/plugins/jvm/jstat__gctime
similarity index 98%
rename from plugins/java/jstat__gctime
rename to plugins/jvm/jstat__gctime
index 1d2e4c6a..d3f8e8ff 100755
--- a/plugins/java/jstat__gctime
+++ b/plugins/jvm/jstat__gctime
@@ -86,7 +86,7 @@ config_common()
         echo 'graph_vlabel GC Time(sec)'
         echo 'graph_total total'
         echo 'graph_info GC Time'
-        echo 'graph_category java'
+        echo 'graph_category virtualization'
 }
 
 config_sun_jdk()
diff --git a/plugins/java/jstat__heap b/plugins/jvm/jstat__heap
similarity index 99%
rename from plugins/java/jstat__heap
rename to plugins/jvm/jstat__heap
index 870e94fd..de830218 100755
--- a/plugins/java/jstat__heap
+++ b/plugins/jvm/jstat__heap
@@ -85,7 +85,7 @@ config_common()
   echo "graph_args --base 1024 -l 0"
   echo "graph_vlabel Heap Usage(Bytes)"
   echo "graph_info Heap Usage"
-  echo "graph_category java"
+  echo "graph_category virtualization"
 }
 
 config_sun_jdk()
diff --git a/plugins/java/jvm_sun_memory b/plugins/jvm/jvm_sun_memory
similarity index 99%
rename from plugins/java/jvm_sun_memory
rename to plugins/jvm/jvm_sun_memory
index 506aea93..c622e1dc 100755
--- a/plugins/java/jvm_sun_memory
+++ b/plugins/jvm/jvm_sun_memory
@@ -82,7 +82,7 @@ my $record='';
 if ( $ARGV[0] and $ARGV[0] eq "config" ) {
   print "graph_title $title\n";
   print "graph_vlabel Bytes Memory\n";
-  print "graph_category Java\n";
+  print "graph_category virtualization\n";
   print "graph_args --lower-limit 0\n";
   print "graph_info Show heap memory usage of JVM\n";
   print "graph_order defnew_max tenured_max tenured_start tenured_end defnew_start defnew_end totalheap totalheapmax\n";
diff --git a/plugins/java/jvm_sun_minorgcs b/plugins/jvm/jvm_sun_minorgcs
similarity index 98%
rename from plugins/java/jvm_sun_minorgcs
rename to plugins/jvm/jvm_sun_minorgcs
index 88225609..50b43aad 100755
--- a/plugins/java/jvm_sun_minorgcs
+++ b/plugins/jvm/jvm_sun_minorgcs
@@ -51,7 +51,7 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
     print "graph_title $grtitle minor GCs pr minute\n";
     print "graph_args --base 1000 -l 0 --rigid\n";
     print "graph_scale no\n";
-    print "graph_category Java\n";
+    print "graph_category virtualization\n";
     print "graph_period minute\n";
     print "gcs.label Number of GCs\n";
     print "gcs.type DERIVE\n";
diff --git a/plugins/java/jvm_sun_tenuredgcs b/plugins/jvm/jvm_sun_tenuredgcs
similarity index 98%
rename from plugins/java/jvm_sun_tenuredgcs
rename to plugins/jvm/jvm_sun_tenuredgcs
index f061fd76..9ea42e71 100755
--- a/plugins/java/jvm_sun_tenuredgcs
+++ b/plugins/jvm/jvm_sun_tenuredgcs
@@ -51,7 +51,7 @@ my %elements;
 if ( $ARGV[0] and $ARGV[0] eq "config" ) {
   print "graph_title $grtitle tenured GCs pr minute\n";
   print "graph_period minute\n";
-  print "graph_category Java\n";
+  print "graph_category virtualization\n";
   print "graph_args --lower-limit 0\n";
   print "graph_info $info\n";
   print "activity.label Number of GCs\n";
diff --git a/plugins/games/qstat b/plugins/quake/qstat
similarity index 100%
rename from plugins/games/qstat
rename to plugins/quake/qstat
diff --git a/plugins/games/qstatet_ b/plugins/quake/qstatet_
similarity index 100%
rename from plugins/games/qstatet_
rename to plugins/quake/qstatet_
diff --git a/plugins/games/qstatqw_ b/plugins/quake/qstatqw_
similarity index 100%
rename from plugins/games/qstatqw_
rename to plugins/quake/qstatqw_
diff --git a/plugins/wuala/wuala_stats b/plugins/wuala/wuala_stats
index 4989246a..bab9827c 100755
--- a/plugins/wuala/wuala_stats
+++ b/plugins/wuala/wuala_stats
@@ -50,7 +50,7 @@ if ($ARGV[0] and $ARGV[0] eq "autoconf")
 	} elsif($0 =~ /.*_storage/) {
 		print "graph_args --base 1024 -l 0 --vertical-label GB\n";
 		print "graph_title Wuala Storage\n";
-		print "graph_category wuala\n";
+		print "graph_category backup\n";
 		print "graph_info This graph shows several storage related statistics of Wua.la.\n";
 		print "limit.label Local Storage Limit\n";
 		print "limit.draw LINE2\n";