diff --git a/plugins/disk/df_abs_bsd b/plugins/bsd/df_abs_bsd
similarity index 100%
rename from plugins/disk/df_abs_bsd
rename to plugins/bsd/df_abs_bsd
diff --git a/plugins/disk/df_bsd b/plugins/bsd/df_bsd
similarity index 100%
rename from plugins/disk/df_bsd
rename to plugins/bsd/df_bsd
diff --git a/plugins/disk/freebsd_hdd_power_state b/plugins/bsd/freebsd_hdd_power_state
similarity index 100%
rename from plugins/disk/freebsd_hdd_power_state
rename to plugins/bsd/freebsd_hdd_power_state
diff --git a/plugins/network/netstat_bsd_m_/netstat_bsd_m_ b/plugins/bsd/netstat_bsd_m_
similarity index 100%
rename from plugins/network/netstat_bsd_m_/netstat_bsd_m_
rename to plugins/bsd/netstat_bsd_m_
diff --git a/plugins/network/netstat_bsd_m_/netstat_bsd_m_.png b/plugins/bsd/netstat_bsd_m_-day.png
similarity index 100%
rename from plugins/network/netstat_bsd_m_/netstat_bsd_m_.png
rename to plugins/bsd/netstat_bsd_m_-day.png
diff --git a/plugins/system/openbsd-memory b/plugins/bsd/openbsd-memory
similarity index 100%
rename from plugins/system/openbsd-memory
rename to plugins/bsd/openbsd-memory
diff --git a/plugins/system/openbsd-swap b/plugins/bsd/openbsd-swap
similarity index 100%
rename from plugins/system/openbsd-swap
rename to plugins/bsd/openbsd-swap
diff --git a/plugins/mail/spamd-blacklist-bsd b/plugins/bsd/spamd-blacklist-bsd
similarity index 100%
rename from plugins/mail/spamd-blacklist-bsd
rename to plugins/bsd/spamd-blacklist-bsd
diff --git a/plugins/mail/spamd-tarpit-bsd b/plugins/bsd/spamd-tarpit-bsd
similarity index 100%
rename from plugins/mail/spamd-tarpit-bsd
rename to plugins/bsd/spamd-tarpit-bsd
diff --git a/plugins/system/uptime_bsd b/plugins/bsd/uptime_bsd
similarity index 100%
rename from plugins/system/uptime_bsd
rename to plugins/bsd/uptime_bsd
diff --git a/plugins/snmp/snmp__memory_openwrt b/plugins/openwrt/snmp__memory_openwrt
similarity index 100%
rename from plugins/snmp/snmp__memory_openwrt
rename to plugins/openwrt/snmp__memory_openwrt
diff --git a/plugins/snmp/snmp__cisco_sbs_cpu b/plugins/router/snmp__cisco_sbs_cpu
similarity index 100%
rename from plugins/snmp/snmp__cisco_sbs_cpu
rename to plugins/router/snmp__cisco_sbs_cpu
diff --git a/plugins/snmp/snmp__linksys_poe b/plugins/router/snmp__linksys_poe
similarity index 100%
rename from plugins/snmp/snmp__linksys_poe
rename to plugins/router/snmp__linksys_poe
diff --git a/plugins/snmp/snmp__screenos b/plugins/router/snmp__screenos
similarity index 100%
rename from plugins/snmp/snmp__screenos
rename to plugins/router/snmp__screenos
diff --git a/plugins/system/solaris-memstat b/plugins/solaris/solaris-memstat
similarity index 100%
rename from plugins/system/solaris-memstat
rename to plugins/solaris/solaris-memstat
diff --git a/plugins/snmp/snmp__synology b/plugins/synology/snmp__synology
similarity index 100%
rename from plugins/snmp/snmp__synology
rename to plugins/synology/snmp__synology
diff --git a/plugins/snmp/snmp__synology_hddtemp b/plugins/synology/snmp__synology_hddtemp
similarity index 100%
rename from plugins/snmp/snmp__synology_hddtemp
rename to plugins/synology/snmp__synology_hddtemp
diff --git a/plugins/snmp/snmp__synology_temperature b/plugins/synology/snmp__synology_temperature
similarity index 100%
rename from plugins/snmp/snmp__synology_temperature
rename to plugins/synology/snmp__synology_temperature
diff --git a/plugins/snmp/snmp__synology_ups b/plugins/synology/snmp__synology_ups
similarity index 100%
rename from plugins/snmp/snmp__synology_ups
rename to plugins/synology/snmp__synology_ups
diff --git a/plugins/snmp/snmp__thecus_fans b/plugins/thecus/snmp__thecus_fans
similarity index 100%
rename from plugins/snmp/snmp__thecus_fans
rename to plugins/thecus/snmp__thecus_fans
diff --git a/plugins/snmp/snmp__ipoman_ b/plugins/ups/snmp__ipoman_
similarity index 100%
rename from plugins/snmp/snmp__ipoman_
rename to plugins/ups/snmp__ipoman_
diff --git a/plugins/snmp/snmp__ups_ b/plugins/ups/snmp__ups_
similarity index 100%
rename from plugins/snmp/snmp__ups_
rename to plugins/ups/snmp__ups_