diff --git a/plugins/system/cpu-usage-by-process b/plugins/cpu/cpu-usage-by-process
similarity index 97%
rename from plugins/system/cpu-usage-by-process
rename to plugins/cpu/cpu-usage-by-process
index b00b9860..ae6469a6 100755
--- a/plugins/system/cpu-usage-by-process
+++ b/plugins/cpu/cpu-usage-by-process
@@ -37,7 +37,7 @@ fi
 if [ "$1" = "config" ] ; then
     echo "graph_args --base 1000 -r --lower-limit 0";
     echo "graph_title CPU usage, by process";
-    echo "graph_category system";
+    echo "graph_category processes";
     echo "graph_info This graph shows CPU usage, for monitored processes.";
         echo 'graph_vlabel %'
         echo 'graph_scale no'
diff --git a/plugins/system/cpu_ b/plugins/cpu/cpu_
similarity index 100%
rename from plugins/system/cpu_
rename to plugins/cpu/cpu_
diff --git a/plugins/system/cpu_by_process b/plugins/cpu/cpu_by_process
similarity index 99%
rename from plugins/system/cpu_by_process
rename to plugins/cpu/cpu_by_process
index 98b066ad..ee39f966 100755
--- a/plugins/system/cpu_by_process
+++ b/plugins/cpu/cpu_by_process
@@ -86,7 +86,7 @@ if (@ARGV and $ARGV[0] eq "config")
 graph_title CPU time by Process
 graph_args --base 1000
 graph_vlabel seconds
-graph_category system
+graph_category processes
 graph_info Shows CPU time used by each process name
 END
 
diff --git a/plugins/system/multicpu1sec/multicpu1sec b/plugins/cpu/multicpu1sec
similarity index 97%
rename from plugins/system/multicpu1sec/multicpu1sec
rename to plugins/cpu/multicpu1sec
index 4d69f137..a5dd9d94 100644
--- a/plugins/system/multicpu1sec/multicpu1sec
+++ b/plugins/cpu/multicpu1sec
@@ -87,3 +87,6 @@ exit 0
 #    acquire which needs a different pid than watchdog, otherwise watchdog
 #    could/will kill itself when expiring before the watched process is killed.
 # not a POSIX feature.
+
+# for Munin Plugin Gallery
+# graph_category 1sec
diff --git a/plugins/system/multicpu1sec/multicpu1sec-c.c b/plugins/cpu/multicpu1sec-c.c
similarity index 100%
rename from plugins/system/multicpu1sec/multicpu1sec-c.c
rename to plugins/cpu/multicpu1sec-c.c
diff --git a/plugins/system/multicpu1sec/multicpu1sec-days.png b/plugins/cpu/multicpu1sec-days.png
similarity index 100%
rename from plugins/system/multicpu1sec/multicpu1sec-days.png
rename to plugins/cpu/multicpu1sec-days.png
diff --git a/plugins/system/multicpu1sec/multicpu1sec-hours.png b/plugins/cpu/multicpu1sec-hours.png
similarity index 100%
rename from plugins/system/multicpu1sec/multicpu1sec-hours.png
rename to plugins/cpu/multicpu1sec-hours.png
diff --git a/plugins/system/multicpu1sec/multicpu1sec-minutes.png b/plugins/cpu/multicpu1sec-minutes.png
similarity index 100%
rename from plugins/system/multicpu1sec/multicpu1sec-minutes.png
rename to plugins/cpu/multicpu1sec-minutes.png
diff --git a/plugins/snmp/snmp__gwia_bytes_ b/plugins/groupwise/snmp__gwia_bytes_
similarity index 100%
rename from plugins/snmp/snmp__gwia_bytes_
rename to plugins/groupwise/snmp__gwia_bytes_
diff --git a/plugins/snmp/snmp__gwia_msgs_ b/plugins/groupwise/snmp__gwia_msgs_
similarity index 100%
rename from plugins/snmp/snmp__gwia_msgs_
rename to plugins/groupwise/snmp__gwia_msgs_
diff --git a/plugins/snmp/snmp__gwmta_msgs_ b/plugins/groupwise/snmp__gwmta_msgs_
similarity index 100%
rename from plugins/snmp/snmp__gwmta_msgs_
rename to plugins/groupwise/snmp__gwmta_msgs_
diff --git a/plugins/snmp/snmp__gwpoa_ b/plugins/groupwise/snmp__gwpoa_
similarity index 100%
rename from plugins/snmp/snmp__gwpoa_
rename to plugins/groupwise/snmp__gwpoa_
diff --git a/plugins/system/kmemsum b/plugins/memory/kmemsum
similarity index 100%
rename from plugins/system/kmemsum
rename to plugins/memory/kmemsum
diff --git a/plugins/system/proc_memory_status b/plugins/memory/proc_memory_status
similarity index 98%
rename from plugins/system/proc_memory_status
rename to plugins/memory/proc_memory_status
index 7c10cecd..3ad2752c 100755
--- a/plugins/system/proc_memory_status
+++ b/plugins/memory/proc_memory_status
@@ -28,7 +28,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_vlabel Ko'
 	echo 'graph_scale no'
 	echo "graph_info This graph display memory usage for a process"
-	echo 'graph_category system'
+	echo 'graph_category processes'
 	echo 'graph_period second'
 
 	echo 'VmExe.label VmExe'
diff --git a/plugins/system/1sec/if1sec-c.c b/plugins/network/if1sec-c.c
similarity index 99%
rename from plugins/system/1sec/if1sec-c.c
rename to plugins/network/if1sec-c.c
index 6793be4c..47f7842d 100644
--- a/plugins/system/1sec/if1sec-c.c
+++ b/plugins/network/if1sec-c.c
@@ -66,7 +66,7 @@ int config() {
 			"multigraph if_%s_1sec" "\n"
 			"graph_order down up" "\n"
 			"graph_title %s traffic" "\n"
-			"graph_category system::1sec" "\n"
+			"graph_category 1sec" "\n"
 			"graph_vlabel bits in (-) / out (+) per ${graph_period}" "\n"
 			"graph_data_size custom 1d, 10s for 1w, 1m for 1t, 5m for 1y" "\n"
 			, if_name, if_name
diff --git a/plugins/system/vpsmem b/plugins/openvz/vpsmem
similarity index 98%
rename from plugins/system/vpsmem
rename to plugins/openvz/vpsmem
index 57014783..c9d9d789 100755
--- a/plugins/system/vpsmem
+++ b/plugins/openvz/vpsmem
@@ -29,7 +29,7 @@ if [ "$1" == "config" ]; then
     cut -c9- <<EOF
         graph_args --base 1024 -l 0 --vertical-label bytes --upper-limit $limit
         graph_title VPS memory usage
-        graph_category system
+        graph_category memory
         graph_info Shows memory usage and VPS memory limits.
         graph_order maxheld held oomguar barrier limit
 
diff --git a/plugins/raspberry-pi/cpu_freq_1sec b/plugins/raspberry-pi/cpu_freq_1sec
index 44e01214..62a26523 100755
--- a/plugins/raspberry-pi/cpu_freq_1sec
+++ b/plugins/raspberry-pi/cpu_freq_1sec
@@ -40,7 +40,7 @@ if [ "$1" = "config" ]
 then
         cat <<EOF
 graph_title CPU Freq 1sec stats
-graph_category 1sec::cpu
+graph_category 1sec
 graph_data_size custom 1d, 10s for 1w, 1m for 1t, 5m for 1y
 graph_vlabel Hz
 update_rate 1
diff --git a/plugins/system/freeboxuptime b/plugins/router/freeboxuptime
similarity index 100%
rename from plugins/system/freeboxuptime
rename to plugins/router/freeboxuptime
diff --git a/plugins/system/iostat-cputps-average b/plugins/sar/iostat-cputps-average
similarity index 100%
rename from plugins/system/iostat-cputps-average
rename to plugins/sar/iostat-cputps-average
diff --git a/plugins/snmp/multi_snmp_querier b/plugins/snmp/multi_snmp_querier
index 43d751ce..0048c6af 100755
--- a/plugins/snmp/multi_snmp_querier
+++ b/plugins/snmp/multi_snmp_querier
@@ -106,7 +106,7 @@ $oid = $ENV{snmp_oid} || $defaults{oid};
 %known_oids = ('1.3.6.1.2.1.43.10.2.1.4.1.1' =>
 	       { title => 'Pages',
 		 vlabel => 'Printed pages',
-		 category => 'Printer',
+		 category => 'printing',
 		 info => 'Returns the total number of printed pages per defined printer',
 		 total => 'Total',
 		 units => 'pages'
@@ -114,7 +114,7 @@ $oid = $ENV{snmp_oid} || $defaults{oid};
 	       '1.3.6.1.2.1.43.11.1.1.8.1.1' => 
 	       { title => 'Total projected capacity of this cartridge',
 		 vlabel => 'Total capacity',
-		 category => 'Printer',
+		 category => 'printing',
 		 info => 'Returns the total projected capacity (in pages) of '.
 		     'the currently installed cartridge',
 		 total => 'Total',
@@ -123,7 +123,7 @@ $oid = $ENV{snmp_oid} || $defaults{oid};
 	       '1.3.6.1.2.1.43.11.1.1.9.1.1' => 
 	       { title => 'Pages printed with this cartridge',
 		 vlabel => 'Printed pages',
-		 category => 'Printer',
+		 category => 'printing',
 		 info => 'Returns the total number of printed pages per ' .
 		     'defined printer with the current cartridge',
 		 total => 'Total',
@@ -239,3 +239,6 @@ sub host_label_for {
     $addr =~ s/\./_/g; # Periods not allowed in variable names
     return $addr;
 }
+
+# for Munin Plugin Gallery
+# graph_category printing
diff --git a/plugins/system/zones_cpu b/plugins/solaris/zones_cpu
similarity index 100%
rename from plugins/system/zones_cpu
rename to plugins/solaris/zones_cpu
diff --git a/plugins/system/zones_mem b/plugins/solaris/zones_mem
similarity index 97%
rename from plugins/system/zones_mem
rename to plugins/solaris/zones_mem
index 9d216065..d492af05 100755
--- a/plugins/system/zones_mem
+++ b/plugins/solaris/zones_mem
@@ -26,7 +26,7 @@ fi
 if [ "$1" = 'config' ]; then
         echo 'graph_title zone memory usage'
         echo 'graph_args --upper-limit 100'
-        echo 'graph_category system'
+        echo 'graph_category memory'
         stack=AREA
         $PRSTAT $PRSTAT_OPTS | sed '1,/^ZONEID/d' | grep -v '^Total' | while read i; do
                 oIFS="$IFS"
diff --git a/plugins/synology/snmp__synology_ups b/plugins/synology/snmp__synology_ups
index 2ceea9e5..0b1ca5cb 100644
--- a/plugins/synology/snmp__synology_ups
+++ b/plugins/synology/snmp__synology_ups
@@ -75,7 +75,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") {
         print "graph_title UPS
 graph_args --base 1000 -l 0
 graph_vlabel Status of UPS
-graph_category system
+graph_category sensors
 graph_info This graph shows the status of the attached UPS.
 charge.label Charge
 charge.info Charge status of battery.
diff --git a/plugins/system/systemd_units b/plugins/systemd/systemd_units
similarity index 100%
rename from plugins/system/systemd_units
rename to plugins/systemd/systemd_units
diff --git a/plugins/system/membyuser b/plugins/user/membyuser
similarity index 100%
rename from plugins/system/membyuser
rename to plugins/user/membyuser
diff --git a/plugins/system/system_users b/plugins/user/system_users
similarity index 100%
rename from plugins/system/system_users
rename to plugins/user/system_users
diff --git a/plugins/noaaport/novra_s300 b/plugins/weather/novra_s300
similarity index 98%
rename from plugins/noaaport/novra_s300
rename to plugins/weather/novra_s300
index 3d42f55d..ca20cbc7 100755
--- a/plugins/noaaport/novra_s300
+++ b/plugins/weather/novra_s300
@@ -43,7 +43,7 @@ my $command = "$CMCS -ip $IP -pw $PW -xmlstatus";
 if (defined($ARGV[0]) and ($ARGV[0] eq 'config')) {
 	print "graph_title Novra S300\n";
 	print "graph_vlabel Signal\n";
-	print "graph_category weather\n";
+	print "graph_category sensors\n";
 	print "s300.signal Signal\n";
 	print "s300.ctn CtN\n";
 	exit(0);