diff --git a/plugins/other/freeradius b/plugins/freeradius/freeradius
similarity index 98%
rename from plugins/other/freeradius
rename to plugins/freeradius/freeradius
index bfc94470..ae5e3016 100755
--- a/plugins/other/freeradius
+++ b/plugins/freeradius/freeradius
@@ -46,7 +46,7 @@ if [ "$1" = "config" ]; then
                 echo 'graph_period '${graph_period}
         fi
         echo 'graph_vlabel requests / ${graph_period}'
-        echo 'graph_category Other'
+        echo 'graph_category auth'
 
         echo 'requests.label Authentication requests'
         echo 'requests.info freeRADIUS authentication requests'
diff --git a/plugins/other/freeradius_queue b/plugins/freeradius/freeradius_queue
similarity index 98%
rename from plugins/other/freeradius_queue
rename to plugins/freeradius/freeradius_queue
index 9010e18d..e4e8744d 100644
--- a/plugins/other/freeradius_queue
+++ b/plugins/freeradius/freeradius_queue
@@ -70,7 +70,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_args --base 1000 -l 0 '
     echo 'graph_period second'
     echo 'graph_vlabel requests / ${graph_period}'
-    echo 'graph_category Other'
+    echo 'graph_category auth'
 
     echo 'queue_len_internal.label Internal'
     echo 'queue_len_internal.info number of requests waiting in the internal queue'
diff --git a/plugins/other/update b/plugins/other/update
index 0a6b36a1..c86bce9c 100755
--- a/plugins/other/update
+++ b/plugins/other/update
@@ -50,6 +50,7 @@ fi
 if [ "$1" = "config" ]; then
 
 	echo 'graph_title Munin-update'
+	echo 'graph_category munin'
 	echo 'graph_vlabel seconds'
 	[ -f $UPDATE_STATSFILE ] || exit 0
 	cat $UPDATE_STATSFILE | grep "UD" | while read i; do
diff --git a/plugins/other/yum_activity b/plugins/other/yum_activity
index d2673ac5..bad9a4dd 100755
--- a/plugins/other/yum_activity
+++ b/plugins/other/yum_activity
@@ -23,6 +23,7 @@ if [ "$1" = "config" ]; then
 
 	echo 'graph_title Yum Activity'
 	echo 'graph_args --base 1000 -l 0 '
+	echo 'graph_category security'
 	echo 'graph_vlabel Yum Activity'
 	echo 'updates.label Yum Updated'
 	echo 'updates.draw AREA'
diff --git a/plugins/mail/greyfix b/plugins/postfix/greyfix
similarity index 99%
rename from plugins/mail/greyfix
rename to plugins/postfix/greyfix
index ee4da296..87d0d4fd 100755
--- a/plugins/mail/greyfix
+++ b/plugins/postfix/greyfix
@@ -130,7 +130,7 @@ def print_config():
 	print 'graph_title Greyfix triplets by age'
 	print 'graph_vlabel Number of triplets'
 	print 'graph_info The amount of triplets in the greyfix database with a certain age'
-	print 'graph_category postfix'
+	print 'graph_category mail'
 	print 'graph_total All triplets'
 	print 'graph_args --lower-limit 0 --base 1000'
 
diff --git a/plugins/mail/policyd-spf-python b/plugins/postfix/policyd-spf-python
similarity index 98%
rename from plugins/mail/policyd-spf-python
rename to plugins/postfix/policyd-spf-python
index f51a7b8b..bf13bd05 100755
--- a/plugins/mail/policyd-spf-python
+++ b/plugins/postfix/policyd-spf-python
@@ -35,7 +35,7 @@ fi
 
 if [ "$1" = "config" ]; then
 	echo 'graph_title SPF Check Results'
-	echo 'graph_category postfix'
+	echo 'graph_category mail'
 	echo 'graph_args --base 1000 -l 0'
 	echo 'graph_vlabel Count/s'
 
diff --git a/plugins/postfix/postfix_mail_stats1 b/plugins/postfix/postfix_mail_stats1
index 2ac2866e..b2132a99 100755
--- a/plugins/postfix/postfix_mail_stats1
+++ b/plugins/postfix/postfix_mail_stats1
@@ -36,7 +36,7 @@ fi
 if [ "$1" = "config" ]; then
 
         echo 'graph_title Postfix Mail Counter'
-        echo 'graph_category postfix'
+        echo 'graph_category mail'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel Hourly Messages'
         echo 'recieved.label Delivered'
diff --git a/plugins/snmp/snmp__sentry b/plugins/snmp/snmp__sentry
index 05456754..4631b0c4 100755
--- a/plugins/snmp/snmp__sentry
+++ b/plugins/snmp/snmp__sentry
@@ -143,7 +143,7 @@ multigraph power_amps_drawn
 graph_title Power Draw in Amps
 graph_args --lower-limit 0
 graph_vlabel Amps
-graph_category pdu
+graph_category sensors
 graph_scale no
 graph_info This shows the amperage drawn on your PDU. Per NEC, a PDU should not sustain 80% of its maximum circuit capacity for more than three hours.
 
@@ -167,7 +167,7 @@ multigraph power_power_factor
 graph_title Power Factor
 graph_args --lower-limit 0
 graph_vlabel Power Factor
-graph_category pdu
+graph_category sensors
 graph_scale no
 graph_info Power factor represents the efficiency of the components connected to the circuit. Power factor declines as components age, increasing the overall load on the circuit.
 
@@ -186,7 +186,7 @@ multigraph power_crest_factor
 graph_title Crest Factor
 graph_args --lower-limit 0
 graph_vlabel Crest Factor
-graph_category pdu
+graph_category sensors
 graph_scale no
 graph_info Crest factor relates the peak value of a signal to its root mean square value. For three-phase AC, a crest factor of 1.732 is expected. Low crest factor may indicate UPS overclipping and crest factors over 5 degrade monitoring accuracy.
 
diff --git a/plugins/ups/apc_status b/plugins/ups/apc_status
index 9860dd24..fcbb9344 100755
--- a/plugins/ups/apc_status
+++ b/plugins/ups/apc_status
@@ -18,7 +18,7 @@ if [ "$1" = "config" ]; then
         echo 'multigraph apc_status'
         echo "graph_title UPS Status - $title"
         echo 'graph_args --base 1000'
-        echo 'graph_category hardware'
+        echo 'graph_category sensors'
         title=`/sbin/apcaccess | egrep "^MODEL" | awk '{print $3" "$4" "$5" "$6" "$7" "$8" "$9;}'`
         echo "graph_info $title"
         for key in $keys; do
@@ -35,7 +35,7 @@ if [ "$1" = "config" ]; then
                 if [ -n "$unit" ]; then
                         echo "graph_vlabel $unit"
                 fi
-                echo 'graph_category hardware'
+                echo 'graph_category sensors'
                 echo "$key.label $key"
                 echo "$key.info $key."
                 echo "$key.draw LINE1"