diff --git a/plugins/pure/pure-ftpd-bw b/plugins/ftp/pure-ftpd-bw
similarity index 100%
rename from plugins/pure/pure-ftpd-bw
rename to plugins/ftp/pure-ftpd-bw
diff --git a/plugins/pure/pure-ftpd-logs b/plugins/ftp/pure-ftpd-logs
similarity index 100%
rename from plugins/pure/pure-ftpd-logs
rename to plugins/ftp/pure-ftpd-logs
diff --git a/plugins/pureftpd/pureftpd_traffic b/plugins/ftp/pureftpd_traffic
similarity index 100%
rename from plugins/pureftpd/pureftpd_traffic
rename to plugins/ftp/pureftpd_traffic
diff --git a/plugins/ssh/openssh-denyhosts b/plugins/network/ssh/openssh-denyhosts
similarity index 100%
rename from plugins/ssh/openssh-denyhosts
rename to plugins/network/ssh/openssh-denyhosts
diff --git a/plugins/network/sshd_invalid_countries b/plugins/network/ssh/sshd_invalid_countries
similarity index 100%
rename from plugins/network/sshd_invalid_countries
rename to plugins/network/ssh/sshd_invalid_countries
diff --git a/plugins/network/sshd_invalid_countries_ruby b/plugins/network/ssh/sshd_invalid_countries_ruby
similarity index 100%
rename from plugins/network/sshd_invalid_countries_ruby
rename to plugins/network/ssh/sshd_invalid_countries_ruby
diff --git a/plugins/power/acpi_batt_ b/plugins/sensors/power/acpi_batt_
similarity index 100%
rename from plugins/power/acpi_batt_
rename to plugins/sensors/power/acpi_batt_
diff --git a/plugins/power/acpi_sys_batt_ b/plugins/sensors/power/acpi_sys_batt_
similarity index 100%
rename from plugins/power/acpi_sys_batt_
rename to plugins/sensors/power/acpi_sys_batt_
diff --git a/plugins/power/batteries b/plugins/sensors/power/batteries
similarity index 100%
rename from plugins/power/batteries
rename to plugins/sensors/power/batteries
diff --git a/plugins/streaming/snmp__wmsconnectedplayers b/plugins/snmp/snmp__wmsconnectedplayers
similarity index 100%
rename from plugins/streaming/snmp__wmsconnectedplayers
rename to plugins/snmp/snmp__wmsconnectedplayers
diff --git a/plugins/streaming/snmp__wmsplayerallocatedbandwidth b/plugins/snmp/snmp__wmsplayerallocatedbandwidth
similarity index 100%
rename from plugins/streaming/snmp__wmsplayerallocatedbandwidth
rename to plugins/snmp/snmp__wmsplayerallocatedbandwidth
diff --git a/plugins/streaming/snmp__wmsstreaminghttpplayers b/plugins/snmp/snmp__wmsstreaminghttpplayers
similarity index 100%
rename from plugins/streaming/snmp__wmsstreaminghttpplayers
rename to plugins/snmp/snmp__wmsstreaminghttpplayers
diff --git a/plugins/streaming/snmp__wmsstreamingmmsplayers b/plugins/snmp/snmp__wmsstreamingmmsplayers
similarity index 100%
rename from plugins/streaming/snmp__wmsstreamingmmsplayers
rename to plugins/snmp/snmp__wmsstreamingmmsplayers
diff --git a/plugins/streaming/snmp__wmsstreamingplayers b/plugins/snmp/snmp__wmsstreamingplayers
similarity index 100%
rename from plugins/streaming/snmp__wmsstreamingplayers
rename to plugins/snmp/snmp__wmsstreamingplayers
diff --git a/plugins/streaming/snmp__wmsstreamingrtspplayers b/plugins/snmp/snmp__wmsstreamingrtspplayers
similarity index 100%
rename from plugins/streaming/snmp__wmsstreamingrtspplayers
rename to plugins/snmp/snmp__wmsstreamingrtspplayers
diff --git a/plugins/stream/icecast2 b/plugins/streaming/icecast2
similarity index 100%
rename from plugins/stream/icecast2
rename to plugins/streaming/icecast2
diff --git a/plugins/icecast/icecast2_ b/plugins/streaming/icecast2_
similarity index 100%
rename from plugins/icecast/icecast2_
rename to plugins/streaming/icecast2_
diff --git a/plugins/icecast/icecast2_all b/plugins/streaming/icecast2_all
similarity index 100%
rename from plugins/icecast/icecast2_all
rename to plugins/streaming/icecast2_all
diff --git a/plugins/icecast/icecast2_simple b/plugins/streaming/icecast2_simple
similarity index 100%
rename from plugins/icecast/icecast2_simple
rename to plugins/streaming/icecast2_simple
diff --git a/plugins/icecast/icecast_ b/plugins/streaming/icecast_
similarity index 100%
rename from plugins/icecast/icecast_
rename to plugins/streaming/icecast_
diff --git a/plugins/shoutcast/shoutcast b/plugins/streaming/shoutcast
similarity index 100%
rename from plugins/shoutcast/shoutcast
rename to plugins/streaming/shoutcast
diff --git a/plugins/shoutcast/shoutcast2_multi b/plugins/streaming/shoutcast2_multi
similarity index 100%
rename from plugins/shoutcast/shoutcast2_multi
rename to plugins/streaming/shoutcast2_multi
diff --git a/plugins/kvm/kvm_cpu b/plugins/virtualization/kvm_cpu
similarity index 100%
rename from plugins/kvm/kvm_cpu
rename to plugins/virtualization/kvm_cpu
diff --git a/plugins/kvm/kvm_io b/plugins/virtualization/kvm_io
similarity index 100%
rename from plugins/kvm/kvm_io
rename to plugins/virtualization/kvm_io
diff --git a/plugins/kvm/kvm_mem b/plugins/virtualization/kvm_mem
similarity index 100%
rename from plugins/kvm/kvm_mem
rename to plugins/virtualization/kvm_mem
diff --git a/plugins/kvm/kvm_net b/plugins/virtualization/kvm_net
similarity index 100%
rename from plugins/kvm/kvm_net
rename to plugins/virtualization/kvm_net
diff --git a/plugins/kvm/munin-libvirtpy b/plugins/virtualization/munin-libvirtpy
similarity index 100%
rename from plugins/kvm/munin-libvirtpy
rename to plugins/virtualization/munin-libvirtpy
diff --git a/plugins/vmware/esx_ b/plugins/virtualization/vmware/esx_
similarity index 100%
rename from plugins/vmware/esx_
rename to plugins/virtualization/vmware/esx_
diff --git a/plugins/vmware/esxi b/plugins/virtualization/vmware/esxi
similarity index 100%
rename from plugins/vmware/esxi
rename to plugins/virtualization/vmware/esxi
diff --git a/plugins/vmware/vm_cpu_load b/plugins/virtualization/vmware/vm_cpu_load
similarity index 100%
rename from plugins/vmware/vm_cpu_load
rename to plugins/virtualization/vmware/vm_cpu_load
diff --git a/plugins/vserver/vserver_jiffies b/plugins/virtualization/vserver/vserver_jiffies
similarity index 100%
rename from plugins/vserver/vserver_jiffies
rename to plugins/virtualization/vserver/vserver_jiffies
diff --git a/plugins/vserver/vserver_limit_hits b/plugins/virtualization/vserver/vserver_limit_hits
similarity index 100%
rename from plugins/vserver/vserver_limit_hits
rename to plugins/virtualization/vserver/vserver_limit_hits
diff --git a/plugins/vserver/vserver_limits b/plugins/virtualization/vserver/vserver_limits
similarity index 100%
rename from plugins/vserver/vserver_limits
rename to plugins/virtualization/vserver/vserver_limits
diff --git a/plugins/xen/xen b/plugins/virtualization/xen
similarity index 100%
rename from plugins/xen/xen
rename to plugins/virtualization/xen
diff --git a/plugins/xen/xen-cpu b/plugins/virtualization/xen-cpu
similarity index 100%
rename from plugins/xen/xen-cpu
rename to plugins/virtualization/xen-cpu
diff --git a/plugins/xen/xen-multi b/plugins/virtualization/xen-multi
similarity index 100%
rename from plugins/xen/xen-multi
rename to plugins/virtualization/xen-multi
diff --git a/plugins/xen/xen_cpu_v2 b/plugins/virtualization/xen_cpu_v2
similarity index 100%
rename from plugins/xen/xen_cpu_v2
rename to plugins/virtualization/xen_cpu_v2
diff --git a/plugins/xen/xen_memory b/plugins/virtualization/xen_memory
similarity index 100%
rename from plugins/xen/xen_memory
rename to plugins/virtualization/xen_memory
diff --git a/plugins/xen/xen_traffic_ b/plugins/virtualization/xen_traffic_
similarity index 100%
rename from plugins/xen/xen_traffic_
rename to plugins/virtualization/xen_traffic_
diff --git a/plugins/xen/xen_traffic_all b/plugins/virtualization/xen_traffic_all
similarity index 100%
rename from plugins/xen/xen_traffic_all
rename to plugins/virtualization/xen_traffic_all
diff --git a/plugins/xen/xen_vbd b/plugins/virtualization/xen_vbd
similarity index 100%
rename from plugins/xen/xen_vbd
rename to plugins/virtualization/xen_vbd
diff --git a/plugins/filesystem/zfs_cache_efficiency b/plugins/zfs/zfs_cache_efficiency
similarity index 100%
rename from plugins/filesystem/zfs_cache_efficiency
rename to plugins/zfs/zfs_cache_efficiency
diff --git a/plugins/filesystem/zfsarcstats-counters b/plugins/zfs/zfsarcstats-counters
similarity index 100%
rename from plugins/filesystem/zfsarcstats-counters
rename to plugins/zfs/zfsarcstats-counters