diff --git a/plugins/glance/glance_size_ b/plugins/glance/glance_size_
index 8a0bb565..c45455d6 100755
--- a/plugins/glance/glance_size_
+++ b/plugins/glance/glance_size_
@@ -78,7 +78,7 @@ def print_config(tenant):
         print 'graph_info This graph shows the used size in glance for tenant %s' % tenant
     print 'graph_vlabel Bytes'
     print 'graph_args --base 1024 --lower-limit 0'
-    print 'graph_category glance'
+    print 'graph_category cloud'
     print '%s.label %s' % (tenant, get_name_from_tenant(tenant))
     print '%s.draw LINE2' % tenant
     print '%s.info %s MBytes' % (tenant, tenant)
diff --git a/plugins/glance/glance_status b/plugins/glance/glance_status
index 25bb25f5..95917a3c 100755
--- a/plugins/glance/glance_status
+++ b/plugins/glance/glance_status
@@ -44,7 +44,7 @@ def print_config():
     print 'graph_title Glance images status'
     print 'graph_vlabel images'
     print 'graph_args --lower-limit 0'
-    print 'graph_category glance'
+    print 'graph_category cloud'
     print 'graph_scale no'
     print 'graph_info This graph show number of images by status'
 
diff --git a/plugins/services/ircd b/plugins/ircd/ircd
similarity index 98%
rename from plugins/services/ircd
rename to plugins/ircd/ircd
index 06fa8afd..7770d354 100755
--- a/plugins/services/ircd
+++ b/plugins/ircd/ircd
@@ -23,7 +23,7 @@ if (isset($argv['1']) && $argv['1'] == "config") {
 	print "host_name ".php_uname('n')."\n";
 
 	print "graph_title IRCd Status\n";
-	print "graph_category Services\n";
+	print "graph_category chat\n";
 	print "graph_order clients channels operators\n";
 	print "graph_args --base 1000 -l 0\n";
 
diff --git a/plugins/openvpn/openvpn_as_mtime b/plugins/openvpn/openvpn_as_mtime
index c260a598..7dbf90ac 100755
--- a/plugins/openvpn/openvpn_as_mtime
+++ b/plugins/openvpn/openvpn_as_mtime
@@ -56,7 +56,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Time in minutes'
 	echo 'graph_scale no'
-	echo 'graph_category OpenVPN'
+	echo 'graph_category network'
 	echo 'graph_info Indicate the medium time of the logged users.'
 
         echo "time.label Users"
diff --git a/plugins/openvpn/openvpn_as_traffic b/plugins/openvpn/openvpn_as_traffic
index 61e4de2f..d59e7fee 100755
--- a/plugins/openvpn/openvpn_as_traffic
+++ b/plugins/openvpn/openvpn_as_traffic
@@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title OpenVPN traffic"
 	echo 'graph_args --base 1000'
 	echo 'graph_vlabel Bytes in (-) / out (+)'
-	echo 'graph_category OpenVPN'
+	echo 'graph_category network'
 	echo "graph_info OpenVPN traffic"
 
 
diff --git a/plugins/openvpn/openvpn_as_ttime b/plugins/openvpn/openvpn_as_ttime
index dfbd1757..06809a92 100755
--- a/plugins/openvpn/openvpn_as_ttime
+++ b/plugins/openvpn/openvpn_as_ttime
@@ -57,7 +57,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Time in minutes'
 	echo 'graph_scale no'
-	echo 'graph_category OpenVPN'
+	echo 'graph_category network'
 	echo 'graph_info Indicate the user logged time.'
 
 	# If none, print 0
diff --git a/plugins/openvpn/openvpn_as_users b/plugins/openvpn/openvpn_as_users
index 640a48b6..3d655cb6 100755
--- a/plugins/openvpn/openvpn_as_users
+++ b/plugins/openvpn/openvpn_as_users
@@ -52,7 +52,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0 '
 	echo 'graph_vlabel Users'
 	echo 'graph_scale no'
-	echo 'graph_category OpenVPN'
+	echo 'graph_category network'
 	echo 'graph_info Indicate the number of vpn users and the license limit.'
 
         echo "users.label Users"
diff --git a/plugins/openvpn/openvpn_multi b/plugins/openvpn/openvpn_multi
index b42503ed..c27a5c4f 100755
--- a/plugins/openvpn/openvpn_multi
+++ b/plugins/openvpn/openvpn_multi
@@ -38,7 +38,7 @@ sub config {
 	print "graph_title OpenVPN traffic\n";
 	print "graph_args --base 1024 --lower-limit 0\n";
 	print "graph_vlabel Bytes Out (-) / In (+) per \${graph_period}\n";
-	print "graph_category openvpn\n";
+	print "graph_category network\n";
 	print "in.label recv\n";
 	print "in.type DERIVE\n";
 	print "in.min 0\n";
@@ -63,7 +63,7 @@ sub config {
 		print "graph_title OpenVPN traffic for $name\n";
 		print "graph_args --base 1024 --lower-limit 0\n";
 		print "graph_vlabel Bytes Out (-) / In (+) per \${graph_period}\n";
-		print "graph_category openvpn\n";
+		print "graph_category network\n";
 		print "in.label recv\n";
 		print "in.type DERIVE\n";
 		print "in.min 0\n";
diff --git a/plugins/puma/puma_ b/plugins/puma/puma_
index 2c4ef35f..85db9d09 100644
--- a/plugins/puma/puma_
+++ b/plugins/puma/puma_
@@ -22,7 +22,7 @@ if [ "$mode" = "memory" ]; then
   if [ "$1" = "config" ]; then
     echo "graph_title Total Puma Memory"
     echo "graph_vlabel Total RAM"
-    echo "graph_category puma"
+    echo "graph_category webserver"
     echo "graph_args --base 1024"
     echo "ram.label Total RAM"
     exit 0
@@ -37,7 +37,7 @@ elif [ "$mode" = "processes" ]; then
   if [ "$1" = "config" ]; then
     echo "graph_title puma Processes"
     echo "graph_vlabel Processes"
-    echo "graph_category puma"
+    echo "graph_category webserver"
     echo "processes.label active processes"
   else
     printf "processes.value %s\n" "$(ps awwwux | egrep "puma.* worker" | grep -v grep | wc -l)"
@@ -48,7 +48,7 @@ elif [ "$mode" = "average" ]; then
     echo 'graph_title Puma Average Process Size'
     echo 'graph_args --base 1024 -l 0 '
     echo 'graph_vlabel Average Process Size'
-    echo 'graph_category puma'
+    echo 'graph_category webserver'
     echo 'puma_average.label Average Process Size'
     echo 'puma_average.draw LINE2'
     echo 'puma_average.info The average process size for puma'
@@ -57,4 +57,4 @@ elif [ "$mode" = "average" ]; then
     exit 0
   fi
 fi
-exit 0
\ No newline at end of file
+exit 0
diff --git a/plugins/rackspace/rackspace_cdn_count.php b/plugins/rackspace/rackspace_cdn_count.php
index 71356e2d..d1ee8cbb 100644
--- a/plugins/rackspace/rackspace_cdn_count.php
+++ b/plugins/rackspace/rackspace_cdn_count.php
@@ -25,7 +25,7 @@ function SplitTwice($content,$first,$second) {
 if ($argv[1]=='config'){
     print "graph_title Rackspace CDN files count\n";
     print "graph_vlabel Files Count\n";
-    print "graph_category rackspace\n";
+    print "graph_category cloud\n";
     print "count.label files count\n";
     print "graph_args --base 1000\n";
 
diff --git a/plugins/rackspace/rackspace_cdn_size.php b/plugins/rackspace/rackspace_cdn_size.php
index 45fca542..b3b836fd 100644
--- a/plugins/rackspace/rackspace_cdn_size.php
+++ b/plugins/rackspace/rackspace_cdn_size.php
@@ -24,7 +24,7 @@ function SplitTwice($content,$first,$second) {
 if ($argv[1]=='config'){
     print "graph_title Rackspace CDN storage usage\n";
     print "graph_vlabel CDN storage usage\n";
-    print "graph_category rackspace\n";
+    print "graph_category cloud\n";
     print "usage.label storage usage\n";
     print "graph_args --base 1024\n";
 
diff --git a/plugins/rethinkdb/rethinkdb_node_io b/plugins/rethinkdb/rethinkdb_node_io
index ea7f9f40..91893568 100644
--- a/plugins/rethinkdb/rethinkdb_node_io
+++ b/plugins/rethinkdb/rethinkdb_node_io
@@ -69,7 +69,7 @@ def print_config(servername):
     print("graph_title RethinkDB on '%s'- Local Database IOPS and Queries" % servername)
     print("graph_args --base 1000 -l 0")
     print("graph_vlabel Operations / second")
-    print("graph_category rethinkdb")
+    print("graph_category db")
     print("total_qps.label queries per sec")
     print("total_qps.type COUNTER")
     print("total_rdps.label read docs per sec")
diff --git a/plugins/services/hostdenied b/plugins/ssh/hostdenied
similarity index 99%
rename from plugins/services/hostdenied
rename to plugins/ssh/hostdenied
index a798b17e..93140355 100755
--- a/plugins/services/hostdenied
+++ b/plugins/ssh/hostdenied
@@ -62,7 +62,7 @@ cat << EOF
 graph_title denied sshd access in $DENY
 graph_args --base 1000 -l 0
 graph_vlabel Hosts denied
-graph_category services
+graph_category security
 age0.label added last 24h
 age0.draw AREA
 age0.colour ${COLOUR[0]}
diff --git a/plugins/other/yum_activity b/plugins/yum/yum_activity
similarity index 100%
rename from plugins/other/yum_activity
rename to plugins/yum/yum_activity