diff --git a/plugins/network/snmp___bri_se_ b/plugins/snmp/snmp___bri_se_
similarity index 100%
rename from plugins/network/snmp___bri_se_
rename to plugins/snmp/snmp___bri_se_
diff --git a/plugins/sensors/snmp__areca_ b/plugins/snmp/snmp__areca_
similarity index 100%
rename from plugins/sensors/snmp__areca_
rename to plugins/snmp/snmp__areca_
diff --git a/plugins/network/snmp__brocade_temp_module_ b/plugins/snmp/snmp__brocade_temp_module_
similarity index 100%
rename from plugins/network/snmp__brocade_temp_module_
rename to plugins/snmp/snmp__brocade_temp_module_
diff --git a/plugins/system/snmp__cpu b/plugins/snmp/snmp__cpu
similarity index 100%
rename from plugins/system/snmp__cpu
rename to plugins/snmp/snmp__cpu
diff --git a/plugins/system/snmp__cpu_usage b/plugins/snmp/snmp__cpu_usage
similarity index 100%
rename from plugins/system/snmp__cpu_usage
rename to plugins/snmp/snmp__cpu_usage
diff --git a/plugins/system/snmp__fn/snmp__fn b/plugins/snmp/snmp__fn/snmp__fn
similarity index 100%
rename from plugins/system/snmp__fn/snmp__fn
rename to plugins/snmp/snmp__fn/snmp__fn
diff --git a/plugins/system/snmp__fn/snmp__fn-cpu.png b/plugins/snmp/snmp__fn/snmp__fn-cpu.png
similarity index 100%
rename from plugins/system/snmp__fn/snmp__fn-cpu.png
rename to plugins/snmp/snmp__fn/snmp__fn-cpu.png
diff --git a/plugins/system/snmp__fn/snmp__fn-memory.png b/plugins/snmp/snmp__fn/snmp__fn-memory.png
similarity index 100%
rename from plugins/system/snmp__fn/snmp__fn-memory.png
rename to plugins/snmp/snmp__fn/snmp__fn-memory.png
diff --git a/plugins/system/snmp__fn/snmp__fn-sessions.png b/plugins/snmp/snmp__fn/snmp__fn-sessions.png
similarity index 100%
rename from plugins/system/snmp__fn/snmp__fn-sessions.png
rename to plugins/snmp/snmp__fn/snmp__fn-sessions.png
diff --git a/plugins/system/snmp__fn/snmp__fn-vpnsessions.png b/plugins/snmp/snmp__fn/snmp__fn-vpnsessions.png
similarity index 100%
rename from plugins/system/snmp__fn/snmp__fn-vpnsessions.png
rename to plugins/snmp/snmp__fn/snmp__fn-vpnsessions.png
diff --git a/plugins/other/snmp__gwia_bytes_ b/plugins/snmp/snmp__gwia_bytes_
similarity index 100%
rename from plugins/other/snmp__gwia_bytes_
rename to plugins/snmp/snmp__gwia_bytes_
diff --git a/plugins/groupwise/snmp__gwia_msgs_ b/plugins/snmp/snmp__gwia_msgs_
similarity index 100%
rename from plugins/groupwise/snmp__gwia_msgs_
rename to plugins/snmp/snmp__gwia_msgs_
diff --git a/plugins/groupwise/snmp__gwmta_msgs_ b/plugins/snmp/snmp__gwmta_msgs_
similarity index 100%
rename from plugins/groupwise/snmp__gwmta_msgs_
rename to plugins/snmp/snmp__gwmta_msgs_
diff --git a/plugins/other/snmp__gwpoa_ b/plugins/snmp/snmp__gwpoa_
similarity index 100%
rename from plugins/other/snmp__gwpoa_
rename to plugins/snmp/snmp__gwpoa_
diff --git a/plugins/sensors/snmp__hp_temp b/plugins/snmp/snmp__hp_temp
similarity index 100%
rename from plugins/sensors/snmp__hp_temp
rename to plugins/snmp/snmp__hp_temp
diff --git a/plugins/network/snmp__if_ b/plugins/snmp/snmp__if_
similarity index 100%
rename from plugins/network/snmp__if_
rename to plugins/snmp/snmp__if_
diff --git a/plugins/network/snmp__ifx_ b/plugins/snmp/snmp__ifx_
similarity index 100%
rename from plugins/network/snmp__ifx_
rename to plugins/snmp/snmp__ifx_
diff --git a/plugins/system/snmp__ipoman_ b/plugins/snmp/snmp__ipoman_
similarity index 100%
rename from plugins/system/snmp__ipoman_
rename to plugins/snmp/snmp__ipoman_
diff --git a/plugins/sensors/snmp__linksys_poe b/plugins/snmp/snmp__linksys_poe
similarity index 100%
rename from plugins/sensors/snmp__linksys_poe
rename to plugins/snmp/snmp__linksys_poe
diff --git a/plugins/system/snmp__memory_openwrt b/plugins/snmp/snmp__memory_openwrt
similarity index 100%
rename from plugins/system/snmp__memory_openwrt
rename to plugins/snmp/snmp__memory_openwrt
diff --git a/plugins/system/snmp__memory_win b/plugins/snmp/snmp__memory_win
similarity index 100%
rename from plugins/system/snmp__memory_win
rename to plugins/snmp/snmp__memory_win
diff --git a/plugins/nfs/snmp__netapp_nfs3calls b/plugins/snmp/snmp__netapp_nfs3calls
similarity index 100%
rename from plugins/nfs/snmp__netapp_nfs3calls
rename to plugins/snmp/snmp__netapp_nfs3calls
diff --git a/plugins/sensors/snmp__poseidon-sensors b/plugins/snmp/snmp__poseidon-sensors
similarity index 100%
rename from plugins/sensors/snmp__poseidon-sensors
rename to plugins/snmp/snmp__poseidon-sensors
diff --git a/plugins/sensors/snmp__sfsnmp_fan b/plugins/snmp/snmp__sfsnmp_fan
similarity index 100%
rename from plugins/sensors/snmp__sfsnmp_fan
rename to plugins/snmp/snmp__sfsnmp_fan
diff --git a/plugins/sensors/snmp__sfsnmp_temp b/plugins/snmp/snmp__sfsnmp_temp
similarity index 100%
rename from plugins/sensors/snmp__sfsnmp_temp
rename to plugins/snmp/snmp__sfsnmp_temp
diff --git a/plugins/sensors/snmp__sfsnmp_volt b/plugins/snmp/snmp__sfsnmp_volt
similarity index 100%
rename from plugins/sensors/snmp__sfsnmp_volt
rename to plugins/snmp/snmp__sfsnmp_volt
diff --git a/plugins/sensors/snmp__thecus_fans b/plugins/snmp/snmp__thecus_fans
similarity index 100%
rename from plugins/sensors/snmp__thecus_fans
rename to plugins/snmp/snmp__thecus_fans
diff --git a/plugins/network/snmp__ups2_ b/plugins/snmp/snmp__ups2_
similarity index 100%
rename from plugins/network/snmp__ups2_
rename to plugins/snmp/snmp__ups2_
diff --git a/plugins/system/snmp__ups_ b/plugins/snmp/snmp__ups_
similarity index 100%
rename from plugins/system/snmp__ups_
rename to plugins/snmp/snmp__ups_
diff --git a/plugins/sensors/snmp__ups_battery b/plugins/snmp/snmp__ups_battery
similarity index 100%
rename from plugins/sensors/snmp__ups_battery
rename to plugins/snmp/snmp__ups_battery
diff --git a/plugins/sensors/snmp__ups_temp b/plugins/snmp/snmp__ups_temp
similarity index 100%
rename from plugins/sensors/snmp__ups_temp
rename to plugins/snmp/snmp__ups_temp
diff --git a/plugins/sensors/snmp__ups_voltage b/plugins/snmp/snmp__ups_voltage
similarity index 100%
rename from plugins/sensors/snmp__ups_voltage
rename to plugins/snmp/snmp__ups_voltage
diff --git a/plugins/other/snmp__webthermometer b/plugins/snmp/snmp__webthermometer
similarity index 100%
rename from plugins/other/snmp__webthermometer
rename to plugins/snmp/snmp__webthermometer
diff --git a/plugins/printers/snmp_hplj2015 b/plugins/snmp/snmp_hplj2015
similarity index 100%
rename from plugins/printers/snmp_hplj2015
rename to plugins/snmp/snmp_hplj2015
diff --git a/plugins/printers/snmp_hplj4xxx b/plugins/snmp/snmp_hplj4xxx
similarity index 100%
rename from plugins/printers/snmp_hplj4xxx
rename to plugins/snmp/snmp_hplj4xxx
diff --git a/plugins/system/snmp_memory b/plugins/snmp/snmp_memory
similarity index 100%
rename from plugins/system/snmp_memory
rename to plugins/snmp/snmp_memory
diff --git a/plugins/printers/snmp_xerox3xxx b/plugins/snmp/snmp_xerox3xxx
similarity index 100%
rename from plugins/printers/snmp_xerox3xxx
rename to plugins/snmp/snmp_xerox3xxx
diff --git a/plugins/printers/snmp_xerox_wc-7x32 b/plugins/snmp/snmp_xerox_wc-7x32
similarity index 100%
rename from plugins/printers/snmp_xerox_wc-7x32
rename to plugins/snmp/snmp_xerox_wc-7x32
diff --git a/plugins/system/snmp_zyxel_usg__cpu b/plugins/snmp/snmp_zyxel_usg__cpu
similarity index 100%
rename from plugins/system/snmp_zyxel_usg__cpu
rename to plugins/snmp/snmp_zyxel_usg__cpu
diff --git a/plugins/system/snmp_zyxel_usg__ram b/plugins/snmp/snmp_zyxel_usg__ram
similarity index 100%
rename from plugins/system/snmp_zyxel_usg__ram
rename to plugins/snmp/snmp_zyxel_usg__ram
diff --git a/plugins/system/snmp_zyxel_usg__sessions b/plugins/snmp/snmp_zyxel_usg__sessions
similarity index 100%
rename from plugins/system/snmp_zyxel_usg__sessions
rename to plugins/snmp/snmp_zyxel_usg__sessions
diff --git a/plugins/system/snmp_zyxel_zywall__cpu b/plugins/snmp/snmp_zyxel_zywall__cpu
similarity index 100%
rename from plugins/system/snmp_zyxel_zywall__cpu
rename to plugins/snmp/snmp_zyxel_zywall__cpu
diff --git a/plugins/system/snmp_zyxel_zywall__flash b/plugins/snmp/snmp_zyxel_zywall__flash
similarity index 100%
rename from plugins/system/snmp_zyxel_zywall__flash
rename to plugins/snmp/snmp_zyxel_zywall__flash
diff --git a/plugins/system/snmp_zyxel_zywall__ram b/plugins/snmp/snmp_zyxel_zywall__ram
similarity index 100%
rename from plugins/system/snmp_zyxel_zywall__ram
rename to plugins/snmp/snmp_zyxel_zywall__ram
diff --git a/plugins/system/snmp_zyxel_zywall__sessions b/plugins/snmp/snmp_zyxel_zywall__sessions
similarity index 100%
rename from plugins/system/snmp_zyxel_zywall__sessions
rename to plugins/snmp/snmp_zyxel_zywall__sessions