diff --git a/plugins/network/arp b/plugins/arp/arp
similarity index 100%
rename from plugins/network/arp
rename to plugins/arp/arp
diff --git a/plugins/network/arp_ b/plugins/arp/arp_
similarity index 100%
rename from plugins/network/arp_
rename to plugins/arp/arp_
diff --git a/plugins/network/arp_bsd_ b/plugins/arp/arp_bsd_
similarity index 100%
rename from plugins/network/arp_bsd_
rename to plugins/arp/arp_bsd_
diff --git a/plugins/network/ag241-adsl b/plugins/router/ag241-adsl
similarity index 100%
rename from plugins/network/ag241-adsl
rename to plugins/router/ag241-adsl
diff --git a/plugins/network/avm-fritzbox-wan-traffic b/plugins/router/avm-fritzbox-wan-traffic
similarity index 100%
rename from plugins/network/avm-fritzbox-wan-traffic
rename to plugins/router/avm-fritzbox-wan-traffic
diff --git a/plugins/other/conexant_adsl b/plugins/router/conexant_adsl
similarity index 98%
rename from plugins/other/conexant_adsl
rename to plugins/router/conexant_adsl
index fa774d81..acf4b186 100755
--- a/plugins/other/conexant_adsl
+++ b/plugins/router/conexant_adsl
@@ -27,6 +27,7 @@ if [ "$1" = "config" ]; then
 
 	echo 'graph_title ADSL Connection Statistics'
 	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_category network'
 	echo 'graph_vlabel Daily Connection Statistics'
 	echo 'st_dw_crc.label Downstream CRC count'
 	echo 'st_up_crc.label Upstream CRC count'
diff --git a/plugins/network/dsl-connection-speed b/plugins/router/dsl-connection-speed
similarity index 98%
rename from plugins/network/dsl-connection-speed
rename to plugins/router/dsl-connection-speed
index d8f809bb..06984f1e 100755
--- a/plugins/network/dsl-connection-speed
+++ b/plugins/router/dsl-connection-speed
@@ -6,7 +6,7 @@ case $1 in
 graph_order downspeed upspeed
 graph_title DSL Connection Speed
 graph_args --base 1000 -l 1000 --upper-limit 42000
-graph_category Network
+graph_category network
 graph_scale no
 graph_vlabel DSL up / down speed
 downspeed.label Down speed
diff --git a/plugins/network/dsl-stats b/plugins/router/dsl-stats
similarity index 98%
rename from plugins/network/dsl-stats
rename to plugins/router/dsl-stats
index f83e026b..58b4bf20 100755
--- a/plugins/network/dsl-stats
+++ b/plugins/router/dsl-stats
@@ -6,7 +6,7 @@ case $1 in
 graph_order snrdown snrup pwrdown pwrup
 graph_title dsl stats
 graph_args --base 1000
-graph_category Network
+graph_category network
 graph_scale no
 graph_vlabel DSL SNR and Power
 attndown.label Down Attenuation
diff --git a/plugins/juniper/snmp__juniper b/plugins/router/snmp__juniper
similarity index 98%
rename from plugins/juniper/snmp__juniper
rename to plugins/router/snmp__juniper
index e2873511..216283ba 100755
--- a/plugins/juniper/snmp__juniper
+++ b/plugins/router/snmp__juniper
@@ -184,3 +184,7 @@ else:
 		c.print_config()
 	else:
 		c.execute()
+
+# for Munin Plugin Gallery
+# graph_category network
+
diff --git a/plugins/juniper/snmp__juniper_spu b/plugins/router/snmp__juniper_spu
similarity index 100%
rename from plugins/juniper/snmp__juniper_spu
rename to plugins/router/snmp__juniper_spu