diff --git a/plugins/sensors/acpi-battery b/plugins/battery/acpi-battery
similarity index 100%
rename from plugins/sensors/acpi-battery
rename to plugins/battery/acpi-battery
diff --git a/plugins/sensors/power/acpi_batt_ b/plugins/battery/acpi_batt_
similarity index 100%
rename from plugins/sensors/power/acpi_batt_
rename to plugins/battery/acpi_batt_
diff --git a/plugins/sensors/power/acpi_sys_batt_ b/plugins/battery/acpi_sys_batt_
similarity index 100%
rename from plugins/sensors/power/acpi_sys_batt_
rename to plugins/battery/acpi_sys_batt_
diff --git a/plugins/sensors/power/batteries b/plugins/battery/batteries
similarity index 100%
rename from plugins/sensors/power/batteries
rename to plugins/battery/batteries
diff --git a/plugins/sensors/battery_ b/plugins/battery/battery_
similarity index 100%
rename from plugins/sensors/battery_
rename to plugins/battery/battery_
diff --git a/plugins/sensors/hpasmcli2_ b/plugins/hp/hpasmcli2_
similarity index 100%
rename from plugins/sensors/hpasmcli2_
rename to plugins/hp/hpasmcli2_
diff --git a/plugins/snmp/snmp__hp_temp b/plugins/hp/snmp__hp_temp
similarity index 100%
rename from plugins/snmp/snmp__hp_temp
rename to plugins/hp/snmp__hp_temp
diff --git a/plugins/sensors/omreport_fan_speed b/plugins/omreport/omreport_fan_speed
similarity index 100%
rename from plugins/sensors/omreport_fan_speed
rename to plugins/omreport/omreport_fan_speed
diff --git a/plugins/sensors/omreport_pwrmon_current b/plugins/omreport/omreport_pwrmon_current
similarity index 100%
rename from plugins/sensors/omreport_pwrmon_current
rename to plugins/omreport/omreport_pwrmon_current
diff --git a/plugins/sensors/omreport_pwrmon_power b/plugins/omreport/omreport_pwrmon_power
similarity index 100%
rename from plugins/sensors/omreport_pwrmon_power
rename to plugins/omreport/omreport_pwrmon_power
diff --git a/plugins/sensors/omreport_storage_temp b/plugins/omreport/omreport_storage_temp
similarity index 100%
rename from plugins/sensors/omreport_storage_temp
rename to plugins/omreport/omreport_storage_temp
diff --git a/plugins/sensors/omreport_temp b/plugins/omreport/omreport_temp
similarity index 100%
rename from plugins/sensors/omreport_temp
rename to plugins/omreport/omreport_temp
diff --git a/plugins/sphinx/sphinx_connections b/plugins/sphinx/sphinx_connections
index 029a6db2..fbb84e54 100755
--- a/plugins/sphinx/sphinx_connections
+++ b/plugins/sphinx/sphinx_connections
@@ -23,10 +23,10 @@ if (isset($argc) && $argc > 1) {
     if ($argv[1] == 'config') {
         echo "graph_title Sphinx Connections in last 5 minutes\n" .
             "graph_info This graph shows the number of connections for last 5 minutes\n" .
-            "graph_category sphinx\n" .
+            "graph_category search\n" .
             "graph_args --base 1000 --lower-limit 0\n" .
             "graph_vlabel Connections\n" .
-            "graph_info The number of current connections with respect to the max_connections setting.graph_category sphinx\n" .
+            "graph_info The number of current connections with respect to the max_connections setting.graph_category search\n" .
             "graph_order current\n" .
             "graph_total Total\n" .
             "current.label In Use\n" .
diff --git a/plugins/sphinx/sphinx_documents b/plugins/sphinx/sphinx_documents
index 0e291c9d..9b73e15d 100755
--- a/plugins/sphinx/sphinx_documents
+++ b/plugins/sphinx/sphinx_documents
@@ -17,7 +17,7 @@ case $1 in
 graph_title Documents per index
 graph_vlabel number
 graph_scale no
-graph_category sphinx
+graph_category search
 graph_info Report number of documents (using indextool) by Sphinx Index.
 EOM
 for i in `ls $idxpath/*.sph`; do
diff --git a/plugins/sphinx/sphinx_queries b/plugins/sphinx/sphinx_queries
index 7a9d9527..57db16e2 100755
--- a/plugins/sphinx/sphinx_queries
+++ b/plugins/sphinx/sphinx_queries
@@ -23,7 +23,7 @@ if (isset($argc) && $argc > 1) {
     if ($argv[1] == 'config') {
         echo "graph_title Sphinx Queries in last 5 minutes\n" .
             "graph_info This graph shows the number of queries for last 5 minutes\n" .
-            "graph_category sphinx\n" .
+            "graph_category search\n" .
             "graph_args --base 1000 --lower-limit 0\n" .
             "graph_vlabel Connections\n" .
             "graph_info The number of current queries\n" .
diff --git a/plugins/streaming/shoutcast b/plugins/streaming/shoutcast
index 4949d63f..386bf225 100755
--- a/plugins/streaming/shoutcast
+++ b/plugins/streaming/shoutcast
@@ -68,7 +68,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
     # Default Settings
     print "graph_title SHOUTcast Online\n";
     print "graph_args --base 1000\n";
-    print "graph_category shoutcast\n";
+    print "graph_category streaming\n";
     print "graph_vlabel Connections per \${graph_period}\n";
 
     # Max Listeners Allowed to Connect to Server
diff --git a/plugins/unicorn/unicorn_ b/plugins/unicorn/unicorn_
index 193a23be..b8f772a3 100644
--- a/plugins/unicorn/unicorn_
+++ b/plugins/unicorn/unicorn_
@@ -21,7 +21,7 @@ if [ "$mode" = "memory" ]; then
         if [ "$1" = "config" ]; then
                 echo "graph_title Total Unicorn Memory"
                 echo "graph_vlabel Total RAM"
-                echo "graph_category Unicorn"
+                echo "graph_category webserver"
                 echo "graph_args --base 1024"
                 echo "ram.label Total RAM"
                 exit 0
@@ -42,7 +42,7 @@ elif [ "$mode" = "processes" ]; then
         if [ "$1" = "config" ]; then
                 echo "graph_title Unicorn Processes"
                 echo "graph_vlabel Processes"
-                echo "graph_category Unicorn"
+                echo "graph_category webserver"
                 echo "processes.label active processes"
         else
                 echo -n "processes.value "
@@ -55,7 +55,7 @@ elif [ "$mode" = "average" ]; then
         echo 'graph_title Unicorn Average Process Size'
         echo 'graph_args --base 1024 -l 0 '
         echo 'graph_vlabel Average Process Size'
-        echo 'graph_category Unicorn'
+        echo 'graph_category webserver'
         echo 'unicorn_average.label Average Process Size'
         echo 'unicorn_average.draw LINE2'
         echo 'unicorn_average.info The average process size for Unicorn'
diff --git a/plugins/unicorn/unicorn_memory_status b/plugins/unicorn/unicorn_memory_status
index 7e5e4dd1..a11aa2bf 100755
--- a/plugins/unicorn/unicorn_memory_status
+++ b/plugins/unicorn/unicorn_memory_status
@@ -74,7 +74,7 @@ when "config"
   puts "graph_title Unicorn [#{File.basename(__FILE__).gsub(/^unicorn_memory_status_/, '')}] - Memory usage"
   puts "graph_args --base 1024 -l 0"
   puts "graph_vlabel bytes"
-  puts "graph_category Unicorn"
+  puts "graph_category webserver"
   puts "total_memory.label total_memory"
   puts "total_memory.draw LINE2"
 else
diff --git a/plugins/unicorn/unicorn_status b/plugins/unicorn/unicorn_status
index 2088d4b7..3422f992 100755
--- a/plugins/unicorn/unicorn_status
+++ b/plugins/unicorn/unicorn_status
@@ -72,7 +72,7 @@ when "config"
   puts "graph_title Unicorn [#{File.basename(__FILE__).gsub(/^unicorn_status_/, '')}] - Status"
   puts "graph_args -l 0"
   puts "graph_vlabel number of workers"
-  puts "graph_category Unicorn"
+  puts "graph_category webserver"
   puts "total_worker.label total_workers"
   puts "idle_worker.label idle_workers"
 else
diff --git a/plugins/zope/zeomonitor b/plugins/zope/zeomonitor
index 4994a51b..21c1f5fe 100755
--- a/plugins/zope/zeomonitor
+++ b/plugins/zope/zeomonitor
@@ -17,7 +17,7 @@ def config(data):
     print "graph_args -l 0"
     print "graph_vlabel n"
     print "graph_period minute"
-    print "graph_category ZEO"
+    print "graph_category webserver"
 
 def get_data():
     import sys