From 08346aac5839161f64ebcc6ade743f287c8148b0 Mon Sep 17 00:00:00 2001 From: Steve Schnepp Date: Mon, 13 Feb 2012 18:24:46 +0100 Subject: [PATCH] - have some dirs --- plugins/{other => amule}/amule_queue | 0 plugins/{other => amule}/amule_shares | 0 plugins/{other => amule}/amule_transfers | 0 plugins/{other => amule}/amule_uptime | 0 plugins/{other => apache}/apache_activity | 0 .../apache_average_time_last_n_requests | 0 plugins/{other => apache}/apache_request_rate | 0 plugins/{other => apache}/apache_smaps | 0 plugins/{other => apache}/apache_users | 0 plugins/{other => apache}/apache_watch_ | 0 plugins/{other => apache}/eaccelerator | 0 plugins/{other => apache}/http-response-times | 0 plugins/{other => apache}/php-cgi | 0 plugins/{other => apache}/php_eaccelerator | 0 plugins/{other => apache}/php_sessions | 0 plugins/{other => apt}/apt-proxy | 0 plugins/{other => asterisk}/asterisk_inuse | 0 plugins/{other => asterisk}/asterisk_sippeers | 0 plugins/{other => audit}/portaudit | 0 plugins/{other => bacula}/bacula_job | 0 plugins/{other => bacula}/bacula_sd | 0 plugins/{other => boinc}/boinc_credit | 0 plugins/{other => boinc}/boinc_estwk | 0 plugins/{other => boinc}/boinc_projs | 0 plugins/{other => boinc}/boinc_wus | 0 plugins/{other => cacti}/cacti-host | 0 plugins/{other => cacti}/cacti_poller_time | 0 plugins/{other => cacti}/cacti_rrds | 0 plugins/{other => celery}/celery_tasks | 0 plugins/{other => celery}/celery_tasks-2 | 0 plugins/{other => chassis}/dell_fans | 0 .../{other => cherokee}/munin-plugin-for-cherokee | 0 plugins/{other => condor}/condor_activity_ | 0 plugins/{other => condor}/condor_ops_ | 0 plugins/{other => condor}/condor_queue_ | 0 plugins/{other => condor}/condor_states_ | 0 plugins/{other => correo}/dovecot126 | 0 plugins/{other => cpan}/cpanp_o | 0 plugins/{other => currentcost}/currentcost | 0 plugins/{other => cyrus}/cyrus-imapd | 0 plugins/{other => disk}/df_abs_bsd | 0 plugins/{other => disk}/df_bsd | 0 plugins/{other => disk}/df_with_nfs | 0 plugins/{other => disk}/dirsizes | 0 plugins/{other => disk}/du | 0 plugins/{other => disk}/du-2 | 0 plugins/{other => disk}/du_multidirs | 0 plugins/{other => disk}/freedisk | 0 plugins/{other => disk}/iostat | 0 plugins/{other => disk}/iostat-xfrs | 0 plugins/{other => disk}/linux_diskstat_ | 0 plugins/{other => disk}/linux_diskstats_ | 0 plugins/{other => disk}/log_sizes | 0 plugins/{other => disk}/lvm_ | 0 plugins/{other => disk}/lvm_snap_used | 0 plugins/{other => disk}/lvm_usage | 0 plugins/{other => disk}/md_iostat_ | 0 .../{other => disk}/megaraid-controller-information | 0 plugins/{other => disk}/raid | 0 plugins/{other => disk}/raid-mismatch-count | 0 plugins/{other => disk}/scsi_queue | 0 plugins/{other => disk}/smart | 0 plugins/{other => disk}/smart-by-id_ | 0 plugins/{other => disk}/smart_ | 0 plugins/{other => disk}/snmp__netapp_diskusage_ | 0 plugins/{other => disk}/snmp__netapp_inodeusage_ | 0 plugins/{other => disk}/snmp__swap | 0 plugins/{other => disk}/xfs_frag | 0 plugins/{other => drbd}/drbd | 0 plugins/{other => drbd}/drbd-stat | 0 plugins/{other => dspam}/dspam_ | 0 plugins/{other => dspam}/dspam_activity | 0 plugins/{other => dvb}/femon | 0 .../{other => dxtv}/hadoop-under_replicated-blocks | 0 plugins/{other => ejabberd}/ejabberd_ | 0 .../hplog_f-a-hp-proliant-server-fans-speed | 0 .../hplog_t-a-hp-proliant-server-temperatures | 0 .../{other => environmental}/alertme_keyfobsathome | 0 plugins/{other => environmental}/alertme_power | 0 plugins/{other => esx}/esxi | 0 plugins/{other => fax}/faxstat | 0 plugins/{other => filesystem}/zfs_cache_efficiency | 0 plugins/{other => filesystem}/zfsarcstats-counters | 0 plugins/{other => firebird}/firebird | 0 plugins/{other => forum}/vbulletin_users | 0 plugins/{other => forums}/punbb_users | 0 plugins/{other => ftp}/proftpd | 0 plugins/{other => ftp}/proftpd_bytes | 0 plugins/{other => ftp}/proftpd_count | 0 plugins/{other => ftp}/pure-ftpd | 0 plugins/{other => ftp}/pureftpd_count | 0 plugins/{other => ftp}/vsftpd | 0 plugins/{other => ftp}/vsftpd-rel | 0 plugins/{other => funkytown}/denon_x311_volume | 0 plugins/{other => games}/b3error_ | 0 plugins/{other => games}/cstat | 0 plugins/{other => games}/qstat | 0 plugins/{other => games}/qstatet_ | 0 plugins/{other => games}/qstatqw_ | 0 .../{other => geowebcache}/geowebcache-bandwidth | 0 .../{other => geowebcache}/geowebcache-blankitems | 0 .../geowebcache-cache-hits-ratio | 0 plugins/{other => google}/googlecode | 0 plugins/{other => gpu}/nvidia_smi_ | 0 plugins/{other => groupwise}/snmp__gwia_msgs_ | 0 plugins/{other => groupwise}/snmp__gwmta_msgs_ | 0 plugins/{other => hadoop}/hadoop-dfs-plugin | 0 plugins/{other => haproxy}/haproxy-bytes | 0 .../{other => haproxy}/haproxy-connection-errors | 0 plugins/{other => haproxy}/haproxy-downtime | 0 plugins/{other => haproxy}/haproxy-errors | 0 plugins/{other => haproxy}/haproxy-failed-checks | 0 plugins/{other => haproxy}/haproxy-response-errors | 0 plugins/{other => haproxy}/haproxy-sessions | 0 .../{other => haproxy}/haproxy-sessions-by-servers | 0 plugins/{other => hardware}/apc_status | 0 plugins/{other => healthcheck}/healthcheck_log | 0 plugins/{other => healthcheck}/healthcheck_process | 0 plugins/{other => healthcheck}/healthcheck_url | 0 plugins/{other => heimdal}/heimdal_kdc_bandwidth | 0 plugins/{other => heimdal}/heimdal_kdc_requests | 0 plugins/{other => hp2600}/hp2600_count_ | 0 plugins/{other => hp2600}/hp2600_status_ | 0 plugins/{other => http}/http_load_ | 0 plugins/{other => http}/http_request_time | 0 plugins/{other => http}/http_responsetime | 0 plugins/{other => http}/multi_http_responsetime | 0 plugins/{other => http}/speedport_300 | 0 plugins/{other => http}/wget_page | 0 plugins/{other => icecast}/icecast2_ | 0 plugins/{other => icecast}/icecast2_all | 0 plugins/{other => icecast}/icecast2_simple | 0 plugins/{other => icecast}/icecast_ | 0 plugins/{other => ip}/ddclient | 0 plugins/{other => ipmi}/ipmi_ | 0 plugins/{other => joomla}/joomla-sessions | 0 plugins/{other => jvm}/jstat__gccount | 0 plugins/{other => jvm}/jstat__gctime | 0 plugins/{other => jvm}/jstat__heap | 0 plugins/{other => jvm}/jvm_sun_memory | 0 plugins/{other => jvm}/jvm_sun_minorgcs | 0 plugins/{other => jvm}/jvm_sun_tenuredgcs | 0 plugins/{other => kvm}/kvm_cpu | 0 plugins/{other => kvm}/kvm_io | 0 plugins/{other => kvm}/kvm_mem | 0 plugins/{other => kvm}/kvm_net | 0 plugins/{other => kvm}/munin-libvirtpy | 0 plugins/{other => licensing}/flexlm_ | 0 plugins/{other => logins}/logins | 0 plugins/{other => lustre}/lustre_abs | 0 plugins/{other => lustre}/lustre_df | 0 plugins/{other => lustre}/lustre_df_free | 0 plugins/{other => lustre}/lustre_df_indodes | 0 plugins/{other => mail}/amavis_ | 0 plugins/{other => mail}/amavis_awk | 0 plugins/{other => mail}/clamav | 0 plugins/{other => mail}/courier_log | 0 plugins/{other => mail}/dkimproxy_mails | 0 plugins/{other => mail}/mail_connections | 0 plugins/{other => mail}/mixminion | 0 plugins/{other => mail}/postfix-policyd | 0 plugins/{other => mail}/postfix-rbl-blocked-mails | 0 plugins/{other => mail}/postfix_filtered | 0 plugins/{other => mail}/postfix_filtered_awk | 0 plugins/{other => mail}/postfix_mailfiltered | 0 plugins/{other => mail}/postfix_stats | 0 plugins/{other => mail}/postgrey | 0 plugins/{other => mail}/postgrey-new | 0 plugins/{other => mail}/procmail_ | 0 plugins/{other => mail}/qmailconn | 0 plugins/{other => mail}/qmailsend | 0 plugins/{other => mail}/qmailsend_plesk | 0 plugins/{other => mail}/qremote | 0 plugins/{other => mail}/queuestats | 0 plugins/{other => mail}/sa-learn | 0 plugins/{other => mail}/spamd-blacklist-bsd | 0 plugins/{other => mail}/spamd-tarpit-bsd | 0 plugins/{other => mail}/spamdyke | 0 .../{other => mailinglist}/eoc_subscribers_count | 0 plugins/{other => mailman}/mailman_subscribers | 0 .../memcached-multigraph-plugin | 0 plugins/{other => memcached}/memcached_bytes_ | 0 plugins/{other => memcached}/memcached_bytes_all | 0 plugins/{other => memcached}/memcached_connections_ | 0 plugins/{other => memcached}/memcached_hits_ | 0 plugins/{other => memcached}/memcached_items_ | 0 plugins/{other => memcached}/memcached_multi_ | 0 plugins/{other => memcached}/memcached_requests_ | 0 plugins/{other => memcached}/memcached_traffic_ | 0 plugins/{other => memory}/mongrel_memory | 0 plugins/{other => memory}/mongrel_process_memory | 0 plugins/{other => minecraft}/minecraft-users | 0 plugins/{other => moblock}/moblock_connections | 0 plugins/{other => mod_jk}/mod_jk | 0 plugins/{other => mogilefs}/mogilefsd_activity | 0 plugins/{other => mogilefs}/mogilefsd_queries | 0 plugins/{other => mongodb}/mongo_btree | 0 plugins/{other => mongodb}/mongo_conn | 0 plugins/{other => mongodb}/mongo_lock | 0 plugins/{other => mongodb}/mongo_mem | 0 plugins/{other => mongodb}/mongo_ops | 0 plugins/{other => monit}/monit_parser | 0 plugins/{other => mssql}/microsoft-sql | 0 .../microsoft-sql-buffer-cache-hit-ratio | 0 .../{other => mssql}/microsoft-sql-data-file-sizes | 0 .../{other => mssql}/microsoft-sql-log-file-size | 0 plugins/{other => munin}/munin_stats_plugins | 0 plugins/{other => mysql}/mysql_connections | 0 plugins/{other => mysql}/mysql_innodb | 0 plugins/{other => mysql}/mysql_qcache | 0 plugins/{other => mysql}/mysql_qcache_mem | 0 plugins/{other => mysql}/mysql_report | 0 plugins/{other => mysql}/mysql_size_ | 0 plugins/{other => mysql}/mysql_size_all | 0 plugins/{other => mysql}/mysql_slave | 0 plugins/{other => mysql}/mysql_slave_threads | 0 .../{other => mysql_schema_size_}/mysql-schema-size | 0 .../{other => mysql_table_size_}/mysql-table-size | 0 plugins/{other => mythtv}/dvb-signal | 0 plugins/{other => mythtv}/mythtv_programs | 0 plugins/{other => mythtv}/mythtv_status_ | 0 plugins/{other => nagios}/nagiosstatus | 0 plugins/{other => netapp}/netapp_cifs | 0 plugins/{other => netapp}/netapp_cpu_ | 0 plugins/{other => netapp}/netapp_if_ | 0 .../cirix-netscaler-connections | 0 .../{other => netscaler}/cirix-netscaler-cpu-usage | 0 plugins/{other => network}/ag241-adsl | 0 plugins/{other => network}/arp | 0 plugins/{other => network}/avm-fritzbox-wan-traffic | 0 plugins/{other => network}/bandwidth_ | 0 plugins/{other => network}/bind95_ | 0 plugins/{other => network}/bind_ | 0 plugins/{other => network}/brc_rssi | 0 plugins/{other => network}/cisco_bgp_ | 0 plugins/{other => network}/count-me | 0 .../d-link-dir-655-router-statistics-plugin | 0 plugins/{other => network}/dansguardian | 0 plugins/{other => network}/dell_temps | 0 plugins/{other => network}/denyhosts | 0 plugins/{other => network}/dhcp-pool | 0 plugins/{other => network}/dsl-connection-speed | 0 plugins/{other => network}/dsl-stats | 0 plugins/{other => network}/fail2ban | 0 plugins/{other => network}/fail2ban_ | 0 plugins/{other => network}/fail2ban_all_jails | 0 plugins/{other => network}/fms | 0 plugins/{other => network}/fms_apps | 0 plugins/{other => network}/fms_apps_rate | 0 plugins/{other => network}/fwbuilder_ | 0 plugins/{other => network}/hfsc | 0 plugins/{other => network}/hfsc_sep | 0 plugins/{other => network}/host_traffic | 0 plugins/{other => network}/http__tp_link | 0 plugins/{other => network}/http_status | 0 plugins/{other => network}/if_uptime | 0 plugins/{other => network}/ifem_ | 0 plugins/{other => network}/ip6_ | 0 plugins/{other => network}/ip6t_accounting | 0 plugins/{other => network}/ip_forward_ | 0 plugins/{other => network}/iperf_ | 0 plugins/{other => network}/ipfwcnt_ | 0 plugins/{other => network}/ipfwnat_ | 0 plugins/{other => network}/ipt_accounting_ | 0 plugins/{other => network}/ipt_basic_ | 0 plugins/{other => network}/ldap_connections | 0 plugins/{other => network}/multi_tcp_ping | 0 plugins/{other => network}/multiping | 0 plugins/{other => network}/net_hosts_ | 0 plugins/{other => network}/nsd3 | 0 plugins/{other => network}/openvpn_clients | 0 plugins/{other => network}/packetloss | 0 plugins/{other => network}/pf | 0 plugins/{other => network}/pf_bytes | 0 plugins/{other => network}/pf_ipv4_ipv6_packets | 0 plugins/{other => network}/pf_openbsd | 0 plugins/{other => network}/pf_packets | 0 plugins/{other => network}/pf_states | 0 plugins/{other => network}/ping-with-ceil | 0 plugins/{other => network}/ping_host | 0 plugins/{other => network}/pinger | 0 plugins/{other => network}/qos_ | 0 plugins/{other => network}/radio | 0 plugins/{other => network}/shorewall-accounting | 0 plugins/{other => network}/shorewall_ | 0 plugins/{other => network}/shorewall_acc | 0 plugins/{other => network}/smtp_hello_ | 0 plugins/{other => network}/snmp___bri_se_ | 0 plugins/{other => network}/snmp__if_ | 0 plugins/{other => network}/snmp__ifx_ | 0 plugins/{other => network}/snmp__netstat | 0 plugins/{other => network}/snmp__ups2_ | 0 plugins/{other => network}/sockstat | 0 plugins/{other => network}/sockstat-via-procfs | 0 .../{other => network}/speedtest-download-bandwidth | 0 plugins/{other => network}/tc_ | 0 plugins/{other => network}/tc_drops_ | 0 plugins/{other => network}/tc_packets_ | 0 plugins/{other => network}/tcp | 0 plugins/{other => network}/tcp-retransmissions | 0 plugins/{other => network}/tcp-states | 0 plugins/{other => network}/tg585v7__ | 0 plugins/{other => network}/tinydns | 0 plugins/{other => network}/tinydns_err | 0 plugins/{other => network}/tor-bandwidth-usage | 0 plugins/{other => network}/tor_traffic | 0 plugins/{other => network}/transmission | 0 plugins/{other => network}/udp-statistics | 0 plugins/{other => network}/umts_sig | 0 plugins/{other => network}/upnp_router_ | 0 plugins/{other => network}/vnstat | 0 plugins/{other => network}/vnstat_ | 0 plugins/{other => network}/vnstat_month | 0 plugins/{other => network}/wifi_signal | 0 plugins/{other => network}/windows_domain | 0 plugins/{other => network}/zenus_ | 0 plugins/{other => networker}/nsr_device_writing | 0 plugins/{other => nfs}/nfs4_client | 0 plugins/{other => nfs}/nfsv4 | 0 plugins/{other => nfs}/snmp__netapp_nfs3calls | 0 plugins/{other => nginx}/nginx-cache-hit-rate | 0 plugins/{other => nginx}/nginx-combined | 0 plugins/{other => nginx}/nginx_connection_request | 0 plugins/{other => nginx}/nginx_memory | 0 plugins/{other => nginx}/nginx_request | 0 plugins/{other => nginx}/nginx_status | 0 plugins/{other => nginx}/nginx_vhost_traffic | 0 plugins/{other => nginx}/ngnix_memory | 0 plugins/{other => nginx}/php5-fpm_status | 0 plugins/{other => noaaport}/novra_s300 | 0 plugins/{other => ntp}/chrony | 0 plugins/{other => ntp}/ntp_peers_ipv6 | 0 plugins/{other => ntp}/ntp_queries | 0 plugins/{other => openldap}/slapd_ | 0 plugins/{other => openldap}/slapd_bdb_cache_ | 0 plugins/{other => openvpn}/openvpn_multi | 0 plugins/{other => openvz}/openvz-load-avg | 0 plugins/{other => openvz}/openvz_ | 0 plugins/{other => openvz}/openvzcpu | 0 plugins/{other => oracle}/oracle-pga-monitor | 0 plugins/{other => oracle}/oracle-sga | 0 plugins/{other => oracle}/oracle__connections | 0 plugins/{other => oracle}/oracle__database_hitratio | 0 plugins/{other => oracle}/oracle__locks | 0 plugins/{other => oracle}/oracle__tablespace_usage | 0 plugins/{other => oracle}/oracle_connections | 0 plugins/{other => oracle}/oracle_sysmetricspl | 0 plugins/{other => ossec}/ossec-active-response | 0 plugins/{other => ossec}/ossec-agents | 0 plugins/{other => ossec}/ossec-alerts | 0 plugins/{other => passenger}/passenger_status | 0 plugins/{other => pdns}/pdns_rec_answers | 0 plugins/{other => pdns}/pdns_rec_cache | 0 plugins/{other => pdns}/pdns_rec_cache_size | 0 plugins/{other => pdns}/pdns_rec_concurrent | 0 plugins/{other => pdns}/pdns_rec_issues | 0 plugins/{other => pdns}/pdns_rec_outqueries | 0 plugins/{other => pdns}/pdns_rec_querylatency | 0 plugins/{other => pdns}/pdns_rec_questions | 0 plugins/{other => pdns}/pdns_rec_throttle | 0 plugins/{other => pdns}/pdns_rec_unauth | 0 plugins/{other => php}/eaccelerator-python | 0 plugins/{other => php}/eaccelerator-usage | 0 plugins/{other => php}/php-fastcgi | 0 plugins/{other => php}/php-fcgi | 0 plugins/{other => php}/php_apc_ | Bin plugins/{other => php}/php_xcache | 0 plugins/{other => postfix}/amavis-debian | 0 plugins/{other => postfix}/greyfix | 0 plugins/{other => postfix}/postfix-queue-size | 0 plugins/{other => postfix}/postfix_mail_stats | 0 plugins/{other => postfix}/postfix_mailstats | 0 plugins/{other => postgresql}/pg__connections | 0 plugins/{other => postgresql}/postgres_block_read_ | 0 plugins/{other => postgresql}/postgres_locks | 0 plugins/{other => postgresql}/postgres_queries2_ | 0 plugins/{other => postgresql}/postgres_space_ | 0 .../postgresql-multigraph-munin-plugin | 0 .../postgresql_active_backends | 0 .../{other => postgresql}/postgresql_active_locks | 0 .../{other => postgresql}/postgresql_database_ratio | 0 .../{other => postgresql}/postgresql_database_size | 0 .../postgresql_tablespace_size | 0 .../{other => postgresql}/postgresql_transactions | 0 plugins/{other => postgresql}/slony_ | 0 plugins/{other => power}/acpi_batt_ | 0 plugins/{other => power}/acpi_sys_batt_ | 0 plugins/{other => power}/pdns_errors | 0 plugins/{other => power}/pdns_latency | 0 plugins/{other => power}/pdns_qsize | 0 plugins/{other => power}/pdns_queries | 0 plugins/{other => power}/pdns_rel | 0 plugins/{other => power5}/consumed_cpu_cycles | 0 plugins/{other => power5}/cpu_entitlemens | 0 plugins/{other => power5}/cpu_in_lpar | 0 plugins/{other => power5}/weight_of_a_lpar | 0 plugins/{other => powermta}/pmta_ | 0 plugins/{other => powermta}/powermta_vmta_recpients | 0 .../{other => print}/printer-ink-levels-by-percent | 0 plugins/{other => printer}/dell_5310n_health_ | 0 plugins/{other => printer}/dell_5310n_pages_ | 0 plugins/{other => printer}/oki_c5500_health_ | 0 plugins/{other => printer}/oki_c5500_pages_ | 0 .../toshiba_5520c_byfunction_black_ | 0 .../toshiba_5520c_byfunction_fullcolor_ | 0 .../toshiba_5520c_byfunction_twincolor_ | 0 plugins/{other => printer}/toshiba_5520c_print_ | 0 plugins/{other => printer}/toshiba_5520c_scan_ | 0 plugins/{other => printers}/snmp_hplj2015 | 0 plugins/{other => printers}/snmp_hplj4xxx | 0 plugins/{other => printers}/snmp_xerox3xxx | 0 plugins/{other => printers}/snmp_xerox_wc-7x32 | 0 plugins/{other => printers}/xerox-wc3220 | 0 .../{other => printers}/xerox-wc7232-consumables | 0 plugins/{other => processes}/cpuload_ | 0 plugins/{other => processes}/cpuutil | 0 plugins/{other => processes}/multicpu | 0 plugins/{other => processes}/multimemory | 0 plugins/{other => processes}/multips | 0 plugins/{other => processes}/multipsu | 0 plugins/{other => processes}/proc_mem | 0 plugins/{other => processes}/process_count | 0 plugins/{other => processes}/process_cpushare | 0 plugins/{other => processes}/processes | 0 plugins/{other => processes}/vserver_procs | 0 plugins/{other => programmes}/stats_apache2 | 0 plugins/{other => prosody}/prosody | 0 plugins/{other => puppet}/puppetmaster | 0 plugins/{other => pure}/pure-ftpd-bw | 0 plugins/{other => pure}/pure-ftpd-logs | 0 plugins/{other => pureftpd}/pureftpd_traffic | 0 plugins/{other => qpsmtpd}/qpsmtpd_mailstats | 0 plugins/{other => rabbitmq}/rabbitmq-connections | 0 plugins/{other => rabbitmq}/rabbitmq-consumers | 0 plugins/{other => rabbitmq}/rabbitmq-messages | 0 .../rabbitmq-messages_unacknowledged | 0 plugins/{other => rabbitmq}/rabbitmq-queue_memory | 0 plugins/{other => rabbitmq}/rabbitmq-throughput | 0 plugins/{other => rabbitmq}/rabbitmq_list_queues | 0 plugins/{other => radiator}/radiator_acct_lag | 0 plugins/{other => radiator}/radiator_acct_ppm | 0 plugins/{other => radiator}/radiator_auth_lag | 0 plugins/{other => radiator}/radiator_auth_ppm | 0 plugins/{other => redis}/redis | 0 plugins/{other => redis}/redis-speed | 0 .../{other => requesttracker}/rt_ticket_loadtime | 0 plugins/{other => riak}/riak_memory | 0 plugins/{other => riak}/riak_node | 0 plugins/{other => rsync}/rsyncd_bytes | 0 plugins/{other => rsync}/rsyncd_count | 0 plugins/{other => rtorrent}/rtom_mem | 0 plugins/{other => rtorrent}/rtom_peers | 0 plugins/{other => rtorrent}/rtom_spdd | 0 plugins/{other => rtorrent}/rtom_vol | 0 plugins/{other => s3}/s3_items | 0 plugins/{other => s3}/s3_storage | 0 plugins/{other => samba}/samba_locked | 0 plugins/{other => samba}/samba_users | 0 plugins/{other => san}/fc-switch-ports | 0 plugins/{other => scalix}/scalix_clients | 0 plugins/{other => scalix}/scalix_indexwork | 0 plugins/{other => scalix}/scalix_processes | 0 plugins/{other => scalix}/scalix_queues | 0 plugins/{other => security}/forefront_ | 0 plugins/{other => sensor}/sequoia_websens | 0 plugins/{other => sensors}/acpi-battery | 0 plugins/{other => sensors}/cleware | 0 plugins/{other => sensors}/coretemp | 0 plugins/{other => sensors}/cpu_tmp_sensors | 0 plugins/{other => sensors}/cputemp | 0 plugins/{other => sensors}/esxi__sensors | 0 plugins/{other => sensors}/fbdimm_temp | 0 plugins/{other => sensors}/freeipmi_ | 0 plugins/{other => sensors}/hddtemp | 0 plugins/{other => sensors}/hddtemp_smartctl | 0 plugins/{other => sensors}/hpasmcli2_ | 0 plugins/{other => sensors}/humidity-sensor | 0 plugins/{other => sensors}/ip_thermo_125 | 0 plugins/{other => sensors}/ipmi_fans | 0 plugins/{other => sensors}/ipmi_therm | 0 plugins/{other => sensors}/ipmisens-v3 | 0 plugins/{other => sensors}/ipmitool_sensor_ | 0 plugins/{other => sensors}/k8temp | 0 plugins/{other => sensors}/mbmon | 0 .../megaraid-hdd-temperature-using-megacli | 0 plugins/{other => sensors}/nut | 0 plugins/{other => sensors}/nutups2_ | 0 plugins/{other => sensors}/nvclock | 0 plugins/{other => sensors}/omreport_fan_speed | 0 plugins/{other => sensors}/omreport_pwrmon_current | 0 plugins/{other => sensors}/omreport_pwrmon_power | 0 plugins/{other => sensors}/omreport_storage_temp | 0 plugins/{other => sensors}/omreport_temp | 0 plugins/{other => sensors}/room_alert_ | 0 plugins/{other => sensors}/snmp__hp_temp | 0 plugins/{other => sensors}/snmp__linksys_poe | 0 plugins/{other => sensors}/snmp__sfsnmp_fan | 0 plugins/{other => sensors}/snmp__sfsnmp_temp | 0 plugins/{other => sensors}/snmp__sfsnmp_volt | 0 plugins/{other => sensors}/snmp__ups_battery | 0 plugins/{other => sensors}/snmp__ups_temp | 0 plugins/{other => sensors}/snmp__ups_voltage | 0 plugins/{other => sensors}/temperature_ | 0 plugins/{other => sensors}/temperatures | 0 plugins/{other => sensors}/w1-therm | 0 plugins/{other => sensors}/weather_ | 0 plugins/{other => sensors}/wfrog | 0 plugins/{other => services}/hostdenied | 0 plugins/{other => services}/ircd | 0 plugins/{other => sge}/sge_queue_ | 0 plugins/{other => shoutcast}/shoutcast | 0 plugins/{other => slony}/slony_lag_events_ | 0 plugins/{other => slony}/slony_lag_time | 0 plugins/{other => slony}/slony_lag_time_ | 0 plugins/{other => smstools}/smstools_ | 0 plugins/{other => snmp}/snmp_hp_ | 0 plugins/{other => solr}/solr | 0 plugins/{other => solr}/solr-stats | 0 plugins/{other => solr}/solrmulticore | 0 plugins/{other => sourceds}/srcds_cpu | 0 plugins/{other => sourceds}/srcds_fps | 0 plugins/{other => sourceds}/srcds_inout | 0 plugins/{other => sourceds}/srcds_players | 0 plugins/{other => sourceds}/srcds_uptime | 0 plugins/{other => spotweb}/spotweb_average | 0 plugins/{other => spotweb}/spotweb_cat_average | 0 plugins/{other => spotweb}/spotweb_cat_total | 0 plugins/{other => spotweb}/spotweb_catsize_average | 0 plugins/{other => spotweb}/spotweb_total | 0 plugins/{other => squeezebox}/squeezebox_multi | 0 plugins/{other => squid}/squid_efficiency | 0 plugins/{other => squid}/squid_times | 0 plugins/{other => ssh}/openssh-denyhosts | 0 plugins/{other => stream}/icecast2 | 0 plugins/{other => streamid_}/shoutcast2_multi | 0 .../{other => streaming}/snmp__wmsconnectedplayers | 0 .../snmp__wmsplayerallocatedbandwidth | 0 .../snmp__wmsstreaminghttpplayers | 0 .../snmp__wmsstreamingmmsplayers | 0 .../{other => streaming}/snmp__wmsstreamingplayers | 0 .../snmp__wmsstreamingrtspplayers | 0 plugins/{other => system}/auth | 0 plugins/{other => system}/bgpd | 0 plugins/{other => system}/blockhosts | 0 plugins/{other => system}/buddyinfo | 0 plugins/{other => system}/cpu-usage-by-process | 0 plugins/{other => system}/cpu_by_process | 0 plugins/{other => system}/cpubyuser | 0 plugins/{other => system}/cpufreq | 0 plugins/{other => system}/cpufreq-avg | 0 plugins/{other => system}/cpufreq-info | 0 plugins/{other => system}/cpufreq_ | 0 plugins/{other => system}/cpuspeed | 0 plugins/{other => system}/cpuspeed2 | 0 plugins/{other => system}/cpuspeed_sane | 0 plugins/{other => system}/dar_cpuusage | 0 plugins/{other => system}/dar_memusage | 0 plugins/{other => system}/dar_swap | 0 plugins/{other => system}/dar_uptime | 0 plugins/{other => system}/dar_vmstat | 0 plugins/{other => system}/debsecan | 0 plugins/{other => system}/hostsdeny | 0 plugins/{other => system}/ibmfan | 0 plugins/{other => system}/iostat-cputps-average | 0 plugins/{other => system}/ipmi_sdr_ | 0 plugins/{other => system}/kmemsum | 0 plugins/{other => system}/load_extended | 0 plugins/{other => system}/lpar_cpu | 0 plugins/{other => system}/memory_by_process | 0 plugins/{other => system}/openbsd-memory | 0 plugins/{other => system}/openbsd-swap | 0 plugins/{other => system}/proc_memory_status | 0 plugins/{other => system}/quagga_routes | 0 plugins/{other => system}/raminfo | 0 plugins/{other => system}/read_serial_temperature | 0 plugins/{other => system}/selinux_avcstat | 0 plugins/{other => system}/selinux_avcstats | 0 plugins/{other => system}/snmp__cpu | 0 plugins/{other => system}/snmp__cpu_usage | 0 plugins/{other => system}/snmp__fn | 0 plugins/{other => system}/snmp__ipoman_ | 0 plugins/{other => system}/snmp__memory_openwrt | 0 plugins/{other => system}/snmp__memory_win | 0 plugins/{other => system}/snmp__ups_ | 0 plugins/{other => system}/snmp__uptime | 0 plugins/{other => system}/snmp_memory | 0 plugins/{other => system}/snmp_zyxel_usg__cpu | 0 plugins/{other => system}/snmp_zyxel_usg__ram | 0 plugins/{other => system}/snmp_zyxel_usg__sessions | 0 plugins/{other => system}/snmp_zyxel_zywall__cpu | 0 plugins/{other => system}/snmp_zyxel_zywall__flash | 0 plugins/{other => system}/snmp_zyxel_zywall__ram | 0 .../{other => system}/snmp_zyxel_zywall__sessions | 0 plugins/{other => system}/solaris-memstat | 0 plugins/{other => system}/sshd_invalid_countries | 0 .../{other => system}/sshd_invalid_countries_ruby | 0 plugins/{other => system}/swapspace-info | 0 plugins/{other => system}/systat | 0 plugins/{other => system}/system_users | 0 plugins/{other => system}/top-free-memory | 0 plugins/{other => system}/top-memory | 0 plugins/{other => system}/uptime | 0 plugins/{other => system}/uptime_bsd | 0 plugins/{other => system}/users | 0 plugins/{other => system}/usersv2 | 0 plugins/{other => system}/vpsmem | 0 plugins/{other => system}/zones_cpu | 0 plugins/{other => system}/zones_mem | 0 plugins/{other => teamspeak}/teamspeak_user | 0 plugins/{other => teamspeak}/ts3v2_ | 0 plugins/{other => teamspeak}/tsuser | 0 plugins/{other => thin}/thin_memory | 0 plugins/{other => thin}/thin_threads | 0 plugins/{other => thin}/thins_peak_memory | 0 plugins/{other => time}/freeboxuptime | 0 plugins/{other => time}/ntp_peers | 0 plugins/{other => tomcat}/jvm-memory | 0 plugins/{other => tomcat}/jvm-thread-info | 0 plugins/{other => tomcat}/tomcat | 0 plugins/{other => tomcat}/tomcat_ | 0 plugins/{other => tomcat}/tomcatthreads | 0 plugins/{other => tor}/tor-connections | 0 plugins/{other => tor}/tor-traffic | 0 plugins/{other => tor}/tor_routers | 0 plugins/{other => trafic_ro}/trafic_ro_24h | 0 plugins/{other => tv}/hdhomerun_ | 0 plugins/{other => ubuntu}/ubuntu-mirrors | 0 plugins/{other => ultramonkey}/ultramonkey-l7 | 0 plugins/{other => unicorn}/unicorn_memory_status | 0 plugins/{other => unicorn}/unicorn_status | 0 plugins/{other => ups}/apc__snmp_ | 0 plugins/{other => ups}/apc_pdu_load | 0 plugins/{other => ups}/apcupsd_pct | 0 plugins/{other => ups}/apcupsd_ww | 0 plugins/{other => ups}/snmp__apcpdu | 0 plugins/{other => varnish}/varnish2_ | 0 plugins/{other => varnish}/varnish_ | 0 plugins/{other => varnish}/varnish_allocated | 0 plugins/{other => varnish}/varnish_cachehitratio | 0 plugins/{other => varnish}/varnish_healthy_backends | 0 plugins/{other => varnish}/varnish_hitrate | 0 plugins/{other => varnish}/varnish_total_objects | 0 plugins/{other => vdr}/vdr_ | 0 plugins/{other => virtualization}/libvirt | 0 plugins/{other => vmware}/vm_cpu_load | 0 plugins/{other => voip}/murmur_ice_users | 0 plugins/{other => voip}/murmur_users | 0 .../murmurice_host_port_id_description | 0 .../murmurice_host_port_id_description_avg | 0 plugins/{other => voip}/zapchans | 0 plugins/{other => vserver}/vserver_cpu_ | 0 plugins/{other => vserver}/vserver_jiffies | 0 plugins/{other => vserver}/vserver_limit_hits | 0 plugins/{other => vserver}/vserver_limits | 0 plugins/{other => vserver}/vserver_loadavg | 0 plugins/{other => vserver}/vserver_resources | 0 plugins/{other => weather}/buienradar_ | 0 plugins/{other => weather}/weather_press_ | 0 plugins/{other => weather}/weather_temp_ | 0 plugins/{other => websphere}/webspherelogin | 0 plugins/{other => wiki}/mediawiki | 0 plugins/{other => wiki}/moinoin_pages | 0 plugins/{other => wowza}/wowza-media-server | 0 plugins/{other => wuala}/wuala_stats | 0 plugins/{other => xbnbt}/xbnbt_peers | 0 plugins/{other => xen}/xen | 0 plugins/{other => xen}/xen-cpu | 0 plugins/{other => xen}/xen-multi | 0 plugins/{other => xen}/xen_cpu_v2 | 0 plugins/{other => xen}/xen_memory | 0 plugins/{other => xen}/xen_traffic_ | 0 plugins/{other => xen}/xen_traffic_all | 0 plugins/{other => xen}/xen_vbd | 0 plugins/{other => yacy}/yacy | 0 plugins/{other => zeo}/zeo_monitor_ | 0 plugins/{other => zeo}/zeomonitor | 0 plugins/{other => zfs}/zfs-filesystem-graph | 0 plugins/{other => zfs}/zfs-statistics-for-freebsd | Bin .../zfs-stats-for-freebsd-arc-efficiency | 0 .../zfs-stats-for-freebsd-arc-utilization | 0 .../zfs-stats-for-freebsd-cache-hits-by-cache-list | 0 .../zfs-stats-for-freebsd-cache-hits-by-data-type | 0 .../zfs-stats-for-freebsd-dmu-prefetch | 0 plugins/{other => zfs}/zlist | 0 plugins/{other => zfs}/zpool_iostat | 0 plugins/{other => zimbra}/zimbra-mailboxsizes | 0 plugins/{other => zope}/zope_conflict_errors | 0 687 files changed, 0 insertions(+), 0 deletions(-) rename plugins/{other => amule}/amule_queue (100%) rename plugins/{other => amule}/amule_shares (100%) rename plugins/{other => amule}/amule_transfers (100%) rename plugins/{other => amule}/amule_uptime (100%) rename plugins/{other => apache}/apache_activity (100%) rename plugins/{other => apache}/apache_average_time_last_n_requests (100%) rename plugins/{other => apache}/apache_request_rate (100%) rename plugins/{other => apache}/apache_smaps (100%) rename plugins/{other => apache}/apache_users (100%) rename plugins/{other => apache}/apache_watch_ (100%) rename plugins/{other => apache}/eaccelerator (100%) rename plugins/{other => apache}/http-response-times (100%) rename plugins/{other => apache}/php-cgi (100%) rename plugins/{other => apache}/php_eaccelerator (100%) rename plugins/{other => apache}/php_sessions (100%) rename plugins/{other => apt}/apt-proxy (100%) rename plugins/{other => asterisk}/asterisk_inuse (100%) rename plugins/{other => asterisk}/asterisk_sippeers (100%) rename plugins/{other => audit}/portaudit (100%) rename plugins/{other => bacula}/bacula_job (100%) rename plugins/{other => bacula}/bacula_sd (100%) rename plugins/{other => boinc}/boinc_credit (100%) rename plugins/{other => boinc}/boinc_estwk (100%) rename plugins/{other => boinc}/boinc_projs (100%) rename plugins/{other => boinc}/boinc_wus (100%) rename plugins/{other => cacti}/cacti-host (100%) rename plugins/{other => cacti}/cacti_poller_time (100%) rename plugins/{other => cacti}/cacti_rrds (100%) rename plugins/{other => celery}/celery_tasks (100%) rename plugins/{other => celery}/celery_tasks-2 (100%) rename plugins/{other => chassis}/dell_fans (100%) rename plugins/{other => cherokee}/munin-plugin-for-cherokee (100%) rename plugins/{other => condor}/condor_activity_ (100%) rename plugins/{other => condor}/condor_ops_ (100%) rename plugins/{other => condor}/condor_queue_ (100%) rename plugins/{other => condor}/condor_states_ (100%) rename plugins/{other => correo}/dovecot126 (100%) rename plugins/{other => cpan}/cpanp_o (100%) rename plugins/{other => currentcost}/currentcost (100%) rename plugins/{other => cyrus}/cyrus-imapd (100%) rename plugins/{other => disk}/df_abs_bsd (100%) rename plugins/{other => disk}/df_bsd (100%) rename plugins/{other => disk}/df_with_nfs (100%) rename plugins/{other => disk}/dirsizes (100%) rename plugins/{other => disk}/du (100%) rename plugins/{other => disk}/du-2 (100%) rename plugins/{other => disk}/du_multidirs (100%) rename plugins/{other => disk}/freedisk (100%) rename plugins/{other => disk}/iostat (100%) rename plugins/{other => disk}/iostat-xfrs (100%) rename plugins/{other => disk}/linux_diskstat_ (100%) rename plugins/{other => disk}/linux_diskstats_ (100%) rename plugins/{other => disk}/log_sizes (100%) rename plugins/{other => disk}/lvm_ (100%) rename plugins/{other => disk}/lvm_snap_used (100%) rename plugins/{other => disk}/lvm_usage (100%) rename plugins/{other => disk}/md_iostat_ (100%) rename plugins/{other => disk}/megaraid-controller-information (100%) rename plugins/{other => disk}/raid (100%) rename plugins/{other => disk}/raid-mismatch-count (100%) rename plugins/{other => disk}/scsi_queue (100%) rename plugins/{other => disk}/smart (100%) rename plugins/{other => disk}/smart-by-id_ (100%) rename plugins/{other => disk}/smart_ (100%) rename plugins/{other => disk}/snmp__netapp_diskusage_ (100%) rename plugins/{other => disk}/snmp__netapp_inodeusage_ (100%) rename plugins/{other => disk}/snmp__swap (100%) rename plugins/{other => disk}/xfs_frag (100%) rename plugins/{other => drbd}/drbd (100%) rename plugins/{other => drbd}/drbd-stat (100%) rename plugins/{other => dspam}/dspam_ (100%) rename plugins/{other => dspam}/dspam_activity (100%) rename plugins/{other => dvb}/femon (100%) rename plugins/{other => dxtv}/hadoop-under_replicated-blocks (100%) rename plugins/{other => ejabberd}/ejabberd_ (100%) rename plugins/{other => environment}/hplog_f-a-hp-proliant-server-fans-speed (100%) rename plugins/{other => environment}/hplog_t-a-hp-proliant-server-temperatures (100%) rename plugins/{other => environmental}/alertme_keyfobsathome (100%) rename plugins/{other => environmental}/alertme_power (100%) rename plugins/{other => esx}/esxi (100%) rename plugins/{other => fax}/faxstat (100%) rename plugins/{other => filesystem}/zfs_cache_efficiency (100%) rename plugins/{other => filesystem}/zfsarcstats-counters (100%) rename plugins/{other => firebird}/firebird (100%) rename plugins/{other => forum}/vbulletin_users (100%) rename plugins/{other => forums}/punbb_users (100%) rename plugins/{other => ftp}/proftpd (100%) rename plugins/{other => ftp}/proftpd_bytes (100%) rename plugins/{other => ftp}/proftpd_count (100%) rename plugins/{other => ftp}/pure-ftpd (100%) rename plugins/{other => ftp}/pureftpd_count (100%) rename plugins/{other => ftp}/vsftpd (100%) rename plugins/{other => ftp}/vsftpd-rel (100%) rename plugins/{other => funkytown}/denon_x311_volume (100%) rename plugins/{other => games}/b3error_ (100%) rename plugins/{other => games}/cstat (100%) rename plugins/{other => games}/qstat (100%) rename plugins/{other => games}/qstatet_ (100%) rename plugins/{other => games}/qstatqw_ (100%) rename plugins/{other => geowebcache}/geowebcache-bandwidth (100%) rename plugins/{other => geowebcache}/geowebcache-blankitems (100%) rename plugins/{other => geowebcache}/geowebcache-cache-hits-ratio (100%) rename plugins/{other => google}/googlecode (100%) rename plugins/{other => gpu}/nvidia_smi_ (100%) rename plugins/{other => groupwise}/snmp__gwia_msgs_ (100%) rename plugins/{other => groupwise}/snmp__gwmta_msgs_ (100%) rename plugins/{other => hadoop}/hadoop-dfs-plugin (100%) rename plugins/{other => haproxy}/haproxy-bytes (100%) rename plugins/{other => haproxy}/haproxy-connection-errors (100%) rename plugins/{other => haproxy}/haproxy-downtime (100%) rename plugins/{other => haproxy}/haproxy-errors (100%) rename plugins/{other => haproxy}/haproxy-failed-checks (100%) rename plugins/{other => haproxy}/haproxy-response-errors (100%) rename plugins/{other => haproxy}/haproxy-sessions (100%) rename plugins/{other => haproxy}/haproxy-sessions-by-servers (100%) rename plugins/{other => hardware}/apc_status (100%) rename plugins/{other => healthcheck}/healthcheck_log (100%) rename plugins/{other => healthcheck}/healthcheck_process (100%) rename plugins/{other => healthcheck}/healthcheck_url (100%) rename plugins/{other => heimdal}/heimdal_kdc_bandwidth (100%) rename plugins/{other => heimdal}/heimdal_kdc_requests (100%) rename plugins/{other => hp2600}/hp2600_count_ (100%) rename plugins/{other => hp2600}/hp2600_status_ (100%) rename plugins/{other => http}/http_load_ (100%) rename plugins/{other => http}/http_request_time (100%) rename plugins/{other => http}/http_responsetime (100%) rename plugins/{other => http}/multi_http_responsetime (100%) rename plugins/{other => http}/speedport_300 (100%) rename plugins/{other => http}/wget_page (100%) rename plugins/{other => icecast}/icecast2_ (100%) rename plugins/{other => icecast}/icecast2_all (100%) rename plugins/{other => icecast}/icecast2_simple (100%) rename plugins/{other => icecast}/icecast_ (100%) rename plugins/{other => ip}/ddclient (100%) rename plugins/{other => ipmi}/ipmi_ (100%) rename plugins/{other => joomla}/joomla-sessions (100%) rename plugins/{other => jvm}/jstat__gccount (100%) rename plugins/{other => jvm}/jstat__gctime (100%) rename plugins/{other => jvm}/jstat__heap (100%) rename plugins/{other => jvm}/jvm_sun_memory (100%) rename plugins/{other => jvm}/jvm_sun_minorgcs (100%) rename plugins/{other => jvm}/jvm_sun_tenuredgcs (100%) rename plugins/{other => kvm}/kvm_cpu (100%) rename plugins/{other => kvm}/kvm_io (100%) rename plugins/{other => kvm}/kvm_mem (100%) rename plugins/{other => kvm}/kvm_net (100%) rename plugins/{other => kvm}/munin-libvirtpy (100%) rename plugins/{other => licensing}/flexlm_ (100%) rename plugins/{other => logins}/logins (100%) rename plugins/{other => lustre}/lustre_abs (100%) rename plugins/{other => lustre}/lustre_df (100%) rename plugins/{other => lustre}/lustre_df_free (100%) rename plugins/{other => lustre}/lustre_df_indodes (100%) rename plugins/{other => mail}/amavis_ (100%) rename plugins/{other => mail}/amavis_awk (100%) rename plugins/{other => mail}/clamav (100%) rename plugins/{other => mail}/courier_log (100%) rename plugins/{other => mail}/dkimproxy_mails (100%) rename plugins/{other => mail}/mail_connections (100%) rename plugins/{other => mail}/mixminion (100%) rename plugins/{other => mail}/postfix-policyd (100%) rename plugins/{other => mail}/postfix-rbl-blocked-mails (100%) rename plugins/{other => mail}/postfix_filtered (100%) rename plugins/{other => mail}/postfix_filtered_awk (100%) rename plugins/{other => mail}/postfix_mailfiltered (100%) rename plugins/{other => mail}/postfix_stats (100%) rename plugins/{other => mail}/postgrey (100%) rename plugins/{other => mail}/postgrey-new (100%) rename plugins/{other => mail}/procmail_ (100%) rename plugins/{other => mail}/qmailconn (100%) rename plugins/{other => mail}/qmailsend (100%) rename plugins/{other => mail}/qmailsend_plesk (100%) rename plugins/{other => mail}/qremote (100%) rename plugins/{other => mail}/queuestats (100%) rename plugins/{other => mail}/sa-learn (100%) rename plugins/{other => mail}/spamd-blacklist-bsd (100%) rename plugins/{other => mail}/spamd-tarpit-bsd (100%) rename plugins/{other => mail}/spamdyke (100%) rename plugins/{other => mailinglist}/eoc_subscribers_count (100%) rename plugins/{other => mailman}/mailman_subscribers (100%) rename plugins/{other => memcached}/memcached-multigraph-plugin (100%) rename plugins/{other => memcached}/memcached_bytes_ (100%) rename plugins/{other => memcached}/memcached_bytes_all (100%) rename plugins/{other => memcached}/memcached_connections_ (100%) rename plugins/{other => memcached}/memcached_hits_ (100%) rename plugins/{other => memcached}/memcached_items_ (100%) rename plugins/{other => memcached}/memcached_multi_ (100%) rename plugins/{other => memcached}/memcached_requests_ (100%) rename plugins/{other => memcached}/memcached_traffic_ (100%) rename plugins/{other => memory}/mongrel_memory (100%) rename plugins/{other => memory}/mongrel_process_memory (100%) rename plugins/{other => minecraft}/minecraft-users (100%) rename plugins/{other => moblock}/moblock_connections (100%) rename plugins/{other => mod_jk}/mod_jk (100%) rename plugins/{other => mogilefs}/mogilefsd_activity (100%) rename plugins/{other => mogilefs}/mogilefsd_queries (100%) rename plugins/{other => mongodb}/mongo_btree (100%) rename plugins/{other => mongodb}/mongo_conn (100%) rename plugins/{other => mongodb}/mongo_lock (100%) rename plugins/{other => mongodb}/mongo_mem (100%) rename plugins/{other => mongodb}/mongo_ops (100%) rename plugins/{other => monit}/monit_parser (100%) rename plugins/{other => mssql}/microsoft-sql (100%) rename plugins/{other => mssql}/microsoft-sql-buffer-cache-hit-ratio (100%) rename plugins/{other => mssql}/microsoft-sql-data-file-sizes (100%) rename plugins/{other => mssql}/microsoft-sql-log-file-size (100%) rename plugins/{other => munin}/munin_stats_plugins (100%) rename plugins/{other => mysql}/mysql_connections (100%) rename plugins/{other => mysql}/mysql_innodb (100%) rename plugins/{other => mysql}/mysql_qcache (100%) rename plugins/{other => mysql}/mysql_qcache_mem (100%) rename plugins/{other => mysql}/mysql_report (100%) rename plugins/{other => mysql}/mysql_size_ (100%) rename plugins/{other => mysql}/mysql_size_all (100%) rename plugins/{other => mysql}/mysql_slave (100%) rename plugins/{other => mysql}/mysql_slave_threads (100%) rename plugins/{other => mysql_schema_size_}/mysql-schema-size (100%) rename plugins/{other => mysql_table_size_}/mysql-table-size (100%) rename plugins/{other => mythtv}/dvb-signal (100%) rename plugins/{other => mythtv}/mythtv_programs (100%) rename plugins/{other => mythtv}/mythtv_status_ (100%) rename plugins/{other => nagios}/nagiosstatus (100%) rename plugins/{other => netapp}/netapp_cifs (100%) rename plugins/{other => netapp}/netapp_cpu_ (100%) rename plugins/{other => netapp}/netapp_if_ (100%) rename plugins/{other => netscaler}/cirix-netscaler-connections (100%) rename plugins/{other => netscaler}/cirix-netscaler-cpu-usage (100%) rename plugins/{other => network}/ag241-adsl (100%) rename plugins/{other => network}/arp (100%) rename plugins/{other => network}/avm-fritzbox-wan-traffic (100%) rename plugins/{other => network}/bandwidth_ (100%) rename plugins/{other => network}/bind95_ (100%) rename plugins/{other => network}/bind_ (100%) rename plugins/{other => network}/brc_rssi (100%) rename plugins/{other => network}/cisco_bgp_ (100%) rename plugins/{other => network}/count-me (100%) rename plugins/{other => network}/d-link-dir-655-router-statistics-plugin (100%) rename plugins/{other => network}/dansguardian (100%) rename plugins/{other => network}/dell_temps (100%) rename plugins/{other => network}/denyhosts (100%) rename plugins/{other => network}/dhcp-pool (100%) rename plugins/{other => network}/dsl-connection-speed (100%) rename plugins/{other => network}/dsl-stats (100%) rename plugins/{other => network}/fail2ban (100%) rename plugins/{other => network}/fail2ban_ (100%) rename plugins/{other => network}/fail2ban_all_jails (100%) rename plugins/{other => network}/fms (100%) rename plugins/{other => network}/fms_apps (100%) rename plugins/{other => network}/fms_apps_rate (100%) rename plugins/{other => network}/fwbuilder_ (100%) rename plugins/{other => network}/hfsc (100%) rename plugins/{other => network}/hfsc_sep (100%) rename plugins/{other => network}/host_traffic (100%) rename plugins/{other => network}/http__tp_link (100%) rename plugins/{other => network}/http_status (100%) rename plugins/{other => network}/if_uptime (100%) rename plugins/{other => network}/ifem_ (100%) rename plugins/{other => network}/ip6_ (100%) rename plugins/{other => network}/ip6t_accounting (100%) rename plugins/{other => network}/ip_forward_ (100%) rename plugins/{other => network}/iperf_ (100%) rename plugins/{other => network}/ipfwcnt_ (100%) rename plugins/{other => network}/ipfwnat_ (100%) rename plugins/{other => network}/ipt_accounting_ (100%) rename plugins/{other => network}/ipt_basic_ (100%) rename plugins/{other => network}/ldap_connections (100%) rename plugins/{other => network}/multi_tcp_ping (100%) rename plugins/{other => network}/multiping (100%) rename plugins/{other => network}/net_hosts_ (100%) rename plugins/{other => network}/nsd3 (100%) rename plugins/{other => network}/openvpn_clients (100%) rename plugins/{other => network}/packetloss (100%) rename plugins/{other => network}/pf (100%) rename plugins/{other => network}/pf_bytes (100%) rename plugins/{other => network}/pf_ipv4_ipv6_packets (100%) rename plugins/{other => network}/pf_openbsd (100%) rename plugins/{other => network}/pf_packets (100%) rename plugins/{other => network}/pf_states (100%) rename plugins/{other => network}/ping-with-ceil (100%) rename plugins/{other => network}/ping_host (100%) rename plugins/{other => network}/pinger (100%) rename plugins/{other => network}/qos_ (100%) rename plugins/{other => network}/radio (100%) rename plugins/{other => network}/shorewall-accounting (100%) rename plugins/{other => network}/shorewall_ (100%) rename plugins/{other => network}/shorewall_acc (100%) rename plugins/{other => network}/smtp_hello_ (100%) rename plugins/{other => network}/snmp___bri_se_ (100%) rename plugins/{other => network}/snmp__if_ (100%) rename plugins/{other => network}/snmp__ifx_ (100%) rename plugins/{other => network}/snmp__netstat (100%) rename plugins/{other => network}/snmp__ups2_ (100%) rename plugins/{other => network}/sockstat (100%) rename plugins/{other => network}/sockstat-via-procfs (100%) rename plugins/{other => network}/speedtest-download-bandwidth (100%) rename plugins/{other => network}/tc_ (100%) rename plugins/{other => network}/tc_drops_ (100%) rename plugins/{other => network}/tc_packets_ (100%) rename plugins/{other => network}/tcp (100%) rename plugins/{other => network}/tcp-retransmissions (100%) rename plugins/{other => network}/tcp-states (100%) rename plugins/{other => network}/tg585v7__ (100%) rename plugins/{other => network}/tinydns (100%) rename plugins/{other => network}/tinydns_err (100%) rename plugins/{other => network}/tor-bandwidth-usage (100%) rename plugins/{other => network}/tor_traffic (100%) rename plugins/{other => network}/transmission (100%) rename plugins/{other => network}/udp-statistics (100%) rename plugins/{other => network}/umts_sig (100%) rename plugins/{other => network}/upnp_router_ (100%) rename plugins/{other => network}/vnstat (100%) rename plugins/{other => network}/vnstat_ (100%) rename plugins/{other => network}/vnstat_month (100%) rename plugins/{other => network}/wifi_signal (100%) rename plugins/{other => network}/windows_domain (100%) rename plugins/{other => network}/zenus_ (100%) rename plugins/{other => networker}/nsr_device_writing (100%) rename plugins/{other => nfs}/nfs4_client (100%) rename plugins/{other => nfs}/nfsv4 (100%) rename plugins/{other => nfs}/snmp__netapp_nfs3calls (100%) rename plugins/{other => nginx}/nginx-cache-hit-rate (100%) rename plugins/{other => nginx}/nginx-combined (100%) rename plugins/{other => nginx}/nginx_connection_request (100%) rename plugins/{other => nginx}/nginx_memory (100%) rename plugins/{other => nginx}/nginx_request (100%) rename plugins/{other => nginx}/nginx_status (100%) rename plugins/{other => nginx}/nginx_vhost_traffic (100%) rename plugins/{other => nginx}/ngnix_memory (100%) rename plugins/{other => nginx}/php5-fpm_status (100%) rename plugins/{other => noaaport}/novra_s300 (100%) rename plugins/{other => ntp}/chrony (100%) rename plugins/{other => ntp}/ntp_peers_ipv6 (100%) rename plugins/{other => ntp}/ntp_queries (100%) rename plugins/{other => openldap}/slapd_ (100%) rename plugins/{other => openldap}/slapd_bdb_cache_ (100%) rename plugins/{other => openvpn}/openvpn_multi (100%) rename plugins/{other => openvz}/openvz-load-avg (100%) rename plugins/{other => openvz}/openvz_ (100%) rename plugins/{other => openvz}/openvzcpu (100%) rename plugins/{other => oracle}/oracle-pga-monitor (100%) rename plugins/{other => oracle}/oracle-sga (100%) rename plugins/{other => oracle}/oracle__connections (100%) rename plugins/{other => oracle}/oracle__database_hitratio (100%) rename plugins/{other => oracle}/oracle__locks (100%) rename plugins/{other => oracle}/oracle__tablespace_usage (100%) rename plugins/{other => oracle}/oracle_connections (100%) rename plugins/{other => oracle}/oracle_sysmetricspl (100%) rename plugins/{other => ossec}/ossec-active-response (100%) rename plugins/{other => ossec}/ossec-agents (100%) rename plugins/{other => ossec}/ossec-alerts (100%) rename plugins/{other => passenger}/passenger_status (100%) rename plugins/{other => pdns}/pdns_rec_answers (100%) rename plugins/{other => pdns}/pdns_rec_cache (100%) rename plugins/{other => pdns}/pdns_rec_cache_size (100%) rename plugins/{other => pdns}/pdns_rec_concurrent (100%) rename plugins/{other => pdns}/pdns_rec_issues (100%) rename plugins/{other => pdns}/pdns_rec_outqueries (100%) rename plugins/{other => pdns}/pdns_rec_querylatency (100%) rename plugins/{other => pdns}/pdns_rec_questions (100%) rename plugins/{other => pdns}/pdns_rec_throttle (100%) rename plugins/{other => pdns}/pdns_rec_unauth (100%) rename plugins/{other => php}/eaccelerator-python (100%) rename plugins/{other => php}/eaccelerator-usage (100%) rename plugins/{other => php}/php-fastcgi (100%) rename plugins/{other => php}/php-fcgi (100%) rename plugins/{other => php}/php_apc_ (100%) rename plugins/{other => php}/php_xcache (100%) rename plugins/{other => postfix}/amavis-debian (100%) rename plugins/{other => postfix}/greyfix (100%) rename plugins/{other => postfix}/postfix-queue-size (100%) rename plugins/{other => postfix}/postfix_mail_stats (100%) rename plugins/{other => postfix}/postfix_mailstats (100%) rename plugins/{other => postgresql}/pg__connections (100%) rename plugins/{other => postgresql}/postgres_block_read_ (100%) rename plugins/{other => postgresql}/postgres_locks (100%) rename plugins/{other => postgresql}/postgres_queries2_ (100%) rename plugins/{other => postgresql}/postgres_space_ (100%) rename plugins/{other => postgresql}/postgresql-multigraph-munin-plugin (100%) rename plugins/{other => postgresql}/postgresql_active_backends (100%) rename plugins/{other => postgresql}/postgresql_active_locks (100%) rename plugins/{other => postgresql}/postgresql_database_ratio (100%) rename plugins/{other => postgresql}/postgresql_database_size (100%) rename plugins/{other => postgresql}/postgresql_tablespace_size (100%) rename plugins/{other => postgresql}/postgresql_transactions (100%) rename plugins/{other => postgresql}/slony_ (100%) rename plugins/{other => power}/acpi_batt_ (100%) rename plugins/{other => power}/acpi_sys_batt_ (100%) rename plugins/{other => power}/pdns_errors (100%) rename plugins/{other => power}/pdns_latency (100%) rename plugins/{other => power}/pdns_qsize (100%) rename plugins/{other => power}/pdns_queries (100%) rename plugins/{other => power}/pdns_rel (100%) rename plugins/{other => power5}/consumed_cpu_cycles (100%) rename plugins/{other => power5}/cpu_entitlemens (100%) rename plugins/{other => power5}/cpu_in_lpar (100%) rename plugins/{other => power5}/weight_of_a_lpar (100%) rename plugins/{other => powermta}/pmta_ (100%) rename plugins/{other => powermta}/powermta_vmta_recpients (100%) rename plugins/{other => print}/printer-ink-levels-by-percent (100%) rename plugins/{other => printer}/dell_5310n_health_ (100%) rename plugins/{other => printer}/dell_5310n_pages_ (100%) rename plugins/{other => printer}/oki_c5500_health_ (100%) rename plugins/{other => printer}/oki_c5500_pages_ (100%) rename plugins/{other => printer}/toshiba_5520c_byfunction_black_ (100%) rename plugins/{other => printer}/toshiba_5520c_byfunction_fullcolor_ (100%) rename plugins/{other => printer}/toshiba_5520c_byfunction_twincolor_ (100%) rename plugins/{other => printer}/toshiba_5520c_print_ (100%) rename plugins/{other => printer}/toshiba_5520c_scan_ (100%) rename plugins/{other => printers}/snmp_hplj2015 (100%) rename plugins/{other => printers}/snmp_hplj4xxx (100%) rename plugins/{other => printers}/snmp_xerox3xxx (100%) rename plugins/{other => printers}/snmp_xerox_wc-7x32 (100%) rename plugins/{other => printers}/xerox-wc3220 (100%) rename plugins/{other => printers}/xerox-wc7232-consumables (100%) rename plugins/{other => processes}/cpuload_ (100%) rename plugins/{other => processes}/cpuutil (100%) rename plugins/{other => processes}/multicpu (100%) rename plugins/{other => processes}/multimemory (100%) rename plugins/{other => processes}/multips (100%) rename plugins/{other => processes}/multipsu (100%) rename plugins/{other => processes}/proc_mem (100%) rename plugins/{other => processes}/process_count (100%) rename plugins/{other => processes}/process_cpushare (100%) rename plugins/{other => processes}/processes (100%) rename plugins/{other => processes}/vserver_procs (100%) rename plugins/{other => programmes}/stats_apache2 (100%) rename plugins/{other => prosody}/prosody (100%) rename plugins/{other => puppet}/puppetmaster (100%) rename plugins/{other => pure}/pure-ftpd-bw (100%) rename plugins/{other => pure}/pure-ftpd-logs (100%) rename plugins/{other => pureftpd}/pureftpd_traffic (100%) rename plugins/{other => qpsmtpd}/qpsmtpd_mailstats (100%) rename plugins/{other => rabbitmq}/rabbitmq-connections (100%) rename plugins/{other => rabbitmq}/rabbitmq-consumers (100%) rename plugins/{other => rabbitmq}/rabbitmq-messages (100%) rename plugins/{other => rabbitmq}/rabbitmq-messages_unacknowledged (100%) rename plugins/{other => rabbitmq}/rabbitmq-queue_memory (100%) rename plugins/{other => rabbitmq}/rabbitmq-throughput (100%) rename plugins/{other => rabbitmq}/rabbitmq_list_queues (100%) rename plugins/{other => radiator}/radiator_acct_lag (100%) rename plugins/{other => radiator}/radiator_acct_ppm (100%) rename plugins/{other => radiator}/radiator_auth_lag (100%) rename plugins/{other => radiator}/radiator_auth_ppm (100%) rename plugins/{other => redis}/redis (100%) rename plugins/{other => redis}/redis-speed (100%) rename plugins/{other => requesttracker}/rt_ticket_loadtime (100%) rename plugins/{other => riak}/riak_memory (100%) rename plugins/{other => riak}/riak_node (100%) rename plugins/{other => rsync}/rsyncd_bytes (100%) rename plugins/{other => rsync}/rsyncd_count (100%) rename plugins/{other => rtorrent}/rtom_mem (100%) rename plugins/{other => rtorrent}/rtom_peers (100%) rename plugins/{other => rtorrent}/rtom_spdd (100%) rename plugins/{other => rtorrent}/rtom_vol (100%) rename plugins/{other => s3}/s3_items (100%) rename plugins/{other => s3}/s3_storage (100%) rename plugins/{other => samba}/samba_locked (100%) rename plugins/{other => samba}/samba_users (100%) rename plugins/{other => san}/fc-switch-ports (100%) rename plugins/{other => scalix}/scalix_clients (100%) rename plugins/{other => scalix}/scalix_indexwork (100%) rename plugins/{other => scalix}/scalix_processes (100%) rename plugins/{other => scalix}/scalix_queues (100%) rename plugins/{other => security}/forefront_ (100%) rename plugins/{other => sensor}/sequoia_websens (100%) rename plugins/{other => sensors}/acpi-battery (100%) rename plugins/{other => sensors}/cleware (100%) rename plugins/{other => sensors}/coretemp (100%) rename plugins/{other => sensors}/cpu_tmp_sensors (100%) rename plugins/{other => sensors}/cputemp (100%) rename plugins/{other => sensors}/esxi__sensors (100%) rename plugins/{other => sensors}/fbdimm_temp (100%) rename plugins/{other => sensors}/freeipmi_ (100%) rename plugins/{other => sensors}/hddtemp (100%) rename plugins/{other => sensors}/hddtemp_smartctl (100%) rename plugins/{other => sensors}/hpasmcli2_ (100%) rename plugins/{other => sensors}/humidity-sensor (100%) rename plugins/{other => sensors}/ip_thermo_125 (100%) rename plugins/{other => sensors}/ipmi_fans (100%) rename plugins/{other => sensors}/ipmi_therm (100%) rename plugins/{other => sensors}/ipmisens-v3 (100%) rename plugins/{other => sensors}/ipmitool_sensor_ (100%) rename plugins/{other => sensors}/k8temp (100%) rename plugins/{other => sensors}/mbmon (100%) rename plugins/{other => sensors}/megaraid-hdd-temperature-using-megacli (100%) rename plugins/{other => sensors}/nut (100%) rename plugins/{other => sensors}/nutups2_ (100%) rename plugins/{other => sensors}/nvclock (100%) rename plugins/{other => sensors}/omreport_fan_speed (100%) rename plugins/{other => sensors}/omreport_pwrmon_current (100%) rename plugins/{other => sensors}/omreport_pwrmon_power (100%) rename plugins/{other => sensors}/omreport_storage_temp (100%) rename plugins/{other => sensors}/omreport_temp (100%) rename plugins/{other => sensors}/room_alert_ (100%) rename plugins/{other => sensors}/snmp__hp_temp (100%) rename plugins/{other => sensors}/snmp__linksys_poe (100%) rename plugins/{other => sensors}/snmp__sfsnmp_fan (100%) rename plugins/{other => sensors}/snmp__sfsnmp_temp (100%) rename plugins/{other => sensors}/snmp__sfsnmp_volt (100%) rename plugins/{other => sensors}/snmp__ups_battery (100%) rename plugins/{other => sensors}/snmp__ups_temp (100%) rename plugins/{other => sensors}/snmp__ups_voltage (100%) rename plugins/{other => sensors}/temperature_ (100%) rename plugins/{other => sensors}/temperatures (100%) rename plugins/{other => sensors}/w1-therm (100%) rename plugins/{other => sensors}/weather_ (100%) rename plugins/{other => sensors}/wfrog (100%) rename plugins/{other => services}/hostdenied (100%) rename plugins/{other => services}/ircd (100%) rename plugins/{other => sge}/sge_queue_ (100%) rename plugins/{other => shoutcast}/shoutcast (100%) rename plugins/{other => slony}/slony_lag_events_ (100%) rename plugins/{other => slony}/slony_lag_time (100%) rename plugins/{other => slony}/slony_lag_time_ (100%) rename plugins/{other => smstools}/smstools_ (100%) rename plugins/{other => snmp}/snmp_hp_ (100%) rename plugins/{other => solr}/solr (100%) rename plugins/{other => solr}/solr-stats (100%) rename plugins/{other => solr}/solrmulticore (100%) rename plugins/{other => sourceds}/srcds_cpu (100%) rename plugins/{other => sourceds}/srcds_fps (100%) rename plugins/{other => sourceds}/srcds_inout (100%) rename plugins/{other => sourceds}/srcds_players (100%) rename plugins/{other => sourceds}/srcds_uptime (100%) rename plugins/{other => spotweb}/spotweb_average (100%) rename plugins/{other => spotweb}/spotweb_cat_average (100%) rename plugins/{other => spotweb}/spotweb_cat_total (100%) rename plugins/{other => spotweb}/spotweb_catsize_average (100%) rename plugins/{other => spotweb}/spotweb_total (100%) rename plugins/{other => squeezebox}/squeezebox_multi (100%) rename plugins/{other => squid}/squid_efficiency (100%) rename plugins/{other => squid}/squid_times (100%) rename plugins/{other => ssh}/openssh-denyhosts (100%) rename plugins/{other => stream}/icecast2 (100%) rename plugins/{other => streamid_}/shoutcast2_multi (100%) rename plugins/{other => streaming}/snmp__wmsconnectedplayers (100%) rename plugins/{other => streaming}/snmp__wmsplayerallocatedbandwidth (100%) rename plugins/{other => streaming}/snmp__wmsstreaminghttpplayers (100%) rename plugins/{other => streaming}/snmp__wmsstreamingmmsplayers (100%) rename plugins/{other => streaming}/snmp__wmsstreamingplayers (100%) rename plugins/{other => streaming}/snmp__wmsstreamingrtspplayers (100%) rename plugins/{other => system}/auth (100%) rename plugins/{other => system}/bgpd (100%) rename plugins/{other => system}/blockhosts (100%) rename plugins/{other => system}/buddyinfo (100%) rename plugins/{other => system}/cpu-usage-by-process (100%) rename plugins/{other => system}/cpu_by_process (100%) rename plugins/{other => system}/cpubyuser (100%) rename plugins/{other => system}/cpufreq (100%) rename plugins/{other => system}/cpufreq-avg (100%) rename plugins/{other => system}/cpufreq-info (100%) rename plugins/{other => system}/cpufreq_ (100%) rename plugins/{other => system}/cpuspeed (100%) rename plugins/{other => system}/cpuspeed2 (100%) rename plugins/{other => system}/cpuspeed_sane (100%) rename plugins/{other => system}/dar_cpuusage (100%) rename plugins/{other => system}/dar_memusage (100%) rename plugins/{other => system}/dar_swap (100%) rename plugins/{other => system}/dar_uptime (100%) rename plugins/{other => system}/dar_vmstat (100%) rename plugins/{other => system}/debsecan (100%) rename plugins/{other => system}/hostsdeny (100%) rename plugins/{other => system}/ibmfan (100%) rename plugins/{other => system}/iostat-cputps-average (100%) rename plugins/{other => system}/ipmi_sdr_ (100%) rename plugins/{other => system}/kmemsum (100%) rename plugins/{other => system}/load_extended (100%) rename plugins/{other => system}/lpar_cpu (100%) rename plugins/{other => system}/memory_by_process (100%) rename plugins/{other => system}/openbsd-memory (100%) rename plugins/{other => system}/openbsd-swap (100%) rename plugins/{other => system}/proc_memory_status (100%) rename plugins/{other => system}/quagga_routes (100%) rename plugins/{other => system}/raminfo (100%) rename plugins/{other => system}/read_serial_temperature (100%) rename plugins/{other => system}/selinux_avcstat (100%) rename plugins/{other => system}/selinux_avcstats (100%) rename plugins/{other => system}/snmp__cpu (100%) rename plugins/{other => system}/snmp__cpu_usage (100%) rename plugins/{other => system}/snmp__fn (100%) rename plugins/{other => system}/snmp__ipoman_ (100%) rename plugins/{other => system}/snmp__memory_openwrt (100%) rename plugins/{other => system}/snmp__memory_win (100%) rename plugins/{other => system}/snmp__ups_ (100%) rename plugins/{other => system}/snmp__uptime (100%) rename plugins/{other => system}/snmp_memory (100%) rename plugins/{other => system}/snmp_zyxel_usg__cpu (100%) rename plugins/{other => system}/snmp_zyxel_usg__ram (100%) rename plugins/{other => system}/snmp_zyxel_usg__sessions (100%) rename plugins/{other => system}/snmp_zyxel_zywall__cpu (100%) rename plugins/{other => system}/snmp_zyxel_zywall__flash (100%) rename plugins/{other => system}/snmp_zyxel_zywall__ram (100%) rename plugins/{other => system}/snmp_zyxel_zywall__sessions (100%) rename plugins/{other => system}/solaris-memstat (100%) rename plugins/{other => system}/sshd_invalid_countries (100%) rename plugins/{other => system}/sshd_invalid_countries_ruby (100%) rename plugins/{other => system}/swapspace-info (100%) rename plugins/{other => system}/systat (100%) rename plugins/{other => system}/system_users (100%) rename plugins/{other => system}/top-free-memory (100%) rename plugins/{other => system}/top-memory (100%) rename plugins/{other => system}/uptime (100%) rename plugins/{other => system}/uptime_bsd (100%) rename plugins/{other => system}/users (100%) rename plugins/{other => system}/usersv2 (100%) rename plugins/{other => system}/vpsmem (100%) rename plugins/{other => system}/zones_cpu (100%) rename plugins/{other => system}/zones_mem (100%) rename plugins/{other => teamspeak}/teamspeak_user (100%) rename plugins/{other => teamspeak}/ts3v2_ (100%) rename plugins/{other => teamspeak}/tsuser (100%) rename plugins/{other => thin}/thin_memory (100%) rename plugins/{other => thin}/thin_threads (100%) rename plugins/{other => thin}/thins_peak_memory (100%) rename plugins/{other => time}/freeboxuptime (100%) rename plugins/{other => time}/ntp_peers (100%) rename plugins/{other => tomcat}/jvm-memory (100%) rename plugins/{other => tomcat}/jvm-thread-info (100%) rename plugins/{other => tomcat}/tomcat (100%) rename plugins/{other => tomcat}/tomcat_ (100%) rename plugins/{other => tomcat}/tomcatthreads (100%) rename plugins/{other => tor}/tor-connections (100%) rename plugins/{other => tor}/tor-traffic (100%) rename plugins/{other => tor}/tor_routers (100%) rename plugins/{other => trafic_ro}/trafic_ro_24h (100%) rename plugins/{other => tv}/hdhomerun_ (100%) rename plugins/{other => ubuntu}/ubuntu-mirrors (100%) rename plugins/{other => ultramonkey}/ultramonkey-l7 (100%) rename plugins/{other => unicorn}/unicorn_memory_status (100%) rename plugins/{other => unicorn}/unicorn_status (100%) rename plugins/{other => ups}/apc__snmp_ (100%) rename plugins/{other => ups}/apc_pdu_load (100%) rename plugins/{other => ups}/apcupsd_pct (100%) rename plugins/{other => ups}/apcupsd_ww (100%) rename plugins/{other => ups}/snmp__apcpdu (100%) rename plugins/{other => varnish}/varnish2_ (100%) rename plugins/{other => varnish}/varnish_ (100%) rename plugins/{other => varnish}/varnish_allocated (100%) rename plugins/{other => varnish}/varnish_cachehitratio (100%) rename plugins/{other => varnish}/varnish_healthy_backends (100%) rename plugins/{other => varnish}/varnish_hitrate (100%) rename plugins/{other => varnish}/varnish_total_objects (100%) rename plugins/{other => vdr}/vdr_ (100%) rename plugins/{other => virtualization}/libvirt (100%) rename plugins/{other => vmware}/vm_cpu_load (100%) rename plugins/{other => voip}/murmur_ice_users (100%) rename plugins/{other => voip}/murmur_users (100%) rename plugins/{other => voip}/murmurice_host_port_id_description (100%) rename plugins/{other => voip}/murmurice_host_port_id_description_avg (100%) rename plugins/{other => voip}/zapchans (100%) rename plugins/{other => vserver}/vserver_cpu_ (100%) rename plugins/{other => vserver}/vserver_jiffies (100%) rename plugins/{other => vserver}/vserver_limit_hits (100%) rename plugins/{other => vserver}/vserver_limits (100%) rename plugins/{other => vserver}/vserver_loadavg (100%) rename plugins/{other => vserver}/vserver_resources (100%) rename plugins/{other => weather}/buienradar_ (100%) rename plugins/{other => weather}/weather_press_ (100%) rename plugins/{other => weather}/weather_temp_ (100%) rename plugins/{other => websphere}/webspherelogin (100%) rename plugins/{other => wiki}/mediawiki (100%) rename plugins/{other => wiki}/moinoin_pages (100%) rename plugins/{other => wowza}/wowza-media-server (100%) rename plugins/{other => wuala}/wuala_stats (100%) rename plugins/{other => xbnbt}/xbnbt_peers (100%) rename plugins/{other => xen}/xen (100%) rename plugins/{other => xen}/xen-cpu (100%) rename plugins/{other => xen}/xen-multi (100%) rename plugins/{other => xen}/xen_cpu_v2 (100%) rename plugins/{other => xen}/xen_memory (100%) rename plugins/{other => xen}/xen_traffic_ (100%) rename plugins/{other => xen}/xen_traffic_all (100%) rename plugins/{other => xen}/xen_vbd (100%) rename plugins/{other => yacy}/yacy (100%) rename plugins/{other => zeo}/zeo_monitor_ (100%) rename plugins/{other => zeo}/zeomonitor (100%) rename plugins/{other => zfs}/zfs-filesystem-graph (100%) rename plugins/{other => zfs}/zfs-statistics-for-freebsd (100%) rename plugins/{other => zfs}/zfs-stats-for-freebsd-arc-efficiency (100%) rename plugins/{other => zfs}/zfs-stats-for-freebsd-arc-utilization (100%) rename plugins/{other => zfs}/zfs-stats-for-freebsd-cache-hits-by-cache-list (100%) rename plugins/{other => zfs}/zfs-stats-for-freebsd-cache-hits-by-data-type (100%) rename plugins/{other => zfs}/zfs-stats-for-freebsd-dmu-prefetch (100%) rename plugins/{other => zfs}/zlist (100%) rename plugins/{other => zfs}/zpool_iostat (100%) rename plugins/{other => zimbra}/zimbra-mailboxsizes (100%) rename plugins/{other => zope}/zope_conflict_errors (100%) diff --git a/plugins/other/amule_queue b/plugins/amule/amule_queue similarity index 100% rename from plugins/other/amule_queue rename to plugins/amule/amule_queue diff --git a/plugins/other/amule_shares b/plugins/amule/amule_shares similarity index 100% rename from plugins/other/amule_shares rename to plugins/amule/amule_shares diff --git a/plugins/other/amule_transfers b/plugins/amule/amule_transfers similarity index 100% rename from plugins/other/amule_transfers rename to plugins/amule/amule_transfers diff --git a/plugins/other/amule_uptime b/plugins/amule/amule_uptime similarity index 100% rename from plugins/other/amule_uptime rename to plugins/amule/amule_uptime diff --git a/plugins/other/apache_activity b/plugins/apache/apache_activity similarity index 100% rename from plugins/other/apache_activity rename to plugins/apache/apache_activity diff --git a/plugins/other/apache_average_time_last_n_requests b/plugins/apache/apache_average_time_last_n_requests similarity index 100% rename from plugins/other/apache_average_time_last_n_requests rename to plugins/apache/apache_average_time_last_n_requests diff --git a/plugins/other/apache_request_rate b/plugins/apache/apache_request_rate similarity index 100% rename from plugins/other/apache_request_rate rename to plugins/apache/apache_request_rate diff --git a/plugins/other/apache_smaps b/plugins/apache/apache_smaps similarity index 100% rename from plugins/other/apache_smaps rename to plugins/apache/apache_smaps diff --git a/plugins/other/apache_users b/plugins/apache/apache_users similarity index 100% rename from plugins/other/apache_users rename to plugins/apache/apache_users diff --git a/plugins/other/apache_watch_ b/plugins/apache/apache_watch_ similarity index 100% rename from plugins/other/apache_watch_ rename to plugins/apache/apache_watch_ diff --git a/plugins/other/eaccelerator b/plugins/apache/eaccelerator similarity index 100% rename from plugins/other/eaccelerator rename to plugins/apache/eaccelerator diff --git a/plugins/other/http-response-times b/plugins/apache/http-response-times similarity index 100% rename from plugins/other/http-response-times rename to plugins/apache/http-response-times diff --git a/plugins/other/php-cgi b/plugins/apache/php-cgi similarity index 100% rename from plugins/other/php-cgi rename to plugins/apache/php-cgi diff --git a/plugins/other/php_eaccelerator b/plugins/apache/php_eaccelerator similarity index 100% rename from plugins/other/php_eaccelerator rename to plugins/apache/php_eaccelerator diff --git a/plugins/other/php_sessions b/plugins/apache/php_sessions similarity index 100% rename from plugins/other/php_sessions rename to plugins/apache/php_sessions diff --git a/plugins/other/apt-proxy b/plugins/apt/apt-proxy similarity index 100% rename from plugins/other/apt-proxy rename to plugins/apt/apt-proxy diff --git a/plugins/other/asterisk_inuse b/plugins/asterisk/asterisk_inuse similarity index 100% rename from plugins/other/asterisk_inuse rename to plugins/asterisk/asterisk_inuse diff --git a/plugins/other/asterisk_sippeers b/plugins/asterisk/asterisk_sippeers similarity index 100% rename from plugins/other/asterisk_sippeers rename to plugins/asterisk/asterisk_sippeers diff --git a/plugins/other/portaudit b/plugins/audit/portaudit similarity index 100% rename from plugins/other/portaudit rename to plugins/audit/portaudit diff --git a/plugins/other/bacula_job b/plugins/bacula/bacula_job similarity index 100% rename from plugins/other/bacula_job rename to plugins/bacula/bacula_job diff --git a/plugins/other/bacula_sd b/plugins/bacula/bacula_sd similarity index 100% rename from plugins/other/bacula_sd rename to plugins/bacula/bacula_sd diff --git a/plugins/other/boinc_credit b/plugins/boinc/boinc_credit similarity index 100% rename from plugins/other/boinc_credit rename to plugins/boinc/boinc_credit diff --git a/plugins/other/boinc_estwk b/plugins/boinc/boinc_estwk similarity index 100% rename from plugins/other/boinc_estwk rename to plugins/boinc/boinc_estwk diff --git a/plugins/other/boinc_projs b/plugins/boinc/boinc_projs similarity index 100% rename from plugins/other/boinc_projs rename to plugins/boinc/boinc_projs diff --git a/plugins/other/boinc_wus b/plugins/boinc/boinc_wus similarity index 100% rename from plugins/other/boinc_wus rename to plugins/boinc/boinc_wus diff --git a/plugins/other/cacti-host b/plugins/cacti/cacti-host similarity index 100% rename from plugins/other/cacti-host rename to plugins/cacti/cacti-host diff --git a/plugins/other/cacti_poller_time b/plugins/cacti/cacti_poller_time similarity index 100% rename from plugins/other/cacti_poller_time rename to plugins/cacti/cacti_poller_time diff --git a/plugins/other/cacti_rrds b/plugins/cacti/cacti_rrds similarity index 100% rename from plugins/other/cacti_rrds rename to plugins/cacti/cacti_rrds diff --git a/plugins/other/celery_tasks b/plugins/celery/celery_tasks similarity index 100% rename from plugins/other/celery_tasks rename to plugins/celery/celery_tasks diff --git a/plugins/other/celery_tasks-2 b/plugins/celery/celery_tasks-2 similarity index 100% rename from plugins/other/celery_tasks-2 rename to plugins/celery/celery_tasks-2 diff --git a/plugins/other/dell_fans b/plugins/chassis/dell_fans similarity index 100% rename from plugins/other/dell_fans rename to plugins/chassis/dell_fans diff --git a/plugins/other/munin-plugin-for-cherokee b/plugins/cherokee/munin-plugin-for-cherokee similarity index 100% rename from plugins/other/munin-plugin-for-cherokee rename to plugins/cherokee/munin-plugin-for-cherokee diff --git a/plugins/other/condor_activity_ b/plugins/condor/condor_activity_ similarity index 100% rename from plugins/other/condor_activity_ rename to plugins/condor/condor_activity_ diff --git a/plugins/other/condor_ops_ b/plugins/condor/condor_ops_ similarity index 100% rename from plugins/other/condor_ops_ rename to plugins/condor/condor_ops_ diff --git a/plugins/other/condor_queue_ b/plugins/condor/condor_queue_ similarity index 100% rename from plugins/other/condor_queue_ rename to plugins/condor/condor_queue_ diff --git a/plugins/other/condor_states_ b/plugins/condor/condor_states_ similarity index 100% rename from plugins/other/condor_states_ rename to plugins/condor/condor_states_ diff --git a/plugins/other/dovecot126 b/plugins/correo/dovecot126 similarity index 100% rename from plugins/other/dovecot126 rename to plugins/correo/dovecot126 diff --git a/plugins/other/cpanp_o b/plugins/cpan/cpanp_o similarity index 100% rename from plugins/other/cpanp_o rename to plugins/cpan/cpanp_o diff --git a/plugins/other/currentcost b/plugins/currentcost/currentcost similarity index 100% rename from plugins/other/currentcost rename to plugins/currentcost/currentcost diff --git a/plugins/other/cyrus-imapd b/plugins/cyrus/cyrus-imapd similarity index 100% rename from plugins/other/cyrus-imapd rename to plugins/cyrus/cyrus-imapd diff --git a/plugins/other/df_abs_bsd b/plugins/disk/df_abs_bsd similarity index 100% rename from plugins/other/df_abs_bsd rename to plugins/disk/df_abs_bsd diff --git a/plugins/other/df_bsd b/plugins/disk/df_bsd similarity index 100% rename from plugins/other/df_bsd rename to plugins/disk/df_bsd diff --git a/plugins/other/df_with_nfs b/plugins/disk/df_with_nfs similarity index 100% rename from plugins/other/df_with_nfs rename to plugins/disk/df_with_nfs diff --git a/plugins/other/dirsizes b/plugins/disk/dirsizes similarity index 100% rename from plugins/other/dirsizes rename to plugins/disk/dirsizes diff --git a/plugins/other/du b/plugins/disk/du similarity index 100% rename from plugins/other/du rename to plugins/disk/du diff --git a/plugins/other/du-2 b/plugins/disk/du-2 similarity index 100% rename from plugins/other/du-2 rename to plugins/disk/du-2 diff --git a/plugins/other/du_multidirs b/plugins/disk/du_multidirs similarity index 100% rename from plugins/other/du_multidirs rename to plugins/disk/du_multidirs diff --git a/plugins/other/freedisk b/plugins/disk/freedisk similarity index 100% rename from plugins/other/freedisk rename to plugins/disk/freedisk diff --git a/plugins/other/iostat b/plugins/disk/iostat similarity index 100% rename from plugins/other/iostat rename to plugins/disk/iostat diff --git a/plugins/other/iostat-xfrs b/plugins/disk/iostat-xfrs similarity index 100% rename from plugins/other/iostat-xfrs rename to plugins/disk/iostat-xfrs diff --git a/plugins/other/linux_diskstat_ b/plugins/disk/linux_diskstat_ similarity index 100% rename from plugins/other/linux_diskstat_ rename to plugins/disk/linux_diskstat_ diff --git a/plugins/other/linux_diskstats_ b/plugins/disk/linux_diskstats_ similarity index 100% rename from plugins/other/linux_diskstats_ rename to plugins/disk/linux_diskstats_ diff --git a/plugins/other/log_sizes b/plugins/disk/log_sizes similarity index 100% rename from plugins/other/log_sizes rename to plugins/disk/log_sizes diff --git a/plugins/other/lvm_ b/plugins/disk/lvm_ similarity index 100% rename from plugins/other/lvm_ rename to plugins/disk/lvm_ diff --git a/plugins/other/lvm_snap_used b/plugins/disk/lvm_snap_used similarity index 100% rename from plugins/other/lvm_snap_used rename to plugins/disk/lvm_snap_used diff --git a/plugins/other/lvm_usage b/plugins/disk/lvm_usage similarity index 100% rename from plugins/other/lvm_usage rename to plugins/disk/lvm_usage diff --git a/plugins/other/md_iostat_ b/plugins/disk/md_iostat_ similarity index 100% rename from plugins/other/md_iostat_ rename to plugins/disk/md_iostat_ diff --git a/plugins/other/megaraid-controller-information b/plugins/disk/megaraid-controller-information similarity index 100% rename from plugins/other/megaraid-controller-information rename to plugins/disk/megaraid-controller-information diff --git a/plugins/other/raid b/plugins/disk/raid similarity index 100% rename from plugins/other/raid rename to plugins/disk/raid diff --git a/plugins/other/raid-mismatch-count b/plugins/disk/raid-mismatch-count similarity index 100% rename from plugins/other/raid-mismatch-count rename to plugins/disk/raid-mismatch-count diff --git a/plugins/other/scsi_queue b/plugins/disk/scsi_queue similarity index 100% rename from plugins/other/scsi_queue rename to plugins/disk/scsi_queue diff --git a/plugins/other/smart b/plugins/disk/smart similarity index 100% rename from plugins/other/smart rename to plugins/disk/smart diff --git a/plugins/other/smart-by-id_ b/plugins/disk/smart-by-id_ similarity index 100% rename from plugins/other/smart-by-id_ rename to plugins/disk/smart-by-id_ diff --git a/plugins/other/smart_ b/plugins/disk/smart_ similarity index 100% rename from plugins/other/smart_ rename to plugins/disk/smart_ diff --git a/plugins/other/snmp__netapp_diskusage_ b/plugins/disk/snmp__netapp_diskusage_ similarity index 100% rename from plugins/other/snmp__netapp_diskusage_ rename to plugins/disk/snmp__netapp_diskusage_ diff --git a/plugins/other/snmp__netapp_inodeusage_ b/plugins/disk/snmp__netapp_inodeusage_ similarity index 100% rename from plugins/other/snmp__netapp_inodeusage_ rename to plugins/disk/snmp__netapp_inodeusage_ diff --git a/plugins/other/snmp__swap b/plugins/disk/snmp__swap similarity index 100% rename from plugins/other/snmp__swap rename to plugins/disk/snmp__swap diff --git a/plugins/other/xfs_frag b/plugins/disk/xfs_frag similarity index 100% rename from plugins/other/xfs_frag rename to plugins/disk/xfs_frag diff --git a/plugins/other/drbd b/plugins/drbd/drbd similarity index 100% rename from plugins/other/drbd rename to plugins/drbd/drbd diff --git a/plugins/other/drbd-stat b/plugins/drbd/drbd-stat similarity index 100% rename from plugins/other/drbd-stat rename to plugins/drbd/drbd-stat diff --git a/plugins/other/dspam_ b/plugins/dspam/dspam_ similarity index 100% rename from plugins/other/dspam_ rename to plugins/dspam/dspam_ diff --git a/plugins/other/dspam_activity b/plugins/dspam/dspam_activity similarity index 100% rename from plugins/other/dspam_activity rename to plugins/dspam/dspam_activity diff --git a/plugins/other/femon b/plugins/dvb/femon similarity index 100% rename from plugins/other/femon rename to plugins/dvb/femon diff --git a/plugins/other/hadoop-under_replicated-blocks b/plugins/dxtv/hadoop-under_replicated-blocks similarity index 100% rename from plugins/other/hadoop-under_replicated-blocks rename to plugins/dxtv/hadoop-under_replicated-blocks diff --git a/plugins/other/ejabberd_ b/plugins/ejabberd/ejabberd_ similarity index 100% rename from plugins/other/ejabberd_ rename to plugins/ejabberd/ejabberd_ diff --git a/plugins/other/hplog_f-a-hp-proliant-server-fans-speed b/plugins/environment/hplog_f-a-hp-proliant-server-fans-speed similarity index 100% rename from plugins/other/hplog_f-a-hp-proliant-server-fans-speed rename to plugins/environment/hplog_f-a-hp-proliant-server-fans-speed diff --git a/plugins/other/hplog_t-a-hp-proliant-server-temperatures b/plugins/environment/hplog_t-a-hp-proliant-server-temperatures similarity index 100% rename from plugins/other/hplog_t-a-hp-proliant-server-temperatures rename to plugins/environment/hplog_t-a-hp-proliant-server-temperatures diff --git a/plugins/other/alertme_keyfobsathome b/plugins/environmental/alertme_keyfobsathome similarity index 100% rename from plugins/other/alertme_keyfobsathome rename to plugins/environmental/alertme_keyfobsathome diff --git a/plugins/other/alertme_power b/plugins/environmental/alertme_power similarity index 100% rename from plugins/other/alertme_power rename to plugins/environmental/alertme_power diff --git a/plugins/other/esxi b/plugins/esx/esxi similarity index 100% rename from plugins/other/esxi rename to plugins/esx/esxi diff --git a/plugins/other/faxstat b/plugins/fax/faxstat similarity index 100% rename from plugins/other/faxstat rename to plugins/fax/faxstat diff --git a/plugins/other/zfs_cache_efficiency b/plugins/filesystem/zfs_cache_efficiency similarity index 100% rename from plugins/other/zfs_cache_efficiency rename to plugins/filesystem/zfs_cache_efficiency diff --git a/plugins/other/zfsarcstats-counters b/plugins/filesystem/zfsarcstats-counters similarity index 100% rename from plugins/other/zfsarcstats-counters rename to plugins/filesystem/zfsarcstats-counters diff --git a/plugins/other/firebird b/plugins/firebird/firebird similarity index 100% rename from plugins/other/firebird rename to plugins/firebird/firebird diff --git a/plugins/other/vbulletin_users b/plugins/forum/vbulletin_users similarity index 100% rename from plugins/other/vbulletin_users rename to plugins/forum/vbulletin_users diff --git a/plugins/other/punbb_users b/plugins/forums/punbb_users similarity index 100% rename from plugins/other/punbb_users rename to plugins/forums/punbb_users diff --git a/plugins/other/proftpd b/plugins/ftp/proftpd similarity index 100% rename from plugins/other/proftpd rename to plugins/ftp/proftpd diff --git a/plugins/other/proftpd_bytes b/plugins/ftp/proftpd_bytes similarity index 100% rename from plugins/other/proftpd_bytes rename to plugins/ftp/proftpd_bytes diff --git a/plugins/other/proftpd_count b/plugins/ftp/proftpd_count similarity index 100% rename from plugins/other/proftpd_count rename to plugins/ftp/proftpd_count diff --git a/plugins/other/pure-ftpd b/plugins/ftp/pure-ftpd similarity index 100% rename from plugins/other/pure-ftpd rename to plugins/ftp/pure-ftpd diff --git a/plugins/other/pureftpd_count b/plugins/ftp/pureftpd_count similarity index 100% rename from plugins/other/pureftpd_count rename to plugins/ftp/pureftpd_count diff --git a/plugins/other/vsftpd b/plugins/ftp/vsftpd similarity index 100% rename from plugins/other/vsftpd rename to plugins/ftp/vsftpd diff --git a/plugins/other/vsftpd-rel b/plugins/ftp/vsftpd-rel similarity index 100% rename from plugins/other/vsftpd-rel rename to plugins/ftp/vsftpd-rel diff --git a/plugins/other/denon_x311_volume b/plugins/funkytown/denon_x311_volume similarity index 100% rename from plugins/other/denon_x311_volume rename to plugins/funkytown/denon_x311_volume diff --git a/plugins/other/b3error_ b/plugins/games/b3error_ similarity index 100% rename from plugins/other/b3error_ rename to plugins/games/b3error_ diff --git a/plugins/other/cstat b/plugins/games/cstat similarity index 100% rename from plugins/other/cstat rename to plugins/games/cstat diff --git a/plugins/other/qstat b/plugins/games/qstat similarity index 100% rename from plugins/other/qstat rename to plugins/games/qstat diff --git a/plugins/other/qstatet_ b/plugins/games/qstatet_ similarity index 100% rename from plugins/other/qstatet_ rename to plugins/games/qstatet_ diff --git a/plugins/other/qstatqw_ b/plugins/games/qstatqw_ similarity index 100% rename from plugins/other/qstatqw_ rename to plugins/games/qstatqw_ diff --git a/plugins/other/geowebcache-bandwidth b/plugins/geowebcache/geowebcache-bandwidth similarity index 100% rename from plugins/other/geowebcache-bandwidth rename to plugins/geowebcache/geowebcache-bandwidth diff --git a/plugins/other/geowebcache-blankitems b/plugins/geowebcache/geowebcache-blankitems similarity index 100% rename from plugins/other/geowebcache-blankitems rename to plugins/geowebcache/geowebcache-blankitems diff --git a/plugins/other/geowebcache-cache-hits-ratio b/plugins/geowebcache/geowebcache-cache-hits-ratio similarity index 100% rename from plugins/other/geowebcache-cache-hits-ratio rename to plugins/geowebcache/geowebcache-cache-hits-ratio diff --git a/plugins/other/googlecode b/plugins/google/googlecode similarity index 100% rename from plugins/other/googlecode rename to plugins/google/googlecode diff --git a/plugins/other/nvidia_smi_ b/plugins/gpu/nvidia_smi_ similarity index 100% rename from plugins/other/nvidia_smi_ rename to plugins/gpu/nvidia_smi_ diff --git a/plugins/other/snmp__gwia_msgs_ b/plugins/groupwise/snmp__gwia_msgs_ similarity index 100% rename from plugins/other/snmp__gwia_msgs_ rename to plugins/groupwise/snmp__gwia_msgs_ diff --git a/plugins/other/snmp__gwmta_msgs_ b/plugins/groupwise/snmp__gwmta_msgs_ similarity index 100% rename from plugins/other/snmp__gwmta_msgs_ rename to plugins/groupwise/snmp__gwmta_msgs_ diff --git a/plugins/other/hadoop-dfs-plugin b/plugins/hadoop/hadoop-dfs-plugin similarity index 100% rename from plugins/other/hadoop-dfs-plugin rename to plugins/hadoop/hadoop-dfs-plugin diff --git a/plugins/other/haproxy-bytes b/plugins/haproxy/haproxy-bytes similarity index 100% rename from plugins/other/haproxy-bytes rename to plugins/haproxy/haproxy-bytes diff --git a/plugins/other/haproxy-connection-errors b/plugins/haproxy/haproxy-connection-errors similarity index 100% rename from plugins/other/haproxy-connection-errors rename to plugins/haproxy/haproxy-connection-errors diff --git a/plugins/other/haproxy-downtime b/plugins/haproxy/haproxy-downtime similarity index 100% rename from plugins/other/haproxy-downtime rename to plugins/haproxy/haproxy-downtime diff --git a/plugins/other/haproxy-errors b/plugins/haproxy/haproxy-errors similarity index 100% rename from plugins/other/haproxy-errors rename to plugins/haproxy/haproxy-errors diff --git a/plugins/other/haproxy-failed-checks b/plugins/haproxy/haproxy-failed-checks similarity index 100% rename from plugins/other/haproxy-failed-checks rename to plugins/haproxy/haproxy-failed-checks diff --git a/plugins/other/haproxy-response-errors b/plugins/haproxy/haproxy-response-errors similarity index 100% rename from plugins/other/haproxy-response-errors rename to plugins/haproxy/haproxy-response-errors diff --git a/plugins/other/haproxy-sessions b/plugins/haproxy/haproxy-sessions similarity index 100% rename from plugins/other/haproxy-sessions rename to plugins/haproxy/haproxy-sessions diff --git a/plugins/other/haproxy-sessions-by-servers b/plugins/haproxy/haproxy-sessions-by-servers similarity index 100% rename from plugins/other/haproxy-sessions-by-servers rename to plugins/haproxy/haproxy-sessions-by-servers diff --git a/plugins/other/apc_status b/plugins/hardware/apc_status similarity index 100% rename from plugins/other/apc_status rename to plugins/hardware/apc_status diff --git a/plugins/other/healthcheck_log b/plugins/healthcheck/healthcheck_log similarity index 100% rename from plugins/other/healthcheck_log rename to plugins/healthcheck/healthcheck_log diff --git a/plugins/other/healthcheck_process b/plugins/healthcheck/healthcheck_process similarity index 100% rename from plugins/other/healthcheck_process rename to plugins/healthcheck/healthcheck_process diff --git a/plugins/other/healthcheck_url b/plugins/healthcheck/healthcheck_url similarity index 100% rename from plugins/other/healthcheck_url rename to plugins/healthcheck/healthcheck_url diff --git a/plugins/other/heimdal_kdc_bandwidth b/plugins/heimdal/heimdal_kdc_bandwidth similarity index 100% rename from plugins/other/heimdal_kdc_bandwidth rename to plugins/heimdal/heimdal_kdc_bandwidth diff --git a/plugins/other/heimdal_kdc_requests b/plugins/heimdal/heimdal_kdc_requests similarity index 100% rename from plugins/other/heimdal_kdc_requests rename to plugins/heimdal/heimdal_kdc_requests diff --git a/plugins/other/hp2600_count_ b/plugins/hp2600/hp2600_count_ similarity index 100% rename from plugins/other/hp2600_count_ rename to plugins/hp2600/hp2600_count_ diff --git a/plugins/other/hp2600_status_ b/plugins/hp2600/hp2600_status_ similarity index 100% rename from plugins/other/hp2600_status_ rename to plugins/hp2600/hp2600_status_ diff --git a/plugins/other/http_load_ b/plugins/http/http_load_ similarity index 100% rename from plugins/other/http_load_ rename to plugins/http/http_load_ diff --git a/plugins/other/http_request_time b/plugins/http/http_request_time similarity index 100% rename from plugins/other/http_request_time rename to plugins/http/http_request_time diff --git a/plugins/other/http_responsetime b/plugins/http/http_responsetime similarity index 100% rename from plugins/other/http_responsetime rename to plugins/http/http_responsetime diff --git a/plugins/other/multi_http_responsetime b/plugins/http/multi_http_responsetime similarity index 100% rename from plugins/other/multi_http_responsetime rename to plugins/http/multi_http_responsetime diff --git a/plugins/other/speedport_300 b/plugins/http/speedport_300 similarity index 100% rename from plugins/other/speedport_300 rename to plugins/http/speedport_300 diff --git a/plugins/other/wget_page b/plugins/http/wget_page similarity index 100% rename from plugins/other/wget_page rename to plugins/http/wget_page diff --git a/plugins/other/icecast2_ b/plugins/icecast/icecast2_ similarity index 100% rename from plugins/other/icecast2_ rename to plugins/icecast/icecast2_ diff --git a/plugins/other/icecast2_all b/plugins/icecast/icecast2_all similarity index 100% rename from plugins/other/icecast2_all rename to plugins/icecast/icecast2_all diff --git a/plugins/other/icecast2_simple b/plugins/icecast/icecast2_simple similarity index 100% rename from plugins/other/icecast2_simple rename to plugins/icecast/icecast2_simple diff --git a/plugins/other/icecast_ b/plugins/icecast/icecast_ similarity index 100% rename from plugins/other/icecast_ rename to plugins/icecast/icecast_ diff --git a/plugins/other/ddclient b/plugins/ip/ddclient similarity index 100% rename from plugins/other/ddclient rename to plugins/ip/ddclient diff --git a/plugins/other/ipmi_ b/plugins/ipmi/ipmi_ similarity index 100% rename from plugins/other/ipmi_ rename to plugins/ipmi/ipmi_ diff --git a/plugins/other/joomla-sessions b/plugins/joomla/joomla-sessions similarity index 100% rename from plugins/other/joomla-sessions rename to plugins/joomla/joomla-sessions diff --git a/plugins/other/jstat__gccount b/plugins/jvm/jstat__gccount similarity index 100% rename from plugins/other/jstat__gccount rename to plugins/jvm/jstat__gccount diff --git a/plugins/other/jstat__gctime b/plugins/jvm/jstat__gctime similarity index 100% rename from plugins/other/jstat__gctime rename to plugins/jvm/jstat__gctime diff --git a/plugins/other/jstat__heap b/plugins/jvm/jstat__heap similarity index 100% rename from plugins/other/jstat__heap rename to plugins/jvm/jstat__heap diff --git a/plugins/other/jvm_sun_memory b/plugins/jvm/jvm_sun_memory similarity index 100% rename from plugins/other/jvm_sun_memory rename to plugins/jvm/jvm_sun_memory diff --git a/plugins/other/jvm_sun_minorgcs b/plugins/jvm/jvm_sun_minorgcs similarity index 100% rename from plugins/other/jvm_sun_minorgcs rename to plugins/jvm/jvm_sun_minorgcs diff --git a/plugins/other/jvm_sun_tenuredgcs b/plugins/jvm/jvm_sun_tenuredgcs similarity index 100% rename from plugins/other/jvm_sun_tenuredgcs rename to plugins/jvm/jvm_sun_tenuredgcs diff --git a/plugins/other/kvm_cpu b/plugins/kvm/kvm_cpu similarity index 100% rename from plugins/other/kvm_cpu rename to plugins/kvm/kvm_cpu diff --git a/plugins/other/kvm_io b/plugins/kvm/kvm_io similarity index 100% rename from plugins/other/kvm_io rename to plugins/kvm/kvm_io diff --git a/plugins/other/kvm_mem b/plugins/kvm/kvm_mem similarity index 100% rename from plugins/other/kvm_mem rename to plugins/kvm/kvm_mem diff --git a/plugins/other/kvm_net b/plugins/kvm/kvm_net similarity index 100% rename from plugins/other/kvm_net rename to plugins/kvm/kvm_net diff --git a/plugins/other/munin-libvirtpy b/plugins/kvm/munin-libvirtpy similarity index 100% rename from plugins/other/munin-libvirtpy rename to plugins/kvm/munin-libvirtpy diff --git a/plugins/other/flexlm_ b/plugins/licensing/flexlm_ similarity index 100% rename from plugins/other/flexlm_ rename to plugins/licensing/flexlm_ diff --git a/plugins/other/logins b/plugins/logins/logins similarity index 100% rename from plugins/other/logins rename to plugins/logins/logins diff --git a/plugins/other/lustre_abs b/plugins/lustre/lustre_abs similarity index 100% rename from plugins/other/lustre_abs rename to plugins/lustre/lustre_abs diff --git a/plugins/other/lustre_df b/plugins/lustre/lustre_df similarity index 100% rename from plugins/other/lustre_df rename to plugins/lustre/lustre_df diff --git a/plugins/other/lustre_df_free b/plugins/lustre/lustre_df_free similarity index 100% rename from plugins/other/lustre_df_free rename to plugins/lustre/lustre_df_free diff --git a/plugins/other/lustre_df_indodes b/plugins/lustre/lustre_df_indodes similarity index 100% rename from plugins/other/lustre_df_indodes rename to plugins/lustre/lustre_df_indodes diff --git a/plugins/other/amavis_ b/plugins/mail/amavis_ similarity index 100% rename from plugins/other/amavis_ rename to plugins/mail/amavis_ diff --git a/plugins/other/amavis_awk b/plugins/mail/amavis_awk similarity index 100% rename from plugins/other/amavis_awk rename to plugins/mail/amavis_awk diff --git a/plugins/other/clamav b/plugins/mail/clamav similarity index 100% rename from plugins/other/clamav rename to plugins/mail/clamav diff --git a/plugins/other/courier_log b/plugins/mail/courier_log similarity index 100% rename from plugins/other/courier_log rename to plugins/mail/courier_log diff --git a/plugins/other/dkimproxy_mails b/plugins/mail/dkimproxy_mails similarity index 100% rename from plugins/other/dkimproxy_mails rename to plugins/mail/dkimproxy_mails diff --git a/plugins/other/mail_connections b/plugins/mail/mail_connections similarity index 100% rename from plugins/other/mail_connections rename to plugins/mail/mail_connections diff --git a/plugins/other/mixminion b/plugins/mail/mixminion similarity index 100% rename from plugins/other/mixminion rename to plugins/mail/mixminion diff --git a/plugins/other/postfix-policyd b/plugins/mail/postfix-policyd similarity index 100% rename from plugins/other/postfix-policyd rename to plugins/mail/postfix-policyd diff --git a/plugins/other/postfix-rbl-blocked-mails b/plugins/mail/postfix-rbl-blocked-mails similarity index 100% rename from plugins/other/postfix-rbl-blocked-mails rename to plugins/mail/postfix-rbl-blocked-mails diff --git a/plugins/other/postfix_filtered b/plugins/mail/postfix_filtered similarity index 100% rename from plugins/other/postfix_filtered rename to plugins/mail/postfix_filtered diff --git a/plugins/other/postfix_filtered_awk b/plugins/mail/postfix_filtered_awk similarity index 100% rename from plugins/other/postfix_filtered_awk rename to plugins/mail/postfix_filtered_awk diff --git a/plugins/other/postfix_mailfiltered b/plugins/mail/postfix_mailfiltered similarity index 100% rename from plugins/other/postfix_mailfiltered rename to plugins/mail/postfix_mailfiltered diff --git a/plugins/other/postfix_stats b/plugins/mail/postfix_stats similarity index 100% rename from plugins/other/postfix_stats rename to plugins/mail/postfix_stats diff --git a/plugins/other/postgrey b/plugins/mail/postgrey similarity index 100% rename from plugins/other/postgrey rename to plugins/mail/postgrey diff --git a/plugins/other/postgrey-new b/plugins/mail/postgrey-new similarity index 100% rename from plugins/other/postgrey-new rename to plugins/mail/postgrey-new diff --git a/plugins/other/procmail_ b/plugins/mail/procmail_ similarity index 100% rename from plugins/other/procmail_ rename to plugins/mail/procmail_ diff --git a/plugins/other/qmailconn b/plugins/mail/qmailconn similarity index 100% rename from plugins/other/qmailconn rename to plugins/mail/qmailconn diff --git a/plugins/other/qmailsend b/plugins/mail/qmailsend similarity index 100% rename from plugins/other/qmailsend rename to plugins/mail/qmailsend diff --git a/plugins/other/qmailsend_plesk b/plugins/mail/qmailsend_plesk similarity index 100% rename from plugins/other/qmailsend_plesk rename to plugins/mail/qmailsend_plesk diff --git a/plugins/other/qremote b/plugins/mail/qremote similarity index 100% rename from plugins/other/qremote rename to plugins/mail/qremote diff --git a/plugins/other/queuestats b/plugins/mail/queuestats similarity index 100% rename from plugins/other/queuestats rename to plugins/mail/queuestats diff --git a/plugins/other/sa-learn b/plugins/mail/sa-learn similarity index 100% rename from plugins/other/sa-learn rename to plugins/mail/sa-learn diff --git a/plugins/other/spamd-blacklist-bsd b/plugins/mail/spamd-blacklist-bsd similarity index 100% rename from plugins/other/spamd-blacklist-bsd rename to plugins/mail/spamd-blacklist-bsd diff --git a/plugins/other/spamd-tarpit-bsd b/plugins/mail/spamd-tarpit-bsd similarity index 100% rename from plugins/other/spamd-tarpit-bsd rename to plugins/mail/spamd-tarpit-bsd diff --git a/plugins/other/spamdyke b/plugins/mail/spamdyke similarity index 100% rename from plugins/other/spamdyke rename to plugins/mail/spamdyke diff --git a/plugins/other/eoc_subscribers_count b/plugins/mailinglist/eoc_subscribers_count similarity index 100% rename from plugins/other/eoc_subscribers_count rename to plugins/mailinglist/eoc_subscribers_count diff --git a/plugins/other/mailman_subscribers b/plugins/mailman/mailman_subscribers similarity index 100% rename from plugins/other/mailman_subscribers rename to plugins/mailman/mailman_subscribers diff --git a/plugins/other/memcached-multigraph-plugin b/plugins/memcached/memcached-multigraph-plugin similarity index 100% rename from plugins/other/memcached-multigraph-plugin rename to plugins/memcached/memcached-multigraph-plugin diff --git a/plugins/other/memcached_bytes_ b/plugins/memcached/memcached_bytes_ similarity index 100% rename from plugins/other/memcached_bytes_ rename to plugins/memcached/memcached_bytes_ diff --git a/plugins/other/memcached_bytes_all b/plugins/memcached/memcached_bytes_all similarity index 100% rename from plugins/other/memcached_bytes_all rename to plugins/memcached/memcached_bytes_all diff --git a/plugins/other/memcached_connections_ b/plugins/memcached/memcached_connections_ similarity index 100% rename from plugins/other/memcached_connections_ rename to plugins/memcached/memcached_connections_ diff --git a/plugins/other/memcached_hits_ b/plugins/memcached/memcached_hits_ similarity index 100% rename from plugins/other/memcached_hits_ rename to plugins/memcached/memcached_hits_ diff --git a/plugins/other/memcached_items_ b/plugins/memcached/memcached_items_ similarity index 100% rename from plugins/other/memcached_items_ rename to plugins/memcached/memcached_items_ diff --git a/plugins/other/memcached_multi_ b/plugins/memcached/memcached_multi_ similarity index 100% rename from plugins/other/memcached_multi_ rename to plugins/memcached/memcached_multi_ diff --git a/plugins/other/memcached_requests_ b/plugins/memcached/memcached_requests_ similarity index 100% rename from plugins/other/memcached_requests_ rename to plugins/memcached/memcached_requests_ diff --git a/plugins/other/memcached_traffic_ b/plugins/memcached/memcached_traffic_ similarity index 100% rename from plugins/other/memcached_traffic_ rename to plugins/memcached/memcached_traffic_ diff --git a/plugins/other/mongrel_memory b/plugins/memory/mongrel_memory similarity index 100% rename from plugins/other/mongrel_memory rename to plugins/memory/mongrel_memory diff --git a/plugins/other/mongrel_process_memory b/plugins/memory/mongrel_process_memory similarity index 100% rename from plugins/other/mongrel_process_memory rename to plugins/memory/mongrel_process_memory diff --git a/plugins/other/minecraft-users b/plugins/minecraft/minecraft-users similarity index 100% rename from plugins/other/minecraft-users rename to plugins/minecraft/minecraft-users diff --git a/plugins/other/moblock_connections b/plugins/moblock/moblock_connections similarity index 100% rename from plugins/other/moblock_connections rename to plugins/moblock/moblock_connections diff --git a/plugins/other/mod_jk b/plugins/mod_jk/mod_jk similarity index 100% rename from plugins/other/mod_jk rename to plugins/mod_jk/mod_jk diff --git a/plugins/other/mogilefsd_activity b/plugins/mogilefs/mogilefsd_activity similarity index 100% rename from plugins/other/mogilefsd_activity rename to plugins/mogilefs/mogilefsd_activity diff --git a/plugins/other/mogilefsd_queries b/plugins/mogilefs/mogilefsd_queries similarity index 100% rename from plugins/other/mogilefsd_queries rename to plugins/mogilefs/mogilefsd_queries diff --git a/plugins/other/mongo_btree b/plugins/mongodb/mongo_btree similarity index 100% rename from plugins/other/mongo_btree rename to plugins/mongodb/mongo_btree diff --git a/plugins/other/mongo_conn b/plugins/mongodb/mongo_conn similarity index 100% rename from plugins/other/mongo_conn rename to plugins/mongodb/mongo_conn diff --git a/plugins/other/mongo_lock b/plugins/mongodb/mongo_lock similarity index 100% rename from plugins/other/mongo_lock rename to plugins/mongodb/mongo_lock diff --git a/plugins/other/mongo_mem b/plugins/mongodb/mongo_mem similarity index 100% rename from plugins/other/mongo_mem rename to plugins/mongodb/mongo_mem diff --git a/plugins/other/mongo_ops b/plugins/mongodb/mongo_ops similarity index 100% rename from plugins/other/mongo_ops rename to plugins/mongodb/mongo_ops diff --git a/plugins/other/monit_parser b/plugins/monit/monit_parser similarity index 100% rename from plugins/other/monit_parser rename to plugins/monit/monit_parser diff --git a/plugins/other/microsoft-sql b/plugins/mssql/microsoft-sql similarity index 100% rename from plugins/other/microsoft-sql rename to plugins/mssql/microsoft-sql diff --git a/plugins/other/microsoft-sql-buffer-cache-hit-ratio b/plugins/mssql/microsoft-sql-buffer-cache-hit-ratio similarity index 100% rename from plugins/other/microsoft-sql-buffer-cache-hit-ratio rename to plugins/mssql/microsoft-sql-buffer-cache-hit-ratio diff --git a/plugins/other/microsoft-sql-data-file-sizes b/plugins/mssql/microsoft-sql-data-file-sizes similarity index 100% rename from plugins/other/microsoft-sql-data-file-sizes rename to plugins/mssql/microsoft-sql-data-file-sizes diff --git a/plugins/other/microsoft-sql-log-file-size b/plugins/mssql/microsoft-sql-log-file-size similarity index 100% rename from plugins/other/microsoft-sql-log-file-size rename to plugins/mssql/microsoft-sql-log-file-size diff --git a/plugins/other/munin_stats_plugins b/plugins/munin/munin_stats_plugins similarity index 100% rename from plugins/other/munin_stats_plugins rename to plugins/munin/munin_stats_plugins diff --git a/plugins/other/mysql_connections b/plugins/mysql/mysql_connections similarity index 100% rename from plugins/other/mysql_connections rename to plugins/mysql/mysql_connections diff --git a/plugins/other/mysql_innodb b/plugins/mysql/mysql_innodb similarity index 100% rename from plugins/other/mysql_innodb rename to plugins/mysql/mysql_innodb diff --git a/plugins/other/mysql_qcache b/plugins/mysql/mysql_qcache similarity index 100% rename from plugins/other/mysql_qcache rename to plugins/mysql/mysql_qcache diff --git a/plugins/other/mysql_qcache_mem b/plugins/mysql/mysql_qcache_mem similarity index 100% rename from plugins/other/mysql_qcache_mem rename to plugins/mysql/mysql_qcache_mem diff --git a/plugins/other/mysql_report b/plugins/mysql/mysql_report similarity index 100% rename from plugins/other/mysql_report rename to plugins/mysql/mysql_report diff --git a/plugins/other/mysql_size_ b/plugins/mysql/mysql_size_ similarity index 100% rename from plugins/other/mysql_size_ rename to plugins/mysql/mysql_size_ diff --git a/plugins/other/mysql_size_all b/plugins/mysql/mysql_size_all similarity index 100% rename from plugins/other/mysql_size_all rename to plugins/mysql/mysql_size_all diff --git a/plugins/other/mysql_slave b/plugins/mysql/mysql_slave similarity index 100% rename from plugins/other/mysql_slave rename to plugins/mysql/mysql_slave diff --git a/plugins/other/mysql_slave_threads b/plugins/mysql/mysql_slave_threads similarity index 100% rename from plugins/other/mysql_slave_threads rename to plugins/mysql/mysql_slave_threads diff --git a/plugins/other/mysql-schema-size b/plugins/mysql_schema_size_/mysql-schema-size similarity index 100% rename from plugins/other/mysql-schema-size rename to plugins/mysql_schema_size_/mysql-schema-size diff --git a/plugins/other/mysql-table-size b/plugins/mysql_table_size_/mysql-table-size similarity index 100% rename from plugins/other/mysql-table-size rename to plugins/mysql_table_size_/mysql-table-size diff --git a/plugins/other/dvb-signal b/plugins/mythtv/dvb-signal similarity index 100% rename from plugins/other/dvb-signal rename to plugins/mythtv/dvb-signal diff --git a/plugins/other/mythtv_programs b/plugins/mythtv/mythtv_programs similarity index 100% rename from plugins/other/mythtv_programs rename to plugins/mythtv/mythtv_programs diff --git a/plugins/other/mythtv_status_ b/plugins/mythtv/mythtv_status_ similarity index 100% rename from plugins/other/mythtv_status_ rename to plugins/mythtv/mythtv_status_ diff --git a/plugins/other/nagiosstatus b/plugins/nagios/nagiosstatus similarity index 100% rename from plugins/other/nagiosstatus rename to plugins/nagios/nagiosstatus diff --git a/plugins/other/netapp_cifs b/plugins/netapp/netapp_cifs similarity index 100% rename from plugins/other/netapp_cifs rename to plugins/netapp/netapp_cifs diff --git a/plugins/other/netapp_cpu_ b/plugins/netapp/netapp_cpu_ similarity index 100% rename from plugins/other/netapp_cpu_ rename to plugins/netapp/netapp_cpu_ diff --git a/plugins/other/netapp_if_ b/plugins/netapp/netapp_if_ similarity index 100% rename from plugins/other/netapp_if_ rename to plugins/netapp/netapp_if_ diff --git a/plugins/other/cirix-netscaler-connections b/plugins/netscaler/cirix-netscaler-connections similarity index 100% rename from plugins/other/cirix-netscaler-connections rename to plugins/netscaler/cirix-netscaler-connections diff --git a/plugins/other/cirix-netscaler-cpu-usage b/plugins/netscaler/cirix-netscaler-cpu-usage similarity index 100% rename from plugins/other/cirix-netscaler-cpu-usage rename to plugins/netscaler/cirix-netscaler-cpu-usage diff --git a/plugins/other/ag241-adsl b/plugins/network/ag241-adsl similarity index 100% rename from plugins/other/ag241-adsl rename to plugins/network/ag241-adsl diff --git a/plugins/other/arp b/plugins/network/arp similarity index 100% rename from plugins/other/arp rename to plugins/network/arp diff --git a/plugins/other/avm-fritzbox-wan-traffic b/plugins/network/avm-fritzbox-wan-traffic similarity index 100% rename from plugins/other/avm-fritzbox-wan-traffic rename to plugins/network/avm-fritzbox-wan-traffic diff --git a/plugins/other/bandwidth_ b/plugins/network/bandwidth_ similarity index 100% rename from plugins/other/bandwidth_ rename to plugins/network/bandwidth_ diff --git a/plugins/other/bind95_ b/plugins/network/bind95_ similarity index 100% rename from plugins/other/bind95_ rename to plugins/network/bind95_ diff --git a/plugins/other/bind_ b/plugins/network/bind_ similarity index 100% rename from plugins/other/bind_ rename to plugins/network/bind_ diff --git a/plugins/other/brc_rssi b/plugins/network/brc_rssi similarity index 100% rename from plugins/other/brc_rssi rename to plugins/network/brc_rssi diff --git a/plugins/other/cisco_bgp_ b/plugins/network/cisco_bgp_ similarity index 100% rename from plugins/other/cisco_bgp_ rename to plugins/network/cisco_bgp_ diff --git a/plugins/other/count-me b/plugins/network/count-me similarity index 100% rename from plugins/other/count-me rename to plugins/network/count-me diff --git a/plugins/other/d-link-dir-655-router-statistics-plugin b/plugins/network/d-link-dir-655-router-statistics-plugin similarity index 100% rename from plugins/other/d-link-dir-655-router-statistics-plugin rename to plugins/network/d-link-dir-655-router-statistics-plugin diff --git a/plugins/other/dansguardian b/plugins/network/dansguardian similarity index 100% rename from plugins/other/dansguardian rename to plugins/network/dansguardian diff --git a/plugins/other/dell_temps b/plugins/network/dell_temps similarity index 100% rename from plugins/other/dell_temps rename to plugins/network/dell_temps diff --git a/plugins/other/denyhosts b/plugins/network/denyhosts similarity index 100% rename from plugins/other/denyhosts rename to plugins/network/denyhosts diff --git a/plugins/other/dhcp-pool b/plugins/network/dhcp-pool similarity index 100% rename from plugins/other/dhcp-pool rename to plugins/network/dhcp-pool diff --git a/plugins/other/dsl-connection-speed b/plugins/network/dsl-connection-speed similarity index 100% rename from plugins/other/dsl-connection-speed rename to plugins/network/dsl-connection-speed diff --git a/plugins/other/dsl-stats b/plugins/network/dsl-stats similarity index 100% rename from plugins/other/dsl-stats rename to plugins/network/dsl-stats diff --git a/plugins/other/fail2ban b/plugins/network/fail2ban similarity index 100% rename from plugins/other/fail2ban rename to plugins/network/fail2ban diff --git a/plugins/other/fail2ban_ b/plugins/network/fail2ban_ similarity index 100% rename from plugins/other/fail2ban_ rename to plugins/network/fail2ban_ diff --git a/plugins/other/fail2ban_all_jails b/plugins/network/fail2ban_all_jails similarity index 100% rename from plugins/other/fail2ban_all_jails rename to plugins/network/fail2ban_all_jails diff --git a/plugins/other/fms b/plugins/network/fms similarity index 100% rename from plugins/other/fms rename to plugins/network/fms diff --git a/plugins/other/fms_apps b/plugins/network/fms_apps similarity index 100% rename from plugins/other/fms_apps rename to plugins/network/fms_apps diff --git a/plugins/other/fms_apps_rate b/plugins/network/fms_apps_rate similarity index 100% rename from plugins/other/fms_apps_rate rename to plugins/network/fms_apps_rate diff --git a/plugins/other/fwbuilder_ b/plugins/network/fwbuilder_ similarity index 100% rename from plugins/other/fwbuilder_ rename to plugins/network/fwbuilder_ diff --git a/plugins/other/hfsc b/plugins/network/hfsc similarity index 100% rename from plugins/other/hfsc rename to plugins/network/hfsc diff --git a/plugins/other/hfsc_sep b/plugins/network/hfsc_sep similarity index 100% rename from plugins/other/hfsc_sep rename to plugins/network/hfsc_sep diff --git a/plugins/other/host_traffic b/plugins/network/host_traffic similarity index 100% rename from plugins/other/host_traffic rename to plugins/network/host_traffic diff --git a/plugins/other/http__tp_link b/plugins/network/http__tp_link similarity index 100% rename from plugins/other/http__tp_link rename to plugins/network/http__tp_link diff --git a/plugins/other/http_status b/plugins/network/http_status similarity index 100% rename from plugins/other/http_status rename to plugins/network/http_status diff --git a/plugins/other/if_uptime b/plugins/network/if_uptime similarity index 100% rename from plugins/other/if_uptime rename to plugins/network/if_uptime diff --git a/plugins/other/ifem_ b/plugins/network/ifem_ similarity index 100% rename from plugins/other/ifem_ rename to plugins/network/ifem_ diff --git a/plugins/other/ip6_ b/plugins/network/ip6_ similarity index 100% rename from plugins/other/ip6_ rename to plugins/network/ip6_ diff --git a/plugins/other/ip6t_accounting b/plugins/network/ip6t_accounting similarity index 100% rename from plugins/other/ip6t_accounting rename to plugins/network/ip6t_accounting diff --git a/plugins/other/ip_forward_ b/plugins/network/ip_forward_ similarity index 100% rename from plugins/other/ip_forward_ rename to plugins/network/ip_forward_ diff --git a/plugins/other/iperf_ b/plugins/network/iperf_ similarity index 100% rename from plugins/other/iperf_ rename to plugins/network/iperf_ diff --git a/plugins/other/ipfwcnt_ b/plugins/network/ipfwcnt_ similarity index 100% rename from plugins/other/ipfwcnt_ rename to plugins/network/ipfwcnt_ diff --git a/plugins/other/ipfwnat_ b/plugins/network/ipfwnat_ similarity index 100% rename from plugins/other/ipfwnat_ rename to plugins/network/ipfwnat_ diff --git a/plugins/other/ipt_accounting_ b/plugins/network/ipt_accounting_ similarity index 100% rename from plugins/other/ipt_accounting_ rename to plugins/network/ipt_accounting_ diff --git a/plugins/other/ipt_basic_ b/plugins/network/ipt_basic_ similarity index 100% rename from plugins/other/ipt_basic_ rename to plugins/network/ipt_basic_ diff --git a/plugins/other/ldap_connections b/plugins/network/ldap_connections similarity index 100% rename from plugins/other/ldap_connections rename to plugins/network/ldap_connections diff --git a/plugins/other/multi_tcp_ping b/plugins/network/multi_tcp_ping similarity index 100% rename from plugins/other/multi_tcp_ping rename to plugins/network/multi_tcp_ping diff --git a/plugins/other/multiping b/plugins/network/multiping similarity index 100% rename from plugins/other/multiping rename to plugins/network/multiping diff --git a/plugins/other/net_hosts_ b/plugins/network/net_hosts_ similarity index 100% rename from plugins/other/net_hosts_ rename to plugins/network/net_hosts_ diff --git a/plugins/other/nsd3 b/plugins/network/nsd3 similarity index 100% rename from plugins/other/nsd3 rename to plugins/network/nsd3 diff --git a/plugins/other/openvpn_clients b/plugins/network/openvpn_clients similarity index 100% rename from plugins/other/openvpn_clients rename to plugins/network/openvpn_clients diff --git a/plugins/other/packetloss b/plugins/network/packetloss similarity index 100% rename from plugins/other/packetloss rename to plugins/network/packetloss diff --git a/plugins/other/pf b/plugins/network/pf similarity index 100% rename from plugins/other/pf rename to plugins/network/pf diff --git a/plugins/other/pf_bytes b/plugins/network/pf_bytes similarity index 100% rename from plugins/other/pf_bytes rename to plugins/network/pf_bytes diff --git a/plugins/other/pf_ipv4_ipv6_packets b/plugins/network/pf_ipv4_ipv6_packets similarity index 100% rename from plugins/other/pf_ipv4_ipv6_packets rename to plugins/network/pf_ipv4_ipv6_packets diff --git a/plugins/other/pf_openbsd b/plugins/network/pf_openbsd similarity index 100% rename from plugins/other/pf_openbsd rename to plugins/network/pf_openbsd diff --git a/plugins/other/pf_packets b/plugins/network/pf_packets similarity index 100% rename from plugins/other/pf_packets rename to plugins/network/pf_packets diff --git a/plugins/other/pf_states b/plugins/network/pf_states similarity index 100% rename from plugins/other/pf_states rename to plugins/network/pf_states diff --git a/plugins/other/ping-with-ceil b/plugins/network/ping-with-ceil similarity index 100% rename from plugins/other/ping-with-ceil rename to plugins/network/ping-with-ceil diff --git a/plugins/other/ping_host b/plugins/network/ping_host similarity index 100% rename from plugins/other/ping_host rename to plugins/network/ping_host diff --git a/plugins/other/pinger b/plugins/network/pinger similarity index 100% rename from plugins/other/pinger rename to plugins/network/pinger diff --git a/plugins/other/qos_ b/plugins/network/qos_ similarity index 100% rename from plugins/other/qos_ rename to plugins/network/qos_ diff --git a/plugins/other/radio b/plugins/network/radio similarity index 100% rename from plugins/other/radio rename to plugins/network/radio diff --git a/plugins/other/shorewall-accounting b/plugins/network/shorewall-accounting similarity index 100% rename from plugins/other/shorewall-accounting rename to plugins/network/shorewall-accounting diff --git a/plugins/other/shorewall_ b/plugins/network/shorewall_ similarity index 100% rename from plugins/other/shorewall_ rename to plugins/network/shorewall_ diff --git a/plugins/other/shorewall_acc b/plugins/network/shorewall_acc similarity index 100% rename from plugins/other/shorewall_acc rename to plugins/network/shorewall_acc diff --git a/plugins/other/smtp_hello_ b/plugins/network/smtp_hello_ similarity index 100% rename from plugins/other/smtp_hello_ rename to plugins/network/smtp_hello_ diff --git a/plugins/other/snmp___bri_se_ b/plugins/network/snmp___bri_se_ similarity index 100% rename from plugins/other/snmp___bri_se_ rename to plugins/network/snmp___bri_se_ diff --git a/plugins/other/snmp__if_ b/plugins/network/snmp__if_ similarity index 100% rename from plugins/other/snmp__if_ rename to plugins/network/snmp__if_ diff --git a/plugins/other/snmp__ifx_ b/plugins/network/snmp__ifx_ similarity index 100% rename from plugins/other/snmp__ifx_ rename to plugins/network/snmp__ifx_ diff --git a/plugins/other/snmp__netstat b/plugins/network/snmp__netstat similarity index 100% rename from plugins/other/snmp__netstat rename to plugins/network/snmp__netstat diff --git a/plugins/other/snmp__ups2_ b/plugins/network/snmp__ups2_ similarity index 100% rename from plugins/other/snmp__ups2_ rename to plugins/network/snmp__ups2_ diff --git a/plugins/other/sockstat b/plugins/network/sockstat similarity index 100% rename from plugins/other/sockstat rename to plugins/network/sockstat diff --git a/plugins/other/sockstat-via-procfs b/plugins/network/sockstat-via-procfs similarity index 100% rename from plugins/other/sockstat-via-procfs rename to plugins/network/sockstat-via-procfs diff --git a/plugins/other/speedtest-download-bandwidth b/plugins/network/speedtest-download-bandwidth similarity index 100% rename from plugins/other/speedtest-download-bandwidth rename to plugins/network/speedtest-download-bandwidth diff --git a/plugins/other/tc_ b/plugins/network/tc_ similarity index 100% rename from plugins/other/tc_ rename to plugins/network/tc_ diff --git a/plugins/other/tc_drops_ b/plugins/network/tc_drops_ similarity index 100% rename from plugins/other/tc_drops_ rename to plugins/network/tc_drops_ diff --git a/plugins/other/tc_packets_ b/plugins/network/tc_packets_ similarity index 100% rename from plugins/other/tc_packets_ rename to plugins/network/tc_packets_ diff --git a/plugins/other/tcp b/plugins/network/tcp similarity index 100% rename from plugins/other/tcp rename to plugins/network/tcp diff --git a/plugins/other/tcp-retransmissions b/plugins/network/tcp-retransmissions similarity index 100% rename from plugins/other/tcp-retransmissions rename to plugins/network/tcp-retransmissions diff --git a/plugins/other/tcp-states b/plugins/network/tcp-states similarity index 100% rename from plugins/other/tcp-states rename to plugins/network/tcp-states diff --git a/plugins/other/tg585v7__ b/plugins/network/tg585v7__ similarity index 100% rename from plugins/other/tg585v7__ rename to plugins/network/tg585v7__ diff --git a/plugins/other/tinydns b/plugins/network/tinydns similarity index 100% rename from plugins/other/tinydns rename to plugins/network/tinydns diff --git a/plugins/other/tinydns_err b/plugins/network/tinydns_err similarity index 100% rename from plugins/other/tinydns_err rename to plugins/network/tinydns_err diff --git a/plugins/other/tor-bandwidth-usage b/plugins/network/tor-bandwidth-usage similarity index 100% rename from plugins/other/tor-bandwidth-usage rename to plugins/network/tor-bandwidth-usage diff --git a/plugins/other/tor_traffic b/plugins/network/tor_traffic similarity index 100% rename from plugins/other/tor_traffic rename to plugins/network/tor_traffic diff --git a/plugins/other/transmission b/plugins/network/transmission similarity index 100% rename from plugins/other/transmission rename to plugins/network/transmission diff --git a/plugins/other/udp-statistics b/plugins/network/udp-statistics similarity index 100% rename from plugins/other/udp-statistics rename to plugins/network/udp-statistics diff --git a/plugins/other/umts_sig b/plugins/network/umts_sig similarity index 100% rename from plugins/other/umts_sig rename to plugins/network/umts_sig diff --git a/plugins/other/upnp_router_ b/plugins/network/upnp_router_ similarity index 100% rename from plugins/other/upnp_router_ rename to plugins/network/upnp_router_ diff --git a/plugins/other/vnstat b/plugins/network/vnstat similarity index 100% rename from plugins/other/vnstat rename to plugins/network/vnstat diff --git a/plugins/other/vnstat_ b/plugins/network/vnstat_ similarity index 100% rename from plugins/other/vnstat_ rename to plugins/network/vnstat_ diff --git a/plugins/other/vnstat_month b/plugins/network/vnstat_month similarity index 100% rename from plugins/other/vnstat_month rename to plugins/network/vnstat_month diff --git a/plugins/other/wifi_signal b/plugins/network/wifi_signal similarity index 100% rename from plugins/other/wifi_signal rename to plugins/network/wifi_signal diff --git a/plugins/other/windows_domain b/plugins/network/windows_domain similarity index 100% rename from plugins/other/windows_domain rename to plugins/network/windows_domain diff --git a/plugins/other/zenus_ b/plugins/network/zenus_ similarity index 100% rename from plugins/other/zenus_ rename to plugins/network/zenus_ diff --git a/plugins/other/nsr_device_writing b/plugins/networker/nsr_device_writing similarity index 100% rename from plugins/other/nsr_device_writing rename to plugins/networker/nsr_device_writing diff --git a/plugins/other/nfs4_client b/plugins/nfs/nfs4_client similarity index 100% rename from plugins/other/nfs4_client rename to plugins/nfs/nfs4_client diff --git a/plugins/other/nfsv4 b/plugins/nfs/nfsv4 similarity index 100% rename from plugins/other/nfsv4 rename to plugins/nfs/nfsv4 diff --git a/plugins/other/snmp__netapp_nfs3calls b/plugins/nfs/snmp__netapp_nfs3calls similarity index 100% rename from plugins/other/snmp__netapp_nfs3calls rename to plugins/nfs/snmp__netapp_nfs3calls diff --git a/plugins/other/nginx-cache-hit-rate b/plugins/nginx/nginx-cache-hit-rate similarity index 100% rename from plugins/other/nginx-cache-hit-rate rename to plugins/nginx/nginx-cache-hit-rate diff --git a/plugins/other/nginx-combined b/plugins/nginx/nginx-combined similarity index 100% rename from plugins/other/nginx-combined rename to plugins/nginx/nginx-combined diff --git a/plugins/other/nginx_connection_request b/plugins/nginx/nginx_connection_request similarity index 100% rename from plugins/other/nginx_connection_request rename to plugins/nginx/nginx_connection_request diff --git a/plugins/other/nginx_memory b/plugins/nginx/nginx_memory similarity index 100% rename from plugins/other/nginx_memory rename to plugins/nginx/nginx_memory diff --git a/plugins/other/nginx_request b/plugins/nginx/nginx_request similarity index 100% rename from plugins/other/nginx_request rename to plugins/nginx/nginx_request diff --git a/plugins/other/nginx_status b/plugins/nginx/nginx_status similarity index 100% rename from plugins/other/nginx_status rename to plugins/nginx/nginx_status diff --git a/plugins/other/nginx_vhost_traffic b/plugins/nginx/nginx_vhost_traffic similarity index 100% rename from plugins/other/nginx_vhost_traffic rename to plugins/nginx/nginx_vhost_traffic diff --git a/plugins/other/ngnix_memory b/plugins/nginx/ngnix_memory similarity index 100% rename from plugins/other/ngnix_memory rename to plugins/nginx/ngnix_memory diff --git a/plugins/other/php5-fpm_status b/plugins/nginx/php5-fpm_status similarity index 100% rename from plugins/other/php5-fpm_status rename to plugins/nginx/php5-fpm_status diff --git a/plugins/other/novra_s300 b/plugins/noaaport/novra_s300 similarity index 100% rename from plugins/other/novra_s300 rename to plugins/noaaport/novra_s300 diff --git a/plugins/other/chrony b/plugins/ntp/chrony similarity index 100% rename from plugins/other/chrony rename to plugins/ntp/chrony diff --git a/plugins/other/ntp_peers_ipv6 b/plugins/ntp/ntp_peers_ipv6 similarity index 100% rename from plugins/other/ntp_peers_ipv6 rename to plugins/ntp/ntp_peers_ipv6 diff --git a/plugins/other/ntp_queries b/plugins/ntp/ntp_queries similarity index 100% rename from plugins/other/ntp_queries rename to plugins/ntp/ntp_queries diff --git a/plugins/other/slapd_ b/plugins/openldap/slapd_ similarity index 100% rename from plugins/other/slapd_ rename to plugins/openldap/slapd_ diff --git a/plugins/other/slapd_bdb_cache_ b/plugins/openldap/slapd_bdb_cache_ similarity index 100% rename from plugins/other/slapd_bdb_cache_ rename to plugins/openldap/slapd_bdb_cache_ diff --git a/plugins/other/openvpn_multi b/plugins/openvpn/openvpn_multi similarity index 100% rename from plugins/other/openvpn_multi rename to plugins/openvpn/openvpn_multi diff --git a/plugins/other/openvz-load-avg b/plugins/openvz/openvz-load-avg similarity index 100% rename from plugins/other/openvz-load-avg rename to plugins/openvz/openvz-load-avg diff --git a/plugins/other/openvz_ b/plugins/openvz/openvz_ similarity index 100% rename from plugins/other/openvz_ rename to plugins/openvz/openvz_ diff --git a/plugins/other/openvzcpu b/plugins/openvz/openvzcpu similarity index 100% rename from plugins/other/openvzcpu rename to plugins/openvz/openvzcpu diff --git a/plugins/other/oracle-pga-monitor b/plugins/oracle/oracle-pga-monitor similarity index 100% rename from plugins/other/oracle-pga-monitor rename to plugins/oracle/oracle-pga-monitor diff --git a/plugins/other/oracle-sga b/plugins/oracle/oracle-sga similarity index 100% rename from plugins/other/oracle-sga rename to plugins/oracle/oracle-sga diff --git a/plugins/other/oracle__connections b/plugins/oracle/oracle__connections similarity index 100% rename from plugins/other/oracle__connections rename to plugins/oracle/oracle__connections diff --git a/plugins/other/oracle__database_hitratio b/plugins/oracle/oracle__database_hitratio similarity index 100% rename from plugins/other/oracle__database_hitratio rename to plugins/oracle/oracle__database_hitratio diff --git a/plugins/other/oracle__locks b/plugins/oracle/oracle__locks similarity index 100% rename from plugins/other/oracle__locks rename to plugins/oracle/oracle__locks diff --git a/plugins/other/oracle__tablespace_usage b/plugins/oracle/oracle__tablespace_usage similarity index 100% rename from plugins/other/oracle__tablespace_usage rename to plugins/oracle/oracle__tablespace_usage diff --git a/plugins/other/oracle_connections b/plugins/oracle/oracle_connections similarity index 100% rename from plugins/other/oracle_connections rename to plugins/oracle/oracle_connections diff --git a/plugins/other/oracle_sysmetricspl b/plugins/oracle/oracle_sysmetricspl similarity index 100% rename from plugins/other/oracle_sysmetricspl rename to plugins/oracle/oracle_sysmetricspl diff --git a/plugins/other/ossec-active-response b/plugins/ossec/ossec-active-response similarity index 100% rename from plugins/other/ossec-active-response rename to plugins/ossec/ossec-active-response diff --git a/plugins/other/ossec-agents b/plugins/ossec/ossec-agents similarity index 100% rename from plugins/other/ossec-agents rename to plugins/ossec/ossec-agents diff --git a/plugins/other/ossec-alerts b/plugins/ossec/ossec-alerts similarity index 100% rename from plugins/other/ossec-alerts rename to plugins/ossec/ossec-alerts diff --git a/plugins/other/passenger_status b/plugins/passenger/passenger_status similarity index 100% rename from plugins/other/passenger_status rename to plugins/passenger/passenger_status diff --git a/plugins/other/pdns_rec_answers b/plugins/pdns/pdns_rec_answers similarity index 100% rename from plugins/other/pdns_rec_answers rename to plugins/pdns/pdns_rec_answers diff --git a/plugins/other/pdns_rec_cache b/plugins/pdns/pdns_rec_cache similarity index 100% rename from plugins/other/pdns_rec_cache rename to plugins/pdns/pdns_rec_cache diff --git a/plugins/other/pdns_rec_cache_size b/plugins/pdns/pdns_rec_cache_size similarity index 100% rename from plugins/other/pdns_rec_cache_size rename to plugins/pdns/pdns_rec_cache_size diff --git a/plugins/other/pdns_rec_concurrent b/plugins/pdns/pdns_rec_concurrent similarity index 100% rename from plugins/other/pdns_rec_concurrent rename to plugins/pdns/pdns_rec_concurrent diff --git a/plugins/other/pdns_rec_issues b/plugins/pdns/pdns_rec_issues similarity index 100% rename from plugins/other/pdns_rec_issues rename to plugins/pdns/pdns_rec_issues diff --git a/plugins/other/pdns_rec_outqueries b/plugins/pdns/pdns_rec_outqueries similarity index 100% rename from plugins/other/pdns_rec_outqueries rename to plugins/pdns/pdns_rec_outqueries diff --git a/plugins/other/pdns_rec_querylatency b/plugins/pdns/pdns_rec_querylatency similarity index 100% rename from plugins/other/pdns_rec_querylatency rename to plugins/pdns/pdns_rec_querylatency diff --git a/plugins/other/pdns_rec_questions b/plugins/pdns/pdns_rec_questions similarity index 100% rename from plugins/other/pdns_rec_questions rename to plugins/pdns/pdns_rec_questions diff --git a/plugins/other/pdns_rec_throttle b/plugins/pdns/pdns_rec_throttle similarity index 100% rename from plugins/other/pdns_rec_throttle rename to plugins/pdns/pdns_rec_throttle diff --git a/plugins/other/pdns_rec_unauth b/plugins/pdns/pdns_rec_unauth similarity index 100% rename from plugins/other/pdns_rec_unauth rename to plugins/pdns/pdns_rec_unauth diff --git a/plugins/other/eaccelerator-python b/plugins/php/eaccelerator-python similarity index 100% rename from plugins/other/eaccelerator-python rename to plugins/php/eaccelerator-python diff --git a/plugins/other/eaccelerator-usage b/plugins/php/eaccelerator-usage similarity index 100% rename from plugins/other/eaccelerator-usage rename to plugins/php/eaccelerator-usage diff --git a/plugins/other/php-fastcgi b/plugins/php/php-fastcgi similarity index 100% rename from plugins/other/php-fastcgi rename to plugins/php/php-fastcgi diff --git a/plugins/other/php-fcgi b/plugins/php/php-fcgi similarity index 100% rename from plugins/other/php-fcgi rename to plugins/php/php-fcgi diff --git a/plugins/other/php_apc_ b/plugins/php/php_apc_ similarity index 100% rename from plugins/other/php_apc_ rename to plugins/php/php_apc_ diff --git a/plugins/other/php_xcache b/plugins/php/php_xcache similarity index 100% rename from plugins/other/php_xcache rename to plugins/php/php_xcache diff --git a/plugins/other/amavis-debian b/plugins/postfix/amavis-debian similarity index 100% rename from plugins/other/amavis-debian rename to plugins/postfix/amavis-debian diff --git a/plugins/other/greyfix b/plugins/postfix/greyfix similarity index 100% rename from plugins/other/greyfix rename to plugins/postfix/greyfix diff --git a/plugins/other/postfix-queue-size b/plugins/postfix/postfix-queue-size similarity index 100% rename from plugins/other/postfix-queue-size rename to plugins/postfix/postfix-queue-size diff --git a/plugins/other/postfix_mail_stats b/plugins/postfix/postfix_mail_stats similarity index 100% rename from plugins/other/postfix_mail_stats rename to plugins/postfix/postfix_mail_stats diff --git a/plugins/other/postfix_mailstats b/plugins/postfix/postfix_mailstats similarity index 100% rename from plugins/other/postfix_mailstats rename to plugins/postfix/postfix_mailstats diff --git a/plugins/other/pg__connections b/plugins/postgresql/pg__connections similarity index 100% rename from plugins/other/pg__connections rename to plugins/postgresql/pg__connections diff --git a/plugins/other/postgres_block_read_ b/plugins/postgresql/postgres_block_read_ similarity index 100% rename from plugins/other/postgres_block_read_ rename to plugins/postgresql/postgres_block_read_ diff --git a/plugins/other/postgres_locks b/plugins/postgresql/postgres_locks similarity index 100% rename from plugins/other/postgres_locks rename to plugins/postgresql/postgres_locks diff --git a/plugins/other/postgres_queries2_ b/plugins/postgresql/postgres_queries2_ similarity index 100% rename from plugins/other/postgres_queries2_ rename to plugins/postgresql/postgres_queries2_ diff --git a/plugins/other/postgres_space_ b/plugins/postgresql/postgres_space_ similarity index 100% rename from plugins/other/postgres_space_ rename to plugins/postgresql/postgres_space_ diff --git a/plugins/other/postgresql-multigraph-munin-plugin b/plugins/postgresql/postgresql-multigraph-munin-plugin similarity index 100% rename from plugins/other/postgresql-multigraph-munin-plugin rename to plugins/postgresql/postgresql-multigraph-munin-plugin diff --git a/plugins/other/postgresql_active_backends b/plugins/postgresql/postgresql_active_backends similarity index 100% rename from plugins/other/postgresql_active_backends rename to plugins/postgresql/postgresql_active_backends diff --git a/plugins/other/postgresql_active_locks b/plugins/postgresql/postgresql_active_locks similarity index 100% rename from plugins/other/postgresql_active_locks rename to plugins/postgresql/postgresql_active_locks diff --git a/plugins/other/postgresql_database_ratio b/plugins/postgresql/postgresql_database_ratio similarity index 100% rename from plugins/other/postgresql_database_ratio rename to plugins/postgresql/postgresql_database_ratio diff --git a/plugins/other/postgresql_database_size b/plugins/postgresql/postgresql_database_size similarity index 100% rename from plugins/other/postgresql_database_size rename to plugins/postgresql/postgresql_database_size diff --git a/plugins/other/postgresql_tablespace_size b/plugins/postgresql/postgresql_tablespace_size similarity index 100% rename from plugins/other/postgresql_tablespace_size rename to plugins/postgresql/postgresql_tablespace_size diff --git a/plugins/other/postgresql_transactions b/plugins/postgresql/postgresql_transactions similarity index 100% rename from plugins/other/postgresql_transactions rename to plugins/postgresql/postgresql_transactions diff --git a/plugins/other/slony_ b/plugins/postgresql/slony_ similarity index 100% rename from plugins/other/slony_ rename to plugins/postgresql/slony_ diff --git a/plugins/other/acpi_batt_ b/plugins/power/acpi_batt_ similarity index 100% rename from plugins/other/acpi_batt_ rename to plugins/power/acpi_batt_ diff --git a/plugins/other/acpi_sys_batt_ b/plugins/power/acpi_sys_batt_ similarity index 100% rename from plugins/other/acpi_sys_batt_ rename to plugins/power/acpi_sys_batt_ diff --git a/plugins/other/pdns_errors b/plugins/power/pdns_errors similarity index 100% rename from plugins/other/pdns_errors rename to plugins/power/pdns_errors diff --git a/plugins/other/pdns_latency b/plugins/power/pdns_latency similarity index 100% rename from plugins/other/pdns_latency rename to plugins/power/pdns_latency diff --git a/plugins/other/pdns_qsize b/plugins/power/pdns_qsize similarity index 100% rename from plugins/other/pdns_qsize rename to plugins/power/pdns_qsize diff --git a/plugins/other/pdns_queries b/plugins/power/pdns_queries similarity index 100% rename from plugins/other/pdns_queries rename to plugins/power/pdns_queries diff --git a/plugins/other/pdns_rel b/plugins/power/pdns_rel similarity index 100% rename from plugins/other/pdns_rel rename to plugins/power/pdns_rel diff --git a/plugins/other/consumed_cpu_cycles b/plugins/power5/consumed_cpu_cycles similarity index 100% rename from plugins/other/consumed_cpu_cycles rename to plugins/power5/consumed_cpu_cycles diff --git a/plugins/other/cpu_entitlemens b/plugins/power5/cpu_entitlemens similarity index 100% rename from plugins/other/cpu_entitlemens rename to plugins/power5/cpu_entitlemens diff --git a/plugins/other/cpu_in_lpar b/plugins/power5/cpu_in_lpar similarity index 100% rename from plugins/other/cpu_in_lpar rename to plugins/power5/cpu_in_lpar diff --git a/plugins/other/weight_of_a_lpar b/plugins/power5/weight_of_a_lpar similarity index 100% rename from plugins/other/weight_of_a_lpar rename to plugins/power5/weight_of_a_lpar diff --git a/plugins/other/pmta_ b/plugins/powermta/pmta_ similarity index 100% rename from plugins/other/pmta_ rename to plugins/powermta/pmta_ diff --git a/plugins/other/powermta_vmta_recpients b/plugins/powermta/powermta_vmta_recpients similarity index 100% rename from plugins/other/powermta_vmta_recpients rename to plugins/powermta/powermta_vmta_recpients diff --git a/plugins/other/printer-ink-levels-by-percent b/plugins/print/printer-ink-levels-by-percent similarity index 100% rename from plugins/other/printer-ink-levels-by-percent rename to plugins/print/printer-ink-levels-by-percent diff --git a/plugins/other/dell_5310n_health_ b/plugins/printer/dell_5310n_health_ similarity index 100% rename from plugins/other/dell_5310n_health_ rename to plugins/printer/dell_5310n_health_ diff --git a/plugins/other/dell_5310n_pages_ b/plugins/printer/dell_5310n_pages_ similarity index 100% rename from plugins/other/dell_5310n_pages_ rename to plugins/printer/dell_5310n_pages_ diff --git a/plugins/other/oki_c5500_health_ b/plugins/printer/oki_c5500_health_ similarity index 100% rename from plugins/other/oki_c5500_health_ rename to plugins/printer/oki_c5500_health_ diff --git a/plugins/other/oki_c5500_pages_ b/plugins/printer/oki_c5500_pages_ similarity index 100% rename from plugins/other/oki_c5500_pages_ rename to plugins/printer/oki_c5500_pages_ diff --git a/plugins/other/toshiba_5520c_byfunction_black_ b/plugins/printer/toshiba_5520c_byfunction_black_ similarity index 100% rename from plugins/other/toshiba_5520c_byfunction_black_ rename to plugins/printer/toshiba_5520c_byfunction_black_ diff --git a/plugins/other/toshiba_5520c_byfunction_fullcolor_ b/plugins/printer/toshiba_5520c_byfunction_fullcolor_ similarity index 100% rename from plugins/other/toshiba_5520c_byfunction_fullcolor_ rename to plugins/printer/toshiba_5520c_byfunction_fullcolor_ diff --git a/plugins/other/toshiba_5520c_byfunction_twincolor_ b/plugins/printer/toshiba_5520c_byfunction_twincolor_ similarity index 100% rename from plugins/other/toshiba_5520c_byfunction_twincolor_ rename to plugins/printer/toshiba_5520c_byfunction_twincolor_ diff --git a/plugins/other/toshiba_5520c_print_ b/plugins/printer/toshiba_5520c_print_ similarity index 100% rename from plugins/other/toshiba_5520c_print_ rename to plugins/printer/toshiba_5520c_print_ diff --git a/plugins/other/toshiba_5520c_scan_ b/plugins/printer/toshiba_5520c_scan_ similarity index 100% rename from plugins/other/toshiba_5520c_scan_ rename to plugins/printer/toshiba_5520c_scan_ diff --git a/plugins/other/snmp_hplj2015 b/plugins/printers/snmp_hplj2015 similarity index 100% rename from plugins/other/snmp_hplj2015 rename to plugins/printers/snmp_hplj2015 diff --git a/plugins/other/snmp_hplj4xxx b/plugins/printers/snmp_hplj4xxx similarity index 100% rename from plugins/other/snmp_hplj4xxx rename to plugins/printers/snmp_hplj4xxx diff --git a/plugins/other/snmp_xerox3xxx b/plugins/printers/snmp_xerox3xxx similarity index 100% rename from plugins/other/snmp_xerox3xxx rename to plugins/printers/snmp_xerox3xxx diff --git a/plugins/other/snmp_xerox_wc-7x32 b/plugins/printers/snmp_xerox_wc-7x32 similarity index 100% rename from plugins/other/snmp_xerox_wc-7x32 rename to plugins/printers/snmp_xerox_wc-7x32 diff --git a/plugins/other/xerox-wc3220 b/plugins/printers/xerox-wc3220 similarity index 100% rename from plugins/other/xerox-wc3220 rename to plugins/printers/xerox-wc3220 diff --git a/plugins/other/xerox-wc7232-consumables b/plugins/printers/xerox-wc7232-consumables similarity index 100% rename from plugins/other/xerox-wc7232-consumables rename to plugins/printers/xerox-wc7232-consumables diff --git a/plugins/other/cpuload_ b/plugins/processes/cpuload_ similarity index 100% rename from plugins/other/cpuload_ rename to plugins/processes/cpuload_ diff --git a/plugins/other/cpuutil b/plugins/processes/cpuutil similarity index 100% rename from plugins/other/cpuutil rename to plugins/processes/cpuutil diff --git a/plugins/other/multicpu b/plugins/processes/multicpu similarity index 100% rename from plugins/other/multicpu rename to plugins/processes/multicpu diff --git a/plugins/other/multimemory b/plugins/processes/multimemory similarity index 100% rename from plugins/other/multimemory rename to plugins/processes/multimemory diff --git a/plugins/other/multips b/plugins/processes/multips similarity index 100% rename from plugins/other/multips rename to plugins/processes/multips diff --git a/plugins/other/multipsu b/plugins/processes/multipsu similarity index 100% rename from plugins/other/multipsu rename to plugins/processes/multipsu diff --git a/plugins/other/proc_mem b/plugins/processes/proc_mem similarity index 100% rename from plugins/other/proc_mem rename to plugins/processes/proc_mem diff --git a/plugins/other/process_count b/plugins/processes/process_count similarity index 100% rename from plugins/other/process_count rename to plugins/processes/process_count diff --git a/plugins/other/process_cpushare b/plugins/processes/process_cpushare similarity index 100% rename from plugins/other/process_cpushare rename to plugins/processes/process_cpushare diff --git a/plugins/other/processes b/plugins/processes/processes similarity index 100% rename from plugins/other/processes rename to plugins/processes/processes diff --git a/plugins/other/vserver_procs b/plugins/processes/vserver_procs similarity index 100% rename from plugins/other/vserver_procs rename to plugins/processes/vserver_procs diff --git a/plugins/other/stats_apache2 b/plugins/programmes/stats_apache2 similarity index 100% rename from plugins/other/stats_apache2 rename to plugins/programmes/stats_apache2 diff --git a/plugins/other/prosody b/plugins/prosody/prosody similarity index 100% rename from plugins/other/prosody rename to plugins/prosody/prosody diff --git a/plugins/other/puppetmaster b/plugins/puppet/puppetmaster similarity index 100% rename from plugins/other/puppetmaster rename to plugins/puppet/puppetmaster diff --git a/plugins/other/pure-ftpd-bw b/plugins/pure/pure-ftpd-bw similarity index 100% rename from plugins/other/pure-ftpd-bw rename to plugins/pure/pure-ftpd-bw diff --git a/plugins/other/pure-ftpd-logs b/plugins/pure/pure-ftpd-logs similarity index 100% rename from plugins/other/pure-ftpd-logs rename to plugins/pure/pure-ftpd-logs diff --git a/plugins/other/pureftpd_traffic b/plugins/pureftpd/pureftpd_traffic similarity index 100% rename from plugins/other/pureftpd_traffic rename to plugins/pureftpd/pureftpd_traffic diff --git a/plugins/other/qpsmtpd_mailstats b/plugins/qpsmtpd/qpsmtpd_mailstats similarity index 100% rename from plugins/other/qpsmtpd_mailstats rename to plugins/qpsmtpd/qpsmtpd_mailstats diff --git a/plugins/other/rabbitmq-connections b/plugins/rabbitmq/rabbitmq-connections similarity index 100% rename from plugins/other/rabbitmq-connections rename to plugins/rabbitmq/rabbitmq-connections diff --git a/plugins/other/rabbitmq-consumers b/plugins/rabbitmq/rabbitmq-consumers similarity index 100% rename from plugins/other/rabbitmq-consumers rename to plugins/rabbitmq/rabbitmq-consumers diff --git a/plugins/other/rabbitmq-messages b/plugins/rabbitmq/rabbitmq-messages similarity index 100% rename from plugins/other/rabbitmq-messages rename to plugins/rabbitmq/rabbitmq-messages diff --git a/plugins/other/rabbitmq-messages_unacknowledged b/plugins/rabbitmq/rabbitmq-messages_unacknowledged similarity index 100% rename from plugins/other/rabbitmq-messages_unacknowledged rename to plugins/rabbitmq/rabbitmq-messages_unacknowledged diff --git a/plugins/other/rabbitmq-queue_memory b/plugins/rabbitmq/rabbitmq-queue_memory similarity index 100% rename from plugins/other/rabbitmq-queue_memory rename to plugins/rabbitmq/rabbitmq-queue_memory diff --git a/plugins/other/rabbitmq-throughput b/plugins/rabbitmq/rabbitmq-throughput similarity index 100% rename from plugins/other/rabbitmq-throughput rename to plugins/rabbitmq/rabbitmq-throughput diff --git a/plugins/other/rabbitmq_list_queues b/plugins/rabbitmq/rabbitmq_list_queues similarity index 100% rename from plugins/other/rabbitmq_list_queues rename to plugins/rabbitmq/rabbitmq_list_queues diff --git a/plugins/other/radiator_acct_lag b/plugins/radiator/radiator_acct_lag similarity index 100% rename from plugins/other/radiator_acct_lag rename to plugins/radiator/radiator_acct_lag diff --git a/plugins/other/radiator_acct_ppm b/plugins/radiator/radiator_acct_ppm similarity index 100% rename from plugins/other/radiator_acct_ppm rename to plugins/radiator/radiator_acct_ppm diff --git a/plugins/other/radiator_auth_lag b/plugins/radiator/radiator_auth_lag similarity index 100% rename from plugins/other/radiator_auth_lag rename to plugins/radiator/radiator_auth_lag diff --git a/plugins/other/radiator_auth_ppm b/plugins/radiator/radiator_auth_ppm similarity index 100% rename from plugins/other/radiator_auth_ppm rename to plugins/radiator/radiator_auth_ppm diff --git a/plugins/other/redis b/plugins/redis/redis similarity index 100% rename from plugins/other/redis rename to plugins/redis/redis diff --git a/plugins/other/redis-speed b/plugins/redis/redis-speed similarity index 100% rename from plugins/other/redis-speed rename to plugins/redis/redis-speed diff --git a/plugins/other/rt_ticket_loadtime b/plugins/requesttracker/rt_ticket_loadtime similarity index 100% rename from plugins/other/rt_ticket_loadtime rename to plugins/requesttracker/rt_ticket_loadtime diff --git a/plugins/other/riak_memory b/plugins/riak/riak_memory similarity index 100% rename from plugins/other/riak_memory rename to plugins/riak/riak_memory diff --git a/plugins/other/riak_node b/plugins/riak/riak_node similarity index 100% rename from plugins/other/riak_node rename to plugins/riak/riak_node diff --git a/plugins/other/rsyncd_bytes b/plugins/rsync/rsyncd_bytes similarity index 100% rename from plugins/other/rsyncd_bytes rename to plugins/rsync/rsyncd_bytes diff --git a/plugins/other/rsyncd_count b/plugins/rsync/rsyncd_count similarity index 100% rename from plugins/other/rsyncd_count rename to plugins/rsync/rsyncd_count diff --git a/plugins/other/rtom_mem b/plugins/rtorrent/rtom_mem similarity index 100% rename from plugins/other/rtom_mem rename to plugins/rtorrent/rtom_mem diff --git a/plugins/other/rtom_peers b/plugins/rtorrent/rtom_peers similarity index 100% rename from plugins/other/rtom_peers rename to plugins/rtorrent/rtom_peers diff --git a/plugins/other/rtom_spdd b/plugins/rtorrent/rtom_spdd similarity index 100% rename from plugins/other/rtom_spdd rename to plugins/rtorrent/rtom_spdd diff --git a/plugins/other/rtom_vol b/plugins/rtorrent/rtom_vol similarity index 100% rename from plugins/other/rtom_vol rename to plugins/rtorrent/rtom_vol diff --git a/plugins/other/s3_items b/plugins/s3/s3_items similarity index 100% rename from plugins/other/s3_items rename to plugins/s3/s3_items diff --git a/plugins/other/s3_storage b/plugins/s3/s3_storage similarity index 100% rename from plugins/other/s3_storage rename to plugins/s3/s3_storage diff --git a/plugins/other/samba_locked b/plugins/samba/samba_locked similarity index 100% rename from plugins/other/samba_locked rename to plugins/samba/samba_locked diff --git a/plugins/other/samba_users b/plugins/samba/samba_users similarity index 100% rename from plugins/other/samba_users rename to plugins/samba/samba_users diff --git a/plugins/other/fc-switch-ports b/plugins/san/fc-switch-ports similarity index 100% rename from plugins/other/fc-switch-ports rename to plugins/san/fc-switch-ports diff --git a/plugins/other/scalix_clients b/plugins/scalix/scalix_clients similarity index 100% rename from plugins/other/scalix_clients rename to plugins/scalix/scalix_clients diff --git a/plugins/other/scalix_indexwork b/plugins/scalix/scalix_indexwork similarity index 100% rename from plugins/other/scalix_indexwork rename to plugins/scalix/scalix_indexwork diff --git a/plugins/other/scalix_processes b/plugins/scalix/scalix_processes similarity index 100% rename from plugins/other/scalix_processes rename to plugins/scalix/scalix_processes diff --git a/plugins/other/scalix_queues b/plugins/scalix/scalix_queues similarity index 100% rename from plugins/other/scalix_queues rename to plugins/scalix/scalix_queues diff --git a/plugins/other/forefront_ b/plugins/security/forefront_ similarity index 100% rename from plugins/other/forefront_ rename to plugins/security/forefront_ diff --git a/plugins/other/sequoia_websens b/plugins/sensor/sequoia_websens similarity index 100% rename from plugins/other/sequoia_websens rename to plugins/sensor/sequoia_websens diff --git a/plugins/other/acpi-battery b/plugins/sensors/acpi-battery similarity index 100% rename from plugins/other/acpi-battery rename to plugins/sensors/acpi-battery diff --git a/plugins/other/cleware b/plugins/sensors/cleware similarity index 100% rename from plugins/other/cleware rename to plugins/sensors/cleware diff --git a/plugins/other/coretemp b/plugins/sensors/coretemp similarity index 100% rename from plugins/other/coretemp rename to plugins/sensors/coretemp diff --git a/plugins/other/cpu_tmp_sensors b/plugins/sensors/cpu_tmp_sensors similarity index 100% rename from plugins/other/cpu_tmp_sensors rename to plugins/sensors/cpu_tmp_sensors diff --git a/plugins/other/cputemp b/plugins/sensors/cputemp similarity index 100% rename from plugins/other/cputemp rename to plugins/sensors/cputemp diff --git a/plugins/other/esxi__sensors b/plugins/sensors/esxi__sensors similarity index 100% rename from plugins/other/esxi__sensors rename to plugins/sensors/esxi__sensors diff --git a/plugins/other/fbdimm_temp b/plugins/sensors/fbdimm_temp similarity index 100% rename from plugins/other/fbdimm_temp rename to plugins/sensors/fbdimm_temp diff --git a/plugins/other/freeipmi_ b/plugins/sensors/freeipmi_ similarity index 100% rename from plugins/other/freeipmi_ rename to plugins/sensors/freeipmi_ diff --git a/plugins/other/hddtemp b/plugins/sensors/hddtemp similarity index 100% rename from plugins/other/hddtemp rename to plugins/sensors/hddtemp diff --git a/plugins/other/hddtemp_smartctl b/plugins/sensors/hddtemp_smartctl similarity index 100% rename from plugins/other/hddtemp_smartctl rename to plugins/sensors/hddtemp_smartctl diff --git a/plugins/other/hpasmcli2_ b/plugins/sensors/hpasmcli2_ similarity index 100% rename from plugins/other/hpasmcli2_ rename to plugins/sensors/hpasmcli2_ diff --git a/plugins/other/humidity-sensor b/plugins/sensors/humidity-sensor similarity index 100% rename from plugins/other/humidity-sensor rename to plugins/sensors/humidity-sensor diff --git a/plugins/other/ip_thermo_125 b/plugins/sensors/ip_thermo_125 similarity index 100% rename from plugins/other/ip_thermo_125 rename to plugins/sensors/ip_thermo_125 diff --git a/plugins/other/ipmi_fans b/plugins/sensors/ipmi_fans similarity index 100% rename from plugins/other/ipmi_fans rename to plugins/sensors/ipmi_fans diff --git a/plugins/other/ipmi_therm b/plugins/sensors/ipmi_therm similarity index 100% rename from plugins/other/ipmi_therm rename to plugins/sensors/ipmi_therm diff --git a/plugins/other/ipmisens-v3 b/plugins/sensors/ipmisens-v3 similarity index 100% rename from plugins/other/ipmisens-v3 rename to plugins/sensors/ipmisens-v3 diff --git a/plugins/other/ipmitool_sensor_ b/plugins/sensors/ipmitool_sensor_ similarity index 100% rename from plugins/other/ipmitool_sensor_ rename to plugins/sensors/ipmitool_sensor_ diff --git a/plugins/other/k8temp b/plugins/sensors/k8temp similarity index 100% rename from plugins/other/k8temp rename to plugins/sensors/k8temp diff --git a/plugins/other/mbmon b/plugins/sensors/mbmon similarity index 100% rename from plugins/other/mbmon rename to plugins/sensors/mbmon diff --git a/plugins/other/megaraid-hdd-temperature-using-megacli b/plugins/sensors/megaraid-hdd-temperature-using-megacli similarity index 100% rename from plugins/other/megaraid-hdd-temperature-using-megacli rename to plugins/sensors/megaraid-hdd-temperature-using-megacli diff --git a/plugins/other/nut b/plugins/sensors/nut similarity index 100% rename from plugins/other/nut rename to plugins/sensors/nut diff --git a/plugins/other/nutups2_ b/plugins/sensors/nutups2_ similarity index 100% rename from plugins/other/nutups2_ rename to plugins/sensors/nutups2_ diff --git a/plugins/other/nvclock b/plugins/sensors/nvclock similarity index 100% rename from plugins/other/nvclock rename to plugins/sensors/nvclock diff --git a/plugins/other/omreport_fan_speed b/plugins/sensors/omreport_fan_speed similarity index 100% rename from plugins/other/omreport_fan_speed rename to plugins/sensors/omreport_fan_speed diff --git a/plugins/other/omreport_pwrmon_current b/plugins/sensors/omreport_pwrmon_current similarity index 100% rename from plugins/other/omreport_pwrmon_current rename to plugins/sensors/omreport_pwrmon_current diff --git a/plugins/other/omreport_pwrmon_power b/plugins/sensors/omreport_pwrmon_power similarity index 100% rename from plugins/other/omreport_pwrmon_power rename to plugins/sensors/omreport_pwrmon_power diff --git a/plugins/other/omreport_storage_temp b/plugins/sensors/omreport_storage_temp similarity index 100% rename from plugins/other/omreport_storage_temp rename to plugins/sensors/omreport_storage_temp diff --git a/plugins/other/omreport_temp b/plugins/sensors/omreport_temp similarity index 100% rename from plugins/other/omreport_temp rename to plugins/sensors/omreport_temp diff --git a/plugins/other/room_alert_ b/plugins/sensors/room_alert_ similarity index 100% rename from plugins/other/room_alert_ rename to plugins/sensors/room_alert_ diff --git a/plugins/other/snmp__hp_temp b/plugins/sensors/snmp__hp_temp similarity index 100% rename from plugins/other/snmp__hp_temp rename to plugins/sensors/snmp__hp_temp diff --git a/plugins/other/snmp__linksys_poe b/plugins/sensors/snmp__linksys_poe similarity index 100% rename from plugins/other/snmp__linksys_poe rename to plugins/sensors/snmp__linksys_poe diff --git a/plugins/other/snmp__sfsnmp_fan b/plugins/sensors/snmp__sfsnmp_fan similarity index 100% rename from plugins/other/snmp__sfsnmp_fan rename to plugins/sensors/snmp__sfsnmp_fan diff --git a/plugins/other/snmp__sfsnmp_temp b/plugins/sensors/snmp__sfsnmp_temp similarity index 100% rename from plugins/other/snmp__sfsnmp_temp rename to plugins/sensors/snmp__sfsnmp_temp diff --git a/plugins/other/snmp__sfsnmp_volt b/plugins/sensors/snmp__sfsnmp_volt similarity index 100% rename from plugins/other/snmp__sfsnmp_volt rename to plugins/sensors/snmp__sfsnmp_volt diff --git a/plugins/other/snmp__ups_battery b/plugins/sensors/snmp__ups_battery similarity index 100% rename from plugins/other/snmp__ups_battery rename to plugins/sensors/snmp__ups_battery diff --git a/plugins/other/snmp__ups_temp b/plugins/sensors/snmp__ups_temp similarity index 100% rename from plugins/other/snmp__ups_temp rename to plugins/sensors/snmp__ups_temp diff --git a/plugins/other/snmp__ups_voltage b/plugins/sensors/snmp__ups_voltage similarity index 100% rename from plugins/other/snmp__ups_voltage rename to plugins/sensors/snmp__ups_voltage diff --git a/plugins/other/temperature_ b/plugins/sensors/temperature_ similarity index 100% rename from plugins/other/temperature_ rename to plugins/sensors/temperature_ diff --git a/plugins/other/temperatures b/plugins/sensors/temperatures similarity index 100% rename from plugins/other/temperatures rename to plugins/sensors/temperatures diff --git a/plugins/other/w1-therm b/plugins/sensors/w1-therm similarity index 100% rename from plugins/other/w1-therm rename to plugins/sensors/w1-therm diff --git a/plugins/other/weather_ b/plugins/sensors/weather_ similarity index 100% rename from plugins/other/weather_ rename to plugins/sensors/weather_ diff --git a/plugins/other/wfrog b/plugins/sensors/wfrog similarity index 100% rename from plugins/other/wfrog rename to plugins/sensors/wfrog diff --git a/plugins/other/hostdenied b/plugins/services/hostdenied similarity index 100% rename from plugins/other/hostdenied rename to plugins/services/hostdenied diff --git a/plugins/other/ircd b/plugins/services/ircd similarity index 100% rename from plugins/other/ircd rename to plugins/services/ircd diff --git a/plugins/other/sge_queue_ b/plugins/sge/sge_queue_ similarity index 100% rename from plugins/other/sge_queue_ rename to plugins/sge/sge_queue_ diff --git a/plugins/other/shoutcast b/plugins/shoutcast/shoutcast similarity index 100% rename from plugins/other/shoutcast rename to plugins/shoutcast/shoutcast diff --git a/plugins/other/slony_lag_events_ b/plugins/slony/slony_lag_events_ similarity index 100% rename from plugins/other/slony_lag_events_ rename to plugins/slony/slony_lag_events_ diff --git a/plugins/other/slony_lag_time b/plugins/slony/slony_lag_time similarity index 100% rename from plugins/other/slony_lag_time rename to plugins/slony/slony_lag_time diff --git a/plugins/other/slony_lag_time_ b/plugins/slony/slony_lag_time_ similarity index 100% rename from plugins/other/slony_lag_time_ rename to plugins/slony/slony_lag_time_ diff --git a/plugins/other/smstools_ b/plugins/smstools/smstools_ similarity index 100% rename from plugins/other/smstools_ rename to plugins/smstools/smstools_ diff --git a/plugins/other/snmp_hp_ b/plugins/snmp/snmp_hp_ similarity index 100% rename from plugins/other/snmp_hp_ rename to plugins/snmp/snmp_hp_ diff --git a/plugins/other/solr b/plugins/solr/solr similarity index 100% rename from plugins/other/solr rename to plugins/solr/solr diff --git a/plugins/other/solr-stats b/plugins/solr/solr-stats similarity index 100% rename from plugins/other/solr-stats rename to plugins/solr/solr-stats diff --git a/plugins/other/solrmulticore b/plugins/solr/solrmulticore similarity index 100% rename from plugins/other/solrmulticore rename to plugins/solr/solrmulticore diff --git a/plugins/other/srcds_cpu b/plugins/sourceds/srcds_cpu similarity index 100% rename from plugins/other/srcds_cpu rename to plugins/sourceds/srcds_cpu diff --git a/plugins/other/srcds_fps b/plugins/sourceds/srcds_fps similarity index 100% rename from plugins/other/srcds_fps rename to plugins/sourceds/srcds_fps diff --git a/plugins/other/srcds_inout b/plugins/sourceds/srcds_inout similarity index 100% rename from plugins/other/srcds_inout rename to plugins/sourceds/srcds_inout diff --git a/plugins/other/srcds_players b/plugins/sourceds/srcds_players similarity index 100% rename from plugins/other/srcds_players rename to plugins/sourceds/srcds_players diff --git a/plugins/other/srcds_uptime b/plugins/sourceds/srcds_uptime similarity index 100% rename from plugins/other/srcds_uptime rename to plugins/sourceds/srcds_uptime diff --git a/plugins/other/spotweb_average b/plugins/spotweb/spotweb_average similarity index 100% rename from plugins/other/spotweb_average rename to plugins/spotweb/spotweb_average diff --git a/plugins/other/spotweb_cat_average b/plugins/spotweb/spotweb_cat_average similarity index 100% rename from plugins/other/spotweb_cat_average rename to plugins/spotweb/spotweb_cat_average diff --git a/plugins/other/spotweb_cat_total b/plugins/spotweb/spotweb_cat_total similarity index 100% rename from plugins/other/spotweb_cat_total rename to plugins/spotweb/spotweb_cat_total diff --git a/plugins/other/spotweb_catsize_average b/plugins/spotweb/spotweb_catsize_average similarity index 100% rename from plugins/other/spotweb_catsize_average rename to plugins/spotweb/spotweb_catsize_average diff --git a/plugins/other/spotweb_total b/plugins/spotweb/spotweb_total similarity index 100% rename from plugins/other/spotweb_total rename to plugins/spotweb/spotweb_total diff --git a/plugins/other/squeezebox_multi b/plugins/squeezebox/squeezebox_multi similarity index 100% rename from plugins/other/squeezebox_multi rename to plugins/squeezebox/squeezebox_multi diff --git a/plugins/other/squid_efficiency b/plugins/squid/squid_efficiency similarity index 100% rename from plugins/other/squid_efficiency rename to plugins/squid/squid_efficiency diff --git a/plugins/other/squid_times b/plugins/squid/squid_times similarity index 100% rename from plugins/other/squid_times rename to plugins/squid/squid_times diff --git a/plugins/other/openssh-denyhosts b/plugins/ssh/openssh-denyhosts similarity index 100% rename from plugins/other/openssh-denyhosts rename to plugins/ssh/openssh-denyhosts diff --git a/plugins/other/icecast2 b/plugins/stream/icecast2 similarity index 100% rename from plugins/other/icecast2 rename to plugins/stream/icecast2 diff --git a/plugins/other/shoutcast2_multi b/plugins/streamid_/shoutcast2_multi similarity index 100% rename from plugins/other/shoutcast2_multi rename to plugins/streamid_/shoutcast2_multi diff --git a/plugins/other/snmp__wmsconnectedplayers b/plugins/streaming/snmp__wmsconnectedplayers similarity index 100% rename from plugins/other/snmp__wmsconnectedplayers rename to plugins/streaming/snmp__wmsconnectedplayers diff --git a/plugins/other/snmp__wmsplayerallocatedbandwidth b/plugins/streaming/snmp__wmsplayerallocatedbandwidth similarity index 100% rename from plugins/other/snmp__wmsplayerallocatedbandwidth rename to plugins/streaming/snmp__wmsplayerallocatedbandwidth diff --git a/plugins/other/snmp__wmsstreaminghttpplayers b/plugins/streaming/snmp__wmsstreaminghttpplayers similarity index 100% rename from plugins/other/snmp__wmsstreaminghttpplayers rename to plugins/streaming/snmp__wmsstreaminghttpplayers diff --git a/plugins/other/snmp__wmsstreamingmmsplayers b/plugins/streaming/snmp__wmsstreamingmmsplayers similarity index 100% rename from plugins/other/snmp__wmsstreamingmmsplayers rename to plugins/streaming/snmp__wmsstreamingmmsplayers diff --git a/plugins/other/snmp__wmsstreamingplayers b/plugins/streaming/snmp__wmsstreamingplayers similarity index 100% rename from plugins/other/snmp__wmsstreamingplayers rename to plugins/streaming/snmp__wmsstreamingplayers diff --git a/plugins/other/snmp__wmsstreamingrtspplayers b/plugins/streaming/snmp__wmsstreamingrtspplayers similarity index 100% rename from plugins/other/snmp__wmsstreamingrtspplayers rename to plugins/streaming/snmp__wmsstreamingrtspplayers diff --git a/plugins/other/auth b/plugins/system/auth similarity index 100% rename from plugins/other/auth rename to plugins/system/auth diff --git a/plugins/other/bgpd b/plugins/system/bgpd similarity index 100% rename from plugins/other/bgpd rename to plugins/system/bgpd diff --git a/plugins/other/blockhosts b/plugins/system/blockhosts similarity index 100% rename from plugins/other/blockhosts rename to plugins/system/blockhosts diff --git a/plugins/other/buddyinfo b/plugins/system/buddyinfo similarity index 100% rename from plugins/other/buddyinfo rename to plugins/system/buddyinfo diff --git a/plugins/other/cpu-usage-by-process b/plugins/system/cpu-usage-by-process similarity index 100% rename from plugins/other/cpu-usage-by-process rename to plugins/system/cpu-usage-by-process diff --git a/plugins/other/cpu_by_process b/plugins/system/cpu_by_process similarity index 100% rename from plugins/other/cpu_by_process rename to plugins/system/cpu_by_process diff --git a/plugins/other/cpubyuser b/plugins/system/cpubyuser similarity index 100% rename from plugins/other/cpubyuser rename to plugins/system/cpubyuser diff --git a/plugins/other/cpufreq b/plugins/system/cpufreq similarity index 100% rename from plugins/other/cpufreq rename to plugins/system/cpufreq diff --git a/plugins/other/cpufreq-avg b/plugins/system/cpufreq-avg similarity index 100% rename from plugins/other/cpufreq-avg rename to plugins/system/cpufreq-avg diff --git a/plugins/other/cpufreq-info b/plugins/system/cpufreq-info similarity index 100% rename from plugins/other/cpufreq-info rename to plugins/system/cpufreq-info diff --git a/plugins/other/cpufreq_ b/plugins/system/cpufreq_ similarity index 100% rename from plugins/other/cpufreq_ rename to plugins/system/cpufreq_ diff --git a/plugins/other/cpuspeed b/plugins/system/cpuspeed similarity index 100% rename from plugins/other/cpuspeed rename to plugins/system/cpuspeed diff --git a/plugins/other/cpuspeed2 b/plugins/system/cpuspeed2 similarity index 100% rename from plugins/other/cpuspeed2 rename to plugins/system/cpuspeed2 diff --git a/plugins/other/cpuspeed_sane b/plugins/system/cpuspeed_sane similarity index 100% rename from plugins/other/cpuspeed_sane rename to plugins/system/cpuspeed_sane diff --git a/plugins/other/dar_cpuusage b/plugins/system/dar_cpuusage similarity index 100% rename from plugins/other/dar_cpuusage rename to plugins/system/dar_cpuusage diff --git a/plugins/other/dar_memusage b/plugins/system/dar_memusage similarity index 100% rename from plugins/other/dar_memusage rename to plugins/system/dar_memusage diff --git a/plugins/other/dar_swap b/plugins/system/dar_swap similarity index 100% rename from plugins/other/dar_swap rename to plugins/system/dar_swap diff --git a/plugins/other/dar_uptime b/plugins/system/dar_uptime similarity index 100% rename from plugins/other/dar_uptime rename to plugins/system/dar_uptime diff --git a/plugins/other/dar_vmstat b/plugins/system/dar_vmstat similarity index 100% rename from plugins/other/dar_vmstat rename to plugins/system/dar_vmstat diff --git a/plugins/other/debsecan b/plugins/system/debsecan similarity index 100% rename from plugins/other/debsecan rename to plugins/system/debsecan diff --git a/plugins/other/hostsdeny b/plugins/system/hostsdeny similarity index 100% rename from plugins/other/hostsdeny rename to plugins/system/hostsdeny diff --git a/plugins/other/ibmfan b/plugins/system/ibmfan similarity index 100% rename from plugins/other/ibmfan rename to plugins/system/ibmfan diff --git a/plugins/other/iostat-cputps-average b/plugins/system/iostat-cputps-average similarity index 100% rename from plugins/other/iostat-cputps-average rename to plugins/system/iostat-cputps-average diff --git a/plugins/other/ipmi_sdr_ b/plugins/system/ipmi_sdr_ similarity index 100% rename from plugins/other/ipmi_sdr_ rename to plugins/system/ipmi_sdr_ diff --git a/plugins/other/kmemsum b/plugins/system/kmemsum similarity index 100% rename from plugins/other/kmemsum rename to plugins/system/kmemsum diff --git a/plugins/other/load_extended b/plugins/system/load_extended similarity index 100% rename from plugins/other/load_extended rename to plugins/system/load_extended diff --git a/plugins/other/lpar_cpu b/plugins/system/lpar_cpu similarity index 100% rename from plugins/other/lpar_cpu rename to plugins/system/lpar_cpu diff --git a/plugins/other/memory_by_process b/plugins/system/memory_by_process similarity index 100% rename from plugins/other/memory_by_process rename to plugins/system/memory_by_process diff --git a/plugins/other/openbsd-memory b/plugins/system/openbsd-memory similarity index 100% rename from plugins/other/openbsd-memory rename to plugins/system/openbsd-memory diff --git a/plugins/other/openbsd-swap b/plugins/system/openbsd-swap similarity index 100% rename from plugins/other/openbsd-swap rename to plugins/system/openbsd-swap diff --git a/plugins/other/proc_memory_status b/plugins/system/proc_memory_status similarity index 100% rename from plugins/other/proc_memory_status rename to plugins/system/proc_memory_status diff --git a/plugins/other/quagga_routes b/plugins/system/quagga_routes similarity index 100% rename from plugins/other/quagga_routes rename to plugins/system/quagga_routes diff --git a/plugins/other/raminfo b/plugins/system/raminfo similarity index 100% rename from plugins/other/raminfo rename to plugins/system/raminfo diff --git a/plugins/other/read_serial_temperature b/plugins/system/read_serial_temperature similarity index 100% rename from plugins/other/read_serial_temperature rename to plugins/system/read_serial_temperature diff --git a/plugins/other/selinux_avcstat b/plugins/system/selinux_avcstat similarity index 100% rename from plugins/other/selinux_avcstat rename to plugins/system/selinux_avcstat diff --git a/plugins/other/selinux_avcstats b/plugins/system/selinux_avcstats similarity index 100% rename from plugins/other/selinux_avcstats rename to plugins/system/selinux_avcstats diff --git a/plugins/other/snmp__cpu b/plugins/system/snmp__cpu similarity index 100% rename from plugins/other/snmp__cpu rename to plugins/system/snmp__cpu diff --git a/plugins/other/snmp__cpu_usage b/plugins/system/snmp__cpu_usage similarity index 100% rename from plugins/other/snmp__cpu_usage rename to plugins/system/snmp__cpu_usage diff --git a/plugins/other/snmp__fn b/plugins/system/snmp__fn similarity index 100% rename from plugins/other/snmp__fn rename to plugins/system/snmp__fn diff --git a/plugins/other/snmp__ipoman_ b/plugins/system/snmp__ipoman_ similarity index 100% rename from plugins/other/snmp__ipoman_ rename to plugins/system/snmp__ipoman_ diff --git a/plugins/other/snmp__memory_openwrt b/plugins/system/snmp__memory_openwrt similarity index 100% rename from plugins/other/snmp__memory_openwrt rename to plugins/system/snmp__memory_openwrt diff --git a/plugins/other/snmp__memory_win b/plugins/system/snmp__memory_win similarity index 100% rename from plugins/other/snmp__memory_win rename to plugins/system/snmp__memory_win diff --git a/plugins/other/snmp__ups_ b/plugins/system/snmp__ups_ similarity index 100% rename from plugins/other/snmp__ups_ rename to plugins/system/snmp__ups_ diff --git a/plugins/other/snmp__uptime b/plugins/system/snmp__uptime similarity index 100% rename from plugins/other/snmp__uptime rename to plugins/system/snmp__uptime diff --git a/plugins/other/snmp_memory b/plugins/system/snmp_memory similarity index 100% rename from plugins/other/snmp_memory rename to plugins/system/snmp_memory diff --git a/plugins/other/snmp_zyxel_usg__cpu b/plugins/system/snmp_zyxel_usg__cpu similarity index 100% rename from plugins/other/snmp_zyxel_usg__cpu rename to plugins/system/snmp_zyxel_usg__cpu diff --git a/plugins/other/snmp_zyxel_usg__ram b/plugins/system/snmp_zyxel_usg__ram similarity index 100% rename from plugins/other/snmp_zyxel_usg__ram rename to plugins/system/snmp_zyxel_usg__ram diff --git a/plugins/other/snmp_zyxel_usg__sessions b/plugins/system/snmp_zyxel_usg__sessions similarity index 100% rename from plugins/other/snmp_zyxel_usg__sessions rename to plugins/system/snmp_zyxel_usg__sessions diff --git a/plugins/other/snmp_zyxel_zywall__cpu b/plugins/system/snmp_zyxel_zywall__cpu similarity index 100% rename from plugins/other/snmp_zyxel_zywall__cpu rename to plugins/system/snmp_zyxel_zywall__cpu diff --git a/plugins/other/snmp_zyxel_zywall__flash b/plugins/system/snmp_zyxel_zywall__flash similarity index 100% rename from plugins/other/snmp_zyxel_zywall__flash rename to plugins/system/snmp_zyxel_zywall__flash diff --git a/plugins/other/snmp_zyxel_zywall__ram b/plugins/system/snmp_zyxel_zywall__ram similarity index 100% rename from plugins/other/snmp_zyxel_zywall__ram rename to plugins/system/snmp_zyxel_zywall__ram diff --git a/plugins/other/snmp_zyxel_zywall__sessions b/plugins/system/snmp_zyxel_zywall__sessions similarity index 100% rename from plugins/other/snmp_zyxel_zywall__sessions rename to plugins/system/snmp_zyxel_zywall__sessions diff --git a/plugins/other/solaris-memstat b/plugins/system/solaris-memstat similarity index 100% rename from plugins/other/solaris-memstat rename to plugins/system/solaris-memstat diff --git a/plugins/other/sshd_invalid_countries b/plugins/system/sshd_invalid_countries similarity index 100% rename from plugins/other/sshd_invalid_countries rename to plugins/system/sshd_invalid_countries diff --git a/plugins/other/sshd_invalid_countries_ruby b/plugins/system/sshd_invalid_countries_ruby similarity index 100% rename from plugins/other/sshd_invalid_countries_ruby rename to plugins/system/sshd_invalid_countries_ruby diff --git a/plugins/other/swapspace-info b/plugins/system/swapspace-info similarity index 100% rename from plugins/other/swapspace-info rename to plugins/system/swapspace-info diff --git a/plugins/other/systat b/plugins/system/systat similarity index 100% rename from plugins/other/systat rename to plugins/system/systat diff --git a/plugins/other/system_users b/plugins/system/system_users similarity index 100% rename from plugins/other/system_users rename to plugins/system/system_users diff --git a/plugins/other/top-free-memory b/plugins/system/top-free-memory similarity index 100% rename from plugins/other/top-free-memory rename to plugins/system/top-free-memory diff --git a/plugins/other/top-memory b/plugins/system/top-memory similarity index 100% rename from plugins/other/top-memory rename to plugins/system/top-memory diff --git a/plugins/other/uptime b/plugins/system/uptime similarity index 100% rename from plugins/other/uptime rename to plugins/system/uptime diff --git a/plugins/other/uptime_bsd b/plugins/system/uptime_bsd similarity index 100% rename from plugins/other/uptime_bsd rename to plugins/system/uptime_bsd diff --git a/plugins/other/users b/plugins/system/users similarity index 100% rename from plugins/other/users rename to plugins/system/users diff --git a/plugins/other/usersv2 b/plugins/system/usersv2 similarity index 100% rename from plugins/other/usersv2 rename to plugins/system/usersv2 diff --git a/plugins/other/vpsmem b/plugins/system/vpsmem similarity index 100% rename from plugins/other/vpsmem rename to plugins/system/vpsmem diff --git a/plugins/other/zones_cpu b/plugins/system/zones_cpu similarity index 100% rename from plugins/other/zones_cpu rename to plugins/system/zones_cpu diff --git a/plugins/other/zones_mem b/plugins/system/zones_mem similarity index 100% rename from plugins/other/zones_mem rename to plugins/system/zones_mem diff --git a/plugins/other/teamspeak_user b/plugins/teamspeak/teamspeak_user similarity index 100% rename from plugins/other/teamspeak_user rename to plugins/teamspeak/teamspeak_user diff --git a/plugins/other/ts3v2_ b/plugins/teamspeak/ts3v2_ similarity index 100% rename from plugins/other/ts3v2_ rename to plugins/teamspeak/ts3v2_ diff --git a/plugins/other/tsuser b/plugins/teamspeak/tsuser similarity index 100% rename from plugins/other/tsuser rename to plugins/teamspeak/tsuser diff --git a/plugins/other/thin_memory b/plugins/thin/thin_memory similarity index 100% rename from plugins/other/thin_memory rename to plugins/thin/thin_memory diff --git a/plugins/other/thin_threads b/plugins/thin/thin_threads similarity index 100% rename from plugins/other/thin_threads rename to plugins/thin/thin_threads diff --git a/plugins/other/thins_peak_memory b/plugins/thin/thins_peak_memory similarity index 100% rename from plugins/other/thins_peak_memory rename to plugins/thin/thins_peak_memory diff --git a/plugins/other/freeboxuptime b/plugins/time/freeboxuptime similarity index 100% rename from plugins/other/freeboxuptime rename to plugins/time/freeboxuptime diff --git a/plugins/other/ntp_peers b/plugins/time/ntp_peers similarity index 100% rename from plugins/other/ntp_peers rename to plugins/time/ntp_peers diff --git a/plugins/other/jvm-memory b/plugins/tomcat/jvm-memory similarity index 100% rename from plugins/other/jvm-memory rename to plugins/tomcat/jvm-memory diff --git a/plugins/other/jvm-thread-info b/plugins/tomcat/jvm-thread-info similarity index 100% rename from plugins/other/jvm-thread-info rename to plugins/tomcat/jvm-thread-info diff --git a/plugins/other/tomcat b/plugins/tomcat/tomcat similarity index 100% rename from plugins/other/tomcat rename to plugins/tomcat/tomcat diff --git a/plugins/other/tomcat_ b/plugins/tomcat/tomcat_ similarity index 100% rename from plugins/other/tomcat_ rename to plugins/tomcat/tomcat_ diff --git a/plugins/other/tomcatthreads b/plugins/tomcat/tomcatthreads similarity index 100% rename from plugins/other/tomcatthreads rename to plugins/tomcat/tomcatthreads diff --git a/plugins/other/tor-connections b/plugins/tor/tor-connections similarity index 100% rename from plugins/other/tor-connections rename to plugins/tor/tor-connections diff --git a/plugins/other/tor-traffic b/plugins/tor/tor-traffic similarity index 100% rename from plugins/other/tor-traffic rename to plugins/tor/tor-traffic diff --git a/plugins/other/tor_routers b/plugins/tor/tor_routers similarity index 100% rename from plugins/other/tor_routers rename to plugins/tor/tor_routers diff --git a/plugins/other/trafic_ro_24h b/plugins/trafic_ro/trafic_ro_24h similarity index 100% rename from plugins/other/trafic_ro_24h rename to plugins/trafic_ro/trafic_ro_24h diff --git a/plugins/other/hdhomerun_ b/plugins/tv/hdhomerun_ similarity index 100% rename from plugins/other/hdhomerun_ rename to plugins/tv/hdhomerun_ diff --git a/plugins/other/ubuntu-mirrors b/plugins/ubuntu/ubuntu-mirrors similarity index 100% rename from plugins/other/ubuntu-mirrors rename to plugins/ubuntu/ubuntu-mirrors diff --git a/plugins/other/ultramonkey-l7 b/plugins/ultramonkey/ultramonkey-l7 similarity index 100% rename from plugins/other/ultramonkey-l7 rename to plugins/ultramonkey/ultramonkey-l7 diff --git a/plugins/other/unicorn_memory_status b/plugins/unicorn/unicorn_memory_status similarity index 100% rename from plugins/other/unicorn_memory_status rename to plugins/unicorn/unicorn_memory_status diff --git a/plugins/other/unicorn_status b/plugins/unicorn/unicorn_status similarity index 100% rename from plugins/other/unicorn_status rename to plugins/unicorn/unicorn_status diff --git a/plugins/other/apc__snmp_ b/plugins/ups/apc__snmp_ similarity index 100% rename from plugins/other/apc__snmp_ rename to plugins/ups/apc__snmp_ diff --git a/plugins/other/apc_pdu_load b/plugins/ups/apc_pdu_load similarity index 100% rename from plugins/other/apc_pdu_load rename to plugins/ups/apc_pdu_load diff --git a/plugins/other/apcupsd_pct b/plugins/ups/apcupsd_pct similarity index 100% rename from plugins/other/apcupsd_pct rename to plugins/ups/apcupsd_pct diff --git a/plugins/other/apcupsd_ww b/plugins/ups/apcupsd_ww similarity index 100% rename from plugins/other/apcupsd_ww rename to plugins/ups/apcupsd_ww diff --git a/plugins/other/snmp__apcpdu b/plugins/ups/snmp__apcpdu similarity index 100% rename from plugins/other/snmp__apcpdu rename to plugins/ups/snmp__apcpdu diff --git a/plugins/other/varnish2_ b/plugins/varnish/varnish2_ similarity index 100% rename from plugins/other/varnish2_ rename to plugins/varnish/varnish2_ diff --git a/plugins/other/varnish_ b/plugins/varnish/varnish_ similarity index 100% rename from plugins/other/varnish_ rename to plugins/varnish/varnish_ diff --git a/plugins/other/varnish_allocated b/plugins/varnish/varnish_allocated similarity index 100% rename from plugins/other/varnish_allocated rename to plugins/varnish/varnish_allocated diff --git a/plugins/other/varnish_cachehitratio b/plugins/varnish/varnish_cachehitratio similarity index 100% rename from plugins/other/varnish_cachehitratio rename to plugins/varnish/varnish_cachehitratio diff --git a/plugins/other/varnish_healthy_backends b/plugins/varnish/varnish_healthy_backends similarity index 100% rename from plugins/other/varnish_healthy_backends rename to plugins/varnish/varnish_healthy_backends diff --git a/plugins/other/varnish_hitrate b/plugins/varnish/varnish_hitrate similarity index 100% rename from plugins/other/varnish_hitrate rename to plugins/varnish/varnish_hitrate diff --git a/plugins/other/varnish_total_objects b/plugins/varnish/varnish_total_objects similarity index 100% rename from plugins/other/varnish_total_objects rename to plugins/varnish/varnish_total_objects diff --git a/plugins/other/vdr_ b/plugins/vdr/vdr_ similarity index 100% rename from plugins/other/vdr_ rename to plugins/vdr/vdr_ diff --git a/plugins/other/libvirt b/plugins/virtualization/libvirt similarity index 100% rename from plugins/other/libvirt rename to plugins/virtualization/libvirt diff --git a/plugins/other/vm_cpu_load b/plugins/vmware/vm_cpu_load similarity index 100% rename from plugins/other/vm_cpu_load rename to plugins/vmware/vm_cpu_load diff --git a/plugins/other/murmur_ice_users b/plugins/voip/murmur_ice_users similarity index 100% rename from plugins/other/murmur_ice_users rename to plugins/voip/murmur_ice_users diff --git a/plugins/other/murmur_users b/plugins/voip/murmur_users similarity index 100% rename from plugins/other/murmur_users rename to plugins/voip/murmur_users diff --git a/plugins/other/murmurice_host_port_id_description b/plugins/voip/murmurice_host_port_id_description similarity index 100% rename from plugins/other/murmurice_host_port_id_description rename to plugins/voip/murmurice_host_port_id_description diff --git a/plugins/other/murmurice_host_port_id_description_avg b/plugins/voip/murmurice_host_port_id_description_avg similarity index 100% rename from plugins/other/murmurice_host_port_id_description_avg rename to plugins/voip/murmurice_host_port_id_description_avg diff --git a/plugins/other/zapchans b/plugins/voip/zapchans similarity index 100% rename from plugins/other/zapchans rename to plugins/voip/zapchans diff --git a/plugins/other/vserver_cpu_ b/plugins/vserver/vserver_cpu_ similarity index 100% rename from plugins/other/vserver_cpu_ rename to plugins/vserver/vserver_cpu_ diff --git a/plugins/other/vserver_jiffies b/plugins/vserver/vserver_jiffies similarity index 100% rename from plugins/other/vserver_jiffies rename to plugins/vserver/vserver_jiffies diff --git a/plugins/other/vserver_limit_hits b/plugins/vserver/vserver_limit_hits similarity index 100% rename from plugins/other/vserver_limit_hits rename to plugins/vserver/vserver_limit_hits diff --git a/plugins/other/vserver_limits b/plugins/vserver/vserver_limits similarity index 100% rename from plugins/other/vserver_limits rename to plugins/vserver/vserver_limits diff --git a/plugins/other/vserver_loadavg b/plugins/vserver/vserver_loadavg similarity index 100% rename from plugins/other/vserver_loadavg rename to plugins/vserver/vserver_loadavg diff --git a/plugins/other/vserver_resources b/plugins/vserver/vserver_resources similarity index 100% rename from plugins/other/vserver_resources rename to plugins/vserver/vserver_resources diff --git a/plugins/other/buienradar_ b/plugins/weather/buienradar_ similarity index 100% rename from plugins/other/buienradar_ rename to plugins/weather/buienradar_ diff --git a/plugins/other/weather_press_ b/plugins/weather/weather_press_ similarity index 100% rename from plugins/other/weather_press_ rename to plugins/weather/weather_press_ diff --git a/plugins/other/weather_temp_ b/plugins/weather/weather_temp_ similarity index 100% rename from plugins/other/weather_temp_ rename to plugins/weather/weather_temp_ diff --git a/plugins/other/webspherelogin b/plugins/websphere/webspherelogin similarity index 100% rename from plugins/other/webspherelogin rename to plugins/websphere/webspherelogin diff --git a/plugins/other/mediawiki b/plugins/wiki/mediawiki similarity index 100% rename from plugins/other/mediawiki rename to plugins/wiki/mediawiki diff --git a/plugins/other/moinoin_pages b/plugins/wiki/moinoin_pages similarity index 100% rename from plugins/other/moinoin_pages rename to plugins/wiki/moinoin_pages diff --git a/plugins/other/wowza-media-server b/plugins/wowza/wowza-media-server similarity index 100% rename from plugins/other/wowza-media-server rename to plugins/wowza/wowza-media-server diff --git a/plugins/other/wuala_stats b/plugins/wuala/wuala_stats similarity index 100% rename from plugins/other/wuala_stats rename to plugins/wuala/wuala_stats diff --git a/plugins/other/xbnbt_peers b/plugins/xbnbt/xbnbt_peers similarity index 100% rename from plugins/other/xbnbt_peers rename to plugins/xbnbt/xbnbt_peers diff --git a/plugins/other/xen b/plugins/xen/xen similarity index 100% rename from plugins/other/xen rename to plugins/xen/xen diff --git a/plugins/other/xen-cpu b/plugins/xen/xen-cpu similarity index 100% rename from plugins/other/xen-cpu rename to plugins/xen/xen-cpu diff --git a/plugins/other/xen-multi b/plugins/xen/xen-multi similarity index 100% rename from plugins/other/xen-multi rename to plugins/xen/xen-multi diff --git a/plugins/other/xen_cpu_v2 b/plugins/xen/xen_cpu_v2 similarity index 100% rename from plugins/other/xen_cpu_v2 rename to plugins/xen/xen_cpu_v2 diff --git a/plugins/other/xen_memory b/plugins/xen/xen_memory similarity index 100% rename from plugins/other/xen_memory rename to plugins/xen/xen_memory diff --git a/plugins/other/xen_traffic_ b/plugins/xen/xen_traffic_ similarity index 100% rename from plugins/other/xen_traffic_ rename to plugins/xen/xen_traffic_ diff --git a/plugins/other/xen_traffic_all b/plugins/xen/xen_traffic_all similarity index 100% rename from plugins/other/xen_traffic_all rename to plugins/xen/xen_traffic_all diff --git a/plugins/other/xen_vbd b/plugins/xen/xen_vbd similarity index 100% rename from plugins/other/xen_vbd rename to plugins/xen/xen_vbd diff --git a/plugins/other/yacy b/plugins/yacy/yacy similarity index 100% rename from plugins/other/yacy rename to plugins/yacy/yacy diff --git a/plugins/other/zeo_monitor_ b/plugins/zeo/zeo_monitor_ similarity index 100% rename from plugins/other/zeo_monitor_ rename to plugins/zeo/zeo_monitor_ diff --git a/plugins/other/zeomonitor b/plugins/zeo/zeomonitor similarity index 100% rename from plugins/other/zeomonitor rename to plugins/zeo/zeomonitor diff --git a/plugins/other/zfs-filesystem-graph b/plugins/zfs/zfs-filesystem-graph similarity index 100% rename from plugins/other/zfs-filesystem-graph rename to plugins/zfs/zfs-filesystem-graph diff --git a/plugins/other/zfs-statistics-for-freebsd b/plugins/zfs/zfs-statistics-for-freebsd similarity index 100% rename from plugins/other/zfs-statistics-for-freebsd rename to plugins/zfs/zfs-statistics-for-freebsd diff --git a/plugins/other/zfs-stats-for-freebsd-arc-efficiency b/plugins/zfs/zfs-stats-for-freebsd-arc-efficiency similarity index 100% rename from plugins/other/zfs-stats-for-freebsd-arc-efficiency rename to plugins/zfs/zfs-stats-for-freebsd-arc-efficiency diff --git a/plugins/other/zfs-stats-for-freebsd-arc-utilization b/plugins/zfs/zfs-stats-for-freebsd-arc-utilization similarity index 100% rename from plugins/other/zfs-stats-for-freebsd-arc-utilization rename to plugins/zfs/zfs-stats-for-freebsd-arc-utilization diff --git a/plugins/other/zfs-stats-for-freebsd-cache-hits-by-cache-list b/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-cache-list similarity index 100% rename from plugins/other/zfs-stats-for-freebsd-cache-hits-by-cache-list rename to plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-cache-list diff --git a/plugins/other/zfs-stats-for-freebsd-cache-hits-by-data-type b/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-data-type similarity index 100% rename from plugins/other/zfs-stats-for-freebsd-cache-hits-by-data-type rename to plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-data-type diff --git a/plugins/other/zfs-stats-for-freebsd-dmu-prefetch b/plugins/zfs/zfs-stats-for-freebsd-dmu-prefetch similarity index 100% rename from plugins/other/zfs-stats-for-freebsd-dmu-prefetch rename to plugins/zfs/zfs-stats-for-freebsd-dmu-prefetch diff --git a/plugins/other/zlist b/plugins/zfs/zlist similarity index 100% rename from plugins/other/zlist rename to plugins/zfs/zlist diff --git a/plugins/other/zpool_iostat b/plugins/zfs/zpool_iostat similarity index 100% rename from plugins/other/zpool_iostat rename to plugins/zfs/zpool_iostat diff --git a/plugins/other/zimbra-mailboxsizes b/plugins/zimbra/zimbra-mailboxsizes similarity index 100% rename from plugins/other/zimbra-mailboxsizes rename to plugins/zimbra/zimbra-mailboxsizes diff --git a/plugins/other/zope_conflict_errors b/plugins/zope/zope_conflict_errors similarity index 100% rename from plugins/other/zope_conflict_errors rename to plugins/zope/zope_conflict_errors