diff --git a/plugins/mail/assp/assp-envelope-recipient-statistics b/plugins/assp/assp-envelope-recipient-statistics
similarity index 100%
rename from plugins/mail/assp/assp-envelope-recipient-statistics
rename to plugins/assp/assp-envelope-recipient-statistics
diff --git a/plugins/mail/assp/assp-general-runtime-information b/plugins/assp/assp-general-runtime-information
similarity index 100%
rename from plugins/mail/assp/assp-general-runtime-information
rename to plugins/assp/assp-general-runtime-information
diff --git a/plugins/mail/assp/assp-message-statistics b/plugins/assp/assp-message-statistics
similarity index 100%
rename from plugins/mail/assp/assp-message-statistics
rename to plugins/assp/assp-message-statistics
diff --git a/plugins/mail/assp/assp-smtp-connection-statistics b/plugins/assp/assp-smtp-connection-statistics
similarity index 100%
rename from plugins/mail/assp/assp-smtp-connection-statistics
rename to plugins/assp/assp-smtp-connection-statistics
diff --git a/plugins/mail/assp/assp-smtp-handler-statistics b/plugins/assp/assp-smtp-handler-statistics
similarity index 100%
rename from plugins/mail/assp/assp-smtp-handler-statistics
rename to plugins/assp/assp-smtp-handler-statistics
diff --git a/plugins/mail/courier_log b/plugins/courier/courier_log
similarity index 100%
rename from plugins/mail/courier_log
rename to plugins/courier/courier_log
diff --git a/plugins/mail/dkimproxy_mails b/plugins/dkim/dkimproxy_mails
similarity index 100%
rename from plugins/mail/dkimproxy_mails
rename to plugins/dkim/dkimproxy_mails
diff --git a/plugins/mail/postfwd-rbl b/plugins/mail/postfwd-rbl
index 46d86e1f..c2278f6c 100644
--- a/plugins/mail/postfwd-rbl
+++ b/plugins/mail/postfwd-rbl
@@ -28,7 +28,7 @@ fi
 if [ "$1" = "config" ]; then
 
         echo 'graph_title Postfwd'
-        echo 'graph_category Mail'
+        echo 'graph_category fw'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel Postfwd statistics'
         echo 'spamhaus.label Listed on Spamhaus.org'
diff --git a/plugins/mail/mixminion b/plugins/mixminion/mixminion
similarity index 100%
rename from plugins/mail/mixminion
rename to plugins/mixminion/mixminion
diff --git a/plugins/mail/qmailconn b/plugins/qmail/qmailconn
similarity index 100%
rename from plugins/mail/qmailconn
rename to plugins/qmail/qmailconn
diff --git a/plugins/mail/qmailsend b/plugins/qmail/qmailsend
similarity index 100%
rename from plugins/mail/qmailsend
rename to plugins/qmail/qmailsend
diff --git a/plugins/mail/qmailsend_plesk b/plugins/qmail/qmailsend_plesk
similarity index 100%
rename from plugins/mail/qmailsend_plesk
rename to plugins/qmail/qmailsend_plesk
diff --git a/plugins/mail/qremote b/plugins/qmail/qremote
similarity index 100%
rename from plugins/mail/qremote
rename to plugins/qmail/qremote
diff --git a/plugins/mail/queuestats b/plugins/qmail/queuestats
similarity index 96%
rename from plugins/mail/queuestats
rename to plugins/qmail/queuestats
index 4385f68e..afeb683e 100755
--- a/plugins/mail/queuestats
+++ b/plugins/qmail/queuestats
@@ -19,7 +19,7 @@ if [ "$1" = "config" ]; then
 graph_title Qmail queue stats
 graph_args --base 1000 -l 0 
 graph_vlabel mails in queue
-graph_category Mail
+graph_category mail
 queue.label queue
 queue.type GAUGE
 queue.min 0
diff --git a/plugins/mail/spamdyke b/plugins/qmail/spamdyke
similarity index 100%
rename from plugins/mail/spamdyke
rename to plugins/qmail/spamdyke
diff --git a/plugins/mail/sendmail_mailq b/plugins/sendmail/sendmail_mailq
similarity index 100%
rename from plugins/mail/sendmail_mailq
rename to plugins/sendmail/sendmail_mailq
diff --git a/plugins/mail/sa-learn b/plugins/spamassasin/sa-learn
similarity index 100%
rename from plugins/mail/sa-learn
rename to plugins/spamassasin/sa-learn