diff --git a/plugins/ceph/ceph-osd-info b/plugins/ceph/ceph-osd-info
index 0018d393..3a21315e 100755
--- a/plugins/ceph/ceph-osd-info
+++ b/plugins/ceph/ceph-osd-info
@@ -183,3 +183,6 @@ else:
 				print "multigraph %s.osd%s" % (gr,osd)
 				print "osd%s_%s.value %s" % (osd,gr,data[osd][graph])
 
+# for Munin Plugin Gallery
+# graph_category ceph
+
diff --git a/plugins/streaming/icecast2 b/plugins/icecast/icecast2
similarity index 100%
rename from plugins/streaming/icecast2
rename to plugins/icecast/icecast2
diff --git a/plugins/streaming/icecast2_ b/plugins/icecast/icecast2_
similarity index 100%
rename from plugins/streaming/icecast2_
rename to plugins/icecast/icecast2_
diff --git a/plugins/streaming/icecast2_all b/plugins/icecast/icecast2_all
similarity index 100%
rename from plugins/streaming/icecast2_all
rename to plugins/icecast/icecast2_all
diff --git a/plugins/streaming/icecast2_simple b/plugins/icecast/icecast2_simple
similarity index 100%
rename from plugins/streaming/icecast2_simple
rename to plugins/icecast/icecast2_simple
diff --git a/plugins/streaming/icecast2_stats_ b/plugins/icecast/icecast2_stats_
similarity index 97%
rename from plugins/streaming/icecast2_stats_
rename to plugins/icecast/icecast2_stats_
index ea6a159c..744fe10c 100755
--- a/plugins/streaming/icecast2_stats_
+++ b/plugins/icecast/icecast2_stats_
@@ -151,20 +151,20 @@ if __name__ == "__main__":
         if scope == "sources_listeners":
             print("graph_title Total number of listeners")
             print("graph_vlabel listeners")
-            print("graph_category Icecast")
+            print("graph_category streaming")
             for index, source in enumerate(get_sources()):
                 print("{0}.label {1}".format(source["fieldname"], source["name"]))
                 print("{0}.draw {1}".format(source["fieldname"], ("AREA" if (index == 0) else "STACK")))
         elif scope == "sources_duration":
             print("graph_title Duration of sources")
             print("graph_vlabel duration in days")
-            print("graph_category Icecast")
+            print("graph_category streaming")
             for source in get_sources():
                 print("{0}.label {1}".format(source["fieldname"], source["name"]))
         elif scope == "service_uptime":
             print("graph_title Icecast service uptime")
             print("graph_vlabel uptime in days")
-            print("graph_category Icecast")
+            print("graph_category streaming")
             print("uptime.label service uptime")
     elif action is None:
         scope = get_scope()
diff --git a/plugins/streaming/icecast_ b/plugins/icecast/icecast_
similarity index 100%
rename from plugins/streaming/icecast_
rename to plugins/icecast/icecast_
diff --git a/plugins/moodle/modules/moodle_mod_chat b/plugins/moodle/moodle_mod_chat
similarity index 98%
rename from plugins/moodle/modules/moodle_mod_chat
rename to plugins/moodle/moodle_mod_chat
index 7db3fd8f..6448db3d 100644
--- a/plugins/moodle/modules/moodle_mod_chat
+++ b/plugins/moodle/moodle_mod_chat
@@ -38,7 +38,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
     echo "graph_title Moodle Chat Users\n";
     echo "graph_args --base 1000 --lower-limit 0\n";
     echo "graph_vlabel users\n";
-    echo "graph_category Moodle\n";
+    echo "graph_category cms\n";
     echo "graph_scale no\n";
     echo "graph_info Displays the number of users connected and posting message in chat sessions\n";
     echo "chat_users_connected.label users connected\n";
diff --git a/plugins/moodle/modules/moodle_mod_forum b/plugins/moodle/moodle_mod_forum
similarity index 97%
rename from plugins/moodle/modules/moodle_mod_forum
rename to plugins/moodle/moodle_mod_forum
index 363a6be8..896d0c59 100644
--- a/plugins/moodle/modules/moodle_mod_forum
+++ b/plugins/moodle/moodle_mod_forum
@@ -39,7 +39,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
     echo "graph_title Moodle Forum Posts\n";
     echo "graph_args --base 1000 --lower-limit 0\n";
     echo "graph_vlabel number\n";
-    echo "graph_category Moodle\n";
+    echo "graph_category cms\n";
     echo "graph_scale no\n";
     echo "graph_info Displays the sum of new forums posts / discussions in your Moodle site\n";
     echo "forum_posts.label posts\n";
diff --git a/plugins/moodle/modules/moodle_mod_quiz b/plugins/moodle/moodle_mod_quiz
similarity index 97%
rename from plugins/moodle/modules/moodle_mod_quiz
rename to plugins/moodle/moodle_mod_quiz
index 6e270744..e3d73cd7 100644
--- a/plugins/moodle/modules/moodle_mod_quiz
+++ b/plugins/moodle/moodle_mod_quiz
@@ -39,7 +39,7 @@ if (count($argv) === 2 && $argv[1] === 'config') {
     echo "graph_title Moodle Quiz Attempts\n";
     echo "graph_args --base 1000 --lower-limit 0\n";
     echo "graph_vlabel attempts\n";
-    echo "graph_category Moodle\n";
+    echo "graph_category cms\n";
     echo "graph_scale no\n";
     echo "graph_info Displays the sum quiz attempts in your Moodle site\n";
     echo "quiz_attempts.label attempts\n";
diff --git a/plugins/mail/postfwd2 b/plugins/postfix/postfwd2
similarity index 99%
rename from plugins/mail/postfwd2
rename to plugins/postfix/postfwd2
index f99a8ae6..edae34a8 100755
--- a/plugins/mail/postfwd2
+++ b/plugins/postfix/postfwd2
@@ -199,7 +199,7 @@ if( (defined $ARGV[0]) && ($ARGV[0] eq 'config') ) {
         print 'graph_vlabel ', $graphs{$key}->{vlabel}, "\n";
         my $args = ($key eq 'cache_stats') ? ' --upper-limit 100 --rigid' : '';
         print 'graph_args --lower-limit 0', $args, "\n";
-        print 'graph_category mail', "\n";
+        print 'graph_category fw', "\n";
         if ($key eq 'policy_matchs') {
             print 'graph_width 600', "\n";
             my @pol_keys = sort { $graphs{$key}->{series}->{$b}->{value} <=> $graphs{$key}->{series}->{$a}->{value} } keys %{$graphs{$key}->{series}};
@@ -214,7 +214,7 @@ if( (defined $ARGV[0]) && ($ARGV[0] eq 'config') ) {
                 print 'graph_vlabel ', $graphs{$key}->{vlabel}, "\n";
                 print 'graph_width 600', "\n";
                 print 'graph_args --lower-limit 0 ', $args, "\n";
-                print 'graph_category other', "\n";
+                print 'graph_category fw', "\n";
                 print $label, '.label ', $graphs{$key}->{series}->{$label}->{label}, "\n";
                 print $label, '.draw LINE', "\n";
                 print $label, '.type GAUGE', "\n";
diff --git a/plugins/streaming/shoutcast b/plugins/shoutcast/shoutcast
similarity index 100%
rename from plugins/streaming/shoutcast
rename to plugins/shoutcast/shoutcast
diff --git a/plugins/streaming/shoutcast2_multi b/plugins/shoutcast/shoutcast2_multi
similarity index 99%
rename from plugins/streaming/shoutcast2_multi
rename to plugins/shoutcast/shoutcast2_multi
index 79ba142f..5f922ba1 100755
--- a/plugins/streaming/shoutcast2_multi
+++ b/plugins/shoutcast/shoutcast2_multi
@@ -78,7 +78,7 @@ $graphsRef->{active} = {
 	config => {
 		args => '--base 1000 --lower-limit 0',
 		vlabel => 'Is a DJ Actively Connected?',
-		category => 'shoutcast2',
+		category => 'streaming',
 		title => 'Active States',
 		info => 'This graph shows us the active state or not, depending on if a DJ is connected',
 	},
@@ -91,7 +91,7 @@ $graphsRef->{listeners} = {
 	config => {
 		args => '--base 1000 --lower-limit 0',
 		vlabel => 'Listener Count',
-		category => 'shoutcast2',
+		category => 'streaming',
 		title => 'Listeners',
 		info => 'This graph shows us the various counts for listener states we are tracking',
 	},
@@ -440,3 +440,5 @@ sub fetch_admin_data {
 	}
 }
 
+# for Munin Plugin Gallery
+# graph_category streaming