diff --git a/plugins/vhost_requests_ b/plugins/http/vhost_requests_
similarity index 99%
rename from plugins/vhost_requests_
rename to plugins/http/vhost_requests_
index cecc859f..1682bd98 100755
--- a/plugins/vhost_requests_
+++ b/plugins/http/vhost_requests_
@@ -64,7 +64,7 @@ file_name=`basename $0 | sed 's/^vhost_requests_//g'`
 
 case $1 in
    config)
-echo graph_category vhosts
+echo graph_category http
 echo graph_title Requests by Status Code $file_name
 echo graph_vlabel Nr of Requests
 echo S200.label 200 OK
diff --git a/plugins/sendmail_mailq b/plugins/mail/sendmail_mailq
similarity index 99%
rename from plugins/sendmail_mailq
rename to plugins/mail/sendmail_mailq
index f4f7a546..bb33a87c 100644
--- a/plugins/sendmail_mailq
+++ b/plugins/mail/sendmail_mailq
@@ -101,7 +101,7 @@ if ($#ARGV >= 0 && $ARGV[0] eq "config") {
 
   print <<EOT;
 graph_title    sendmail queue size
-graph_category sendmail
+graph_category mail
 graph_vlabel   messages
 graph_scale    no
 EOT
diff --git a/plugins/dhcpd-pools b/plugins/network/dhcpd-pools
similarity index 98%
rename from plugins/dhcpd-pools
rename to plugins/network/dhcpd-pools
index 8250595f..e9a2b382 100644
--- a/plugins/dhcpd-pools
+++ b/plugins/network/dhcpd-pools
@@ -44,7 +44,7 @@ do
         echo "graph_args --base 1000 -l 0 --upper-limit $GRAPHTOP"
         echo "graph_vlabel Active Leases"
         echo "graph_scale no"
-        echo "graph_category DhcpPools"
+        echo "graph_category network"
 
         echo "pool.label $SCOPENAME Active Leases"
         echo "pool.info Pool utilization"