diff --git a/docs/developer-and-contributor-corner/collect-apache-nginx-web-logs.md b/docs/developer-and-contributor-corner/collect-apache-nginx-web-logs.md
index 9a307b0b30..80e7a8b84a 100644
--- a/docs/developer-and-contributor-corner/collect-apache-nginx-web-logs.md
+++ b/docs/developer-and-contributor-corner/collect-apache-nginx-web-logs.md
@@ -8,7 +8,7 @@ You can use the [LTSV log format](http://ltsv.org/), track TLS and cipher usage,
 ever. In one test on a system with SSD storage, the collector consistently parsed the logs for 200,000 requests in
 200ms, using ~30% of a single core.
 
-The [web_log](/src/go/plugin/go.d/modules/weblog/README.md) collector is currently compatible
+The [web_log](/src/go/plugin/go.d/collector/weblog/README.md) collector is currently compatible
 with [Nginx](https://nginx.org/en/) and [Apache](https://httpd.apache.org/).
 
 This guide will walk you through using the new Go-based web log collector to turn the logs these web servers
@@ -87,7 +87,7 @@ Restart Netdata with `sudo systemctl restart netdata`, or the [appropriate metho
 
 The web log collector is capable of parsing custom Nginx and Apache log formats and presenting them as charts, but we'll leave that topic for a separate guide.
 
-We do have [extensive documentation](/src/go/plugin/go.d/modules/weblog/README.md) on how to build custom parsing for Nginx and Apache logs.
+We do have [extensive documentation](/src/go/plugin/go.d/collector/weblog/README.md) on how to build custom parsing for Nginx and Apache logs.
 
 ## Tweak web log collector alerts
 
diff --git a/docs/developer-and-contributor-corner/kubernetes-k8s-netdata.txt b/docs/developer-and-contributor-corner/kubernetes-k8s-netdata.txt
index 5ebb963c38..17e99aee20 100644
--- a/docs/developer-and-contributor-corner/kubernetes-k8s-netdata.txt
+++ b/docs/developer-and-contributor-corner/kubernetes-k8s-netdata.txt
@@ -136,7 +136,7 @@ Let's explore the most colorful box by hovering over it.
 container](https://user-images.githubusercontent.com/1153921/109049544-a8417980-7695-11eb-80a7-109b4a645a27.png)
 
 The **Context** tab shows `rabbitmq-5bb66bb6c9-6xr5b` as the container's image name, which means this container is
-running a [RabbitMQ](/src/go/plugin/go.d/modules/rabbitmq/README.md) workload.
+running a [RabbitMQ](/src/go/plugin/go.d/collector/rabbitmq/README.md) workload.
 
 Click the **Metrics** tab to see real-time metrics from that container. Unsurprisingly, it shows a spike in CPU
 utilization at regular intervals.
@@ -165,13 +165,13 @@ for complete customization. For example, grouping the top chart by `k8s_containe
 Netdata has a [service discovery plugin](https://github.com/netdata/agent-service-discovery), which discovers and
 creates configuration files for [compatible
 services](https://github.com/netdata/helmchart#service-discovery-and-supported-services) and any endpoints covered by
-our [generic Prometheus collector](/src/go/plugin/go.d/modules/prometheus/README.md).
+our [generic Prometheus collector](/src/go/plugin/go.d/collector/prometheus/README.md).
 Netdata uses these files to collect metrics from any compatible application as they run _inside_ of a pod. Service
 discovery happens without manual intervention as pods are created, destroyed, or moved between nodes.
 
 Service metrics show up on the Overview as well, beneath the **Kubernetes** section, and are labeled according to the
 service in question. For example, the **RabbitMQ** section has numerous charts from the [`rabbitmq`
-collector](/src/go/plugin/go.d/modules/rabbitmq/README.md):
+collector](/src/go/plugin/go.d/collector/rabbitmq/README.md):
 
 ![Finding service discovery
 metrics](https://user-images.githubusercontent.com/1153921/109054511-2eac8a00-769b-11eb-97f1-da93acb4b5fe.png)
@@ -192,7 +192,7 @@ Netdata also automatically collects metrics from two essential Kubernetes proces
 
 The **k8s kubelet** section visualizes metrics from the Kubernetes agent responsible for managing every pod on a given
 node. This also happens without any configuration thanks to the [kubelet
-collector](/src/go/plugin/go.d/modules/k8s_kubelet/README.md).
+collector](/src/go/plugin/go.d/collector/k8s_kubelet/README.md).
 
 Monitoring each node's kubelet can be invaluable when diagnosing issues with your Kubernetes cluster. For example, you
 can see if the number of running containers/pods has dropped, which could signal a fault or crash in a particular
@@ -208,7 +208,7 @@ configuration-related errors, and the actual vs. desired numbers of volumes, plu
 The **k8s kube-proxy** section displays metrics about the network proxy that runs on each node in your Kubernetes
 cluster. kube-proxy lets pods communicate with each other and accept sessions from outside your cluster. Its metrics are
 collected by the [kube-proxy
-collector](/src/go/plugin/go.d/modules/k8s_kubeproxy/README.md).
+collector](/src/go/plugin/go.d/collector/k8s_kubeproxy/README.md).
 
 With Netdata, you can monitor how often your k8s proxies are syncing proxy rules between nodes. Dramatic changes in
 these figures could indicate an anomaly in your cluster that's worthy of further investigation.
@@ -228,7 +228,7 @@ clusters of all sizes.
 - [Netdata Helm chart](https://github.com/netdata/helmchart)
 - [Netdata service discovery](https://github.com/netdata/agent-service-discovery)
 - [Netdata Agent · `kubelet`
-  collector](/src/go/plugin/go.d/modules/k8s_kubelet/README.md)
+  collector](/src/go/plugin/go.d/collector/k8s_kubelet/README.md)
 - [Netdata Agent · `kube-proxy`
-  collector](/src/go/plugin/go.d/modules/k8s_kubeproxy/README.md)
+  collector](/src/go/plugin/go.d/collector/k8s_kubeproxy/README.md)
 - [Netdata Agent · `cgroups.plugin`](/src/collectors/cgroups.plugin/README.md)
diff --git a/docs/developer-and-contributor-corner/lamp-stack.txt b/docs/developer-and-contributor-corner/lamp-stack.txt
index bc4611ac18..d8f8da24d5 100644
--- a/docs/developer-and-contributor-corner/lamp-stack.txt
+++ b/docs/developer-and-contributor-corner/lamp-stack.txt
@@ -69,7 +69,7 @@ metrics from each using the [cgroups data collector](/src/collectors/cgroups.plu
 ## Enable Apache monitoring
 
 Let's begin by configuring Apache to work with Netdata's [Apache data
-collector](/src/go/plugin/go.d/modules/apache/README.md).
+collector](/src/go/plugin/go.d/collector/apache/README.md).
 
 Actually, there's nothing for you to do to enable Apache monitoring with Netdata.
 
@@ -80,7 +80,7 @@ metrics](https://httpd.apache.org/docs/2.4/mod/mod_status.html), which is just _
 ## Enable web log monitoring
 
 The Netdata Agent also comes with a [web log
-collector](/src/go/plugin/go.d/modules/weblog/README.md), which reads Apache's access
+collector](/src/go/plugin/go.d/collector/weblog/README.md), which reads Apache's access
 log file, processes each line, and converts them into per-second metrics. On Debian systems, it reads the file at
 `/var/log/apache2/access.log`.
 
@@ -93,7 +93,7 @@ monitoring.
 
 Because your MySQL database is password-protected, you do need to tell MySQL to allow the `netdata` user to connect to
 without a password. Netdata's [MySQL data
-collector](/src/go/plugin/go.d/modules/mysql/README.md) collects metrics in _read-only_
+collector](/src/go/plugin/go.d/collector/mysql/README.md) collects metrics in _read-only_
 mode, without being able to alter or affect operations in any way.
 
 First, log into the MySQL shell. Then, run the following three commands, one at a time:
@@ -112,7 +112,7 @@ Unlike Apache or MySQL, PHP isn't a service that you can monitor directly, unles
 with [StatsD](/src/collectors/statsd.plugin/README.md).
 
 However, if you use [PHP-FPM](https://php-fpm.org/) in your LAMP stack, you can monitor that process with our [PHP-FPM
-data collector](/src/go/plugin/go.d/modules/phpfpm/README.md).
+data collector](/src/go/plugin/go.d/collector/phpfpm/README.md).
 
 Open your PHP-FPM configuration for editing, replacing `7.4` with your version of PHP:
 
@@ -214,7 +214,7 @@ services. The per-second metrics granularity means you have the most accurate in
 any LAMP-related issues.
 
 Another powerful way to monitor the availability of a LAMP stack is the [`httpcheck`
-collector](/src/go/plugin/go.d/modules/httpcheck/README.md), which pings a web server at
+collector](/src/go/plugin/go.d/collector/httpcheck/README.md), which pings a web server at
 a regular interval and tells you whether if and how quickly it's responding. The `response_match` option also lets you
 monitor when the web server's response isn't what you expect it to be, which might happen if PHP-FPM crashes, for
 example.
@@ -230,8 +230,8 @@ source of issues faster with [Metric Correlations](/docs/metric-correlations.md)
 ### Related reference documentation
 
 - [Netdata Agent · Get started](/packaging/installer/README.md)
-- [Netdata Agent · Apache data collector](/src/go/plugin/go.d/modules/apache/README.md)
-- [Netdata Agent · Web log collector](/src/go/plugin/go.d/modules/weblog/README.md)
-- [Netdata Agent · MySQL data collector](/src/go/plugin/go.d/modules/mysql/README.md)
-- [Netdata Agent · PHP-FPM data collector](/src/go/plugin/go.d/modules/phpfpm/README.md)
+- [Netdata Agent · Apache data collector](/src/go/plugin/go.d/collector/apache/README.md)
+- [Netdata Agent · Web log collector](/src/go/plugin/go.d/collector/weblog/README.md)
+- [Netdata Agent · MySQL data collector](/src/go/plugin/go.d/collector/mysql/README.md)
+- [Netdata Agent · PHP-FPM data collector](/src/go/plugin/go.d/collector/phpfpm/README.md)
 
diff --git a/docs/developer-and-contributor-corner/monitor-cockroachdb.txt b/docs/developer-and-contributor-corner/monitor-cockroachdb.txt
index d677c376cc..1ca8bc4cf4 100644
--- a/docs/developer-and-contributor-corner/monitor-cockroachdb.txt
+++ b/docs/developer-and-contributor-corner/monitor-cockroachdb.txt
@@ -11,7 +11,7 @@ learn_rel_path: "Miscellaneous"
 
 [CockroachDB](https://github.com/cockroachdb/cockroach) is an open-source project that brings SQL databases into
 scalable, disaster-resilient cloud deployments. Thanks to
-a [new CockroachDB collector](/src/go/plugin/go.d/modules/cockroachdb/README.md)
+a [new CockroachDB collector](/src/go/plugin/go.d/collector/cockroachdb/README.md)
 released in
 [v1.20](https://blog.netdata.cloud/posts/release-1.20/), you can now monitor any number of CockroachDB databases with
 maximum granularity using Netdata. Collect more than 50 unique metrics and put them on interactive visualizations
diff --git a/docs/developer-and-contributor-corner/monitor-hadoop-cluster.md b/docs/developer-and-contributor-corner/monitor-hadoop-cluster.md
index 8638f6d660..2832c387c1 100644
--- a/docs/developer-and-contributor-corner/monitor-hadoop-cluster.md
+++ b/docs/developer-and-contributor-corner/monitor-hadoop-cluster.md
@@ -18,8 +18,8 @@ alternative, like the guide available from
 
 For more specifics on the collection modules used in this guide, read the respective pages in our documentation:
 
-- [HDFS](/src/go/plugin/go.d/modules/hdfs/README.md)
-- [Zookeeper](/src/go/plugin/go.d/modules/zookeeper/README.md)
+- [HDFS](/src/go/plugin/go.d/collector/hdfs/README.md)
+- [Zookeeper](/src/go/plugin/go.d/collector/zookeeper/README.md)
 
 ## Set up your HDFS and Zookeeper installations
 
diff --git a/docs/developer-and-contributor-corner/pi-hole-raspberry-pi.txt b/docs/developer-and-contributor-corner/pi-hole-raspberry-pi.txt
index e150cebdc0..07b16fe6ce 100644
--- a/docs/developer-and-contributor-corner/pi-hole-raspberry-pi.txt
+++ b/docs/developer-and-contributor-corner/pi-hole-raspberry-pi.txt
@@ -81,7 +81,7 @@ service](https://discourse.pi-hole.net/t/how-do-i-configure-my-devices-to-use-pi
 finished setting up Pi-hole at this point.
 
 As far as configuring Netdata to monitor Pi-hole metrics, there's nothing you actually need to do. Netdata's [Pi-hole
-collector](/src/go/plugin/go.d/modules/pihole/README.md) will autodetect the new service
+collector](/src/go/plugin/go.d/collector/pihole/README.md) will autodetect the new service
 running on your Raspberry Pi and immediately start collecting metrics every second.
 
 Restart Netdata with `sudo systemctl restart netdata`, which will then recognize that Pi-hole is running and start a
diff --git a/docs/netdata-cloud/organize-your-infrastructure-invite-your-team.md b/docs/netdata-cloud/organize-your-infrastructure-invite-your-team.md
index 05538a9169..ef05cdd5dd 100644
--- a/docs/netdata-cloud/organize-your-infrastructure-invite-your-team.md
+++ b/docs/netdata-cloud/organize-your-infrastructure-invite-your-team.md
@@ -41,7 +41,7 @@ We recommend a few strategies for organizing your Rooms.
   If you have a user-facing SaaS product, or an internal service that this said product relies on, you may want to monitor that entire stack in a single Room. This might include Kubernetes clusters, Docker containers, proxies, databases, web servers, brokers, and more. End-to-end Rooms are valuable tools for ensuring the health and performance of your organization's essential services.
 
 - **Incident response**  
-  You can also create new Rooms as one of the first steps in your incident response process. For example, you have a user-facing web app that relies on Apache Pulsar for a message queue, and one of your nodes using the [Pulsar collector](/src/go/plugin/go.d/modules/pulsar/README.md) begins reporting a suspiciously low messages rate. You can create a Room called `$year-$month-$day-pulsar-rate`, add all your Pulsar nodes in addition to nodes they connect to, and begin diagnosing the root cause in a Room optimized for getting to resolution as fast as possible.
+  You can also create new Rooms as one of the first steps in your incident response process. For example, you have a user-facing web app that relies on Apache Pulsar for a message queue, and one of your nodes using the [Pulsar collector](/src/go/plugin/go.d/collector/pulsar/README.md) begins reporting a suspiciously low messages rate. You can create a Room called `$year-$month-$day-pulsar-rate`, add all your Pulsar nodes in addition to nodes they connect to, and begin diagnosing the root cause in a Room optimized for getting to resolution as fast as possible.
 
 ### Add Rooms
 
diff --git a/src/collectors/COLLECTORS.md b/src/collectors/COLLECTORS.md
index ee1132d53c..b0b861e761 100644
--- a/src/collectors/COLLECTORS.md
+++ b/src/collectors/COLLECTORS.md
@@ -13,7 +13,7 @@ Learn more about [how collectors work](/src/collectors/README.md), and then lear
 
 If you don't see the app/service you'd like to monitor in this list:
 
-- If your application has a Prometheus endpoint, Netdata can monitor it! Look at our [generic Prometheus collector](/src/go/plugin/go.d/modules/prometheus/README.md).
+- If your application has a Prometheus endpoint, Netdata can monitor it! Look at our [generic Prometheus collector](/src/go/plugin/go.d/collector/prometheus/README.md).
 
 - If your application is instrumented to expose [StatsD](https://blog.netdata.cloud/introduction-to-statsd/) metrics, see our [generic StatsD collector](/src/collectors/statsd.plugin/README.md).
 
diff --git a/src/collectors/proc.plugin/README.md b/src/collectors/proc.plugin/README.md
index d6189bad68..82a15bb9cc 100644
--- a/src/collectors/proc.plugin/README.md
+++ b/src/collectors/proc.plugin/README.md
@@ -609,7 +609,7 @@ The `drm` path can be configured if it differs from the default:
 
 > **Note**
 >
-> Temperature, fan speed, voltage and power metrics for AMD GPUs can be monitored using the [Sensors](/src/go/plugin/go.d/modules/sensors/README.md) plugin.
+> Temperature, fan speed, voltage and power metrics for AMD GPUs can be monitored using the [Sensors](/src/go/plugin/go.d/collector/sensors/README.md) plugin.
 
 ## IPC
 
diff --git a/src/collectors/python.d.plugin/haproxy/metadata.yaml b/src/collectors/python.d.plugin/haproxy/metadata.yaml
index e748a294c0..22966b199b 100644
--- a/src/collectors/python.d.plugin/haproxy/metadata.yaml
+++ b/src/collectors/python.d.plugin/haproxy/metadata.yaml
@@ -1,5 +1,5 @@
 # This collector will not appear in documentation, as the go version is preferred,
-# /src/go/plugin/go.d/modules/haproxy/README.md
+# /src/go/plugin/go.d/collector/haproxy/README.md
 #
 #
 #  meta:
diff --git a/src/collectors/python.d.plugin/traefik/metadata.yaml b/src/collectors/python.d.plugin/traefik/metadata.yaml
index 5382ad54fe..8c5ba6554f 100644
--- a/src/collectors/python.d.plugin/traefik/metadata.yaml
+++ b/src/collectors/python.d.plugin/traefik/metadata.yaml
@@ -1,5 +1,5 @@
 # This collector will not appear in documentation, as the go version is preferred,
-# /src/go/plugin/go.d/modules/traefik/README.md
+# /src/go/plugin/go.d/collector/traefik/README.md
 #
 # meta:
 #   plugin_name: python.d.plugin
diff --git a/src/go/plugin/go.d/README.md b/src/go/plugin/go.d/README.md
index ecb8c45fa4..a398b97f89 100644
--- a/src/go/plugin/go.d/README.md
+++ b/src/go/plugin/go.d/README.md
@@ -16,9 +16,9 @@ All capabilities are set automatically during Netdata installation using the [of
 
 | Capability          |                                               Required by                                               |
 |:--------------------|:-------------------------------------------------------------------------------------------------------:|
-| CAP_NET_RAW         |      [Ping](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ping#readme)      |
-| CAP_NET_ADMIN       | [Wireguard](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/wireguard#readme) |
-| CAP_DAC_READ_SEARCH | [Filecheck](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/filecheck#readme) |
+| CAP_NET_RAW         |      [Ping](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ping#readme)      |
+| CAP_NET_ADMIN       | [Wireguard](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/wireguard#readme) |
+| CAP_DAC_READ_SEARCH | [Filecheck](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/filecheck#readme) |
 
 ## Available modules
 
@@ -27,126 +27,126 @@ All capabilities are set automatically during Netdata installation using the [of
 
 | Name                                                                                                               |           Monitors            |
 |:-------------------------------------------------------------------------------------------------------------------|:-----------------------------:|
-| [adaptec_raid](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/adaptecraid)              |     Adaptec Hardware RAID     |
-| [activemq](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/activemq)                     |           ActiveMQ            |
-| [ap](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ap)                                 |          Wireless AP          |
-| [apache](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/apache)                         |            Apache             |
-| [apcupsd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/apcupsd)                       |           UPS (APC)           |
-| [beanstalk](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/beanstalk)                   |           Beanstalk           |
-| [bind](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/bind)                             |           ISC Bind            |
-| [boinc](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/boinc)                           |             BOINC             |
-| [cassandra](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/cassandra)                   |           Cassandra           |
-| [ceph](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ceph)                             |             Ceph              |
-| [chrony](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/chrony)                         |            Chrony             |
-| [clickhouse](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/clickhouse)                 |          ClickHouse           |
-| [cockroachdb](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/cockroachdb)               |          CockroachDB          |
-| [consul](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/consul)                         |            Consul             |
-| [coredns](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/coredns)                       |            CoreDNS            |
-| [couchbase](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/couchbase)                   |           Couchbase           |
-| [couchdb](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/couchdb)                       |            CouchDB            |
-| [dmcache](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dmcache)                       |            DMCache            |
-| [dnsdist](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsdist)                       |            Dnsdist            |
-| [dnsmasq](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsmasq)                       |     Dnsmasq DNS Forwarder     |
-| [dnsmasq_dhcp](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsmasq_dhcp)             |         Dnsmasq DHCP          |
-| [dns_query](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsquery)                    |         DNS Query RTT         |
-| [docker](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/docker)                         |         Docker Engine         |
-| [docker_engine](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/docker_engine)           |         Docker Engine         |
-| [dockerhub](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dockerhub)                   |          Docker Hub           |
-| [dovecot](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dovecot)                       |            Dovecot            |
-| [elasticsearch](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/elasticsearch)           |   Elasticsearch/OpenSearch    |
-| [envoy](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/envoy)                           |             Envoy             |
-| [exim](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/exim)                             |             Exim              |
-| [fail2ban](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/fail2ban)                     |        Fail2Ban Jails         |
-| [filecheck](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/filecheck)                   |     Files and Directories     |
-| [fluentd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/fluentd)                       |            Fluentd            |
-| [freeradius](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/freeradius)                 |          FreeRADIUS           |
-| [gearman](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/gearman)                       |            Gearman            |
-| [haproxy](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/haproxy)                       |            HAProxy            |
-| [hddtemp](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hddtemp)                       |       Disks temperature       |
-| [hdfs](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hdfs)                             |             HDFS              |
-| [hpssa](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hpssa)                           |        HPE Smart Array        |
-| [httpcheck](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/httpcheck)                   |       Any HTTP Endpoint       |
-| [icecast](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/icecast)                       |            Icecast            |
-| [intelgpu](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/intelgpu)                     |     Intel integrated GPU      |
-| [ipfs](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ipfs)                             |             IPFS              |
-| [isc_dhcpd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/isc_dhcpd)                   |           ISC DHCP            |
-| [k8s_kubelet](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_kubelet)               |            Kubelet            |
-| [k8s_kubeproxy](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_kubeproxy)           |          Kube-proxy           |
-| [k8s_state](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_state)                   |   Kubernetes cluster state    |
-| [lighttpd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/lighttpd)                     |           Lighttpd            |
-| [litespeed](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/litespeed)                   |           Litespeed           |
-| [logind](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/logind)                         |        systemd-logind         |
-| [logstash](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/logstash)                     |           Logstash            |
-| [lvm](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/lvm)                               |      LVM logical volumes      |
-| [maxscale](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/maxscale)                     |           MaxScale            |
-| [megacli](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/megacli)                       |     MegaCli Hardware Raid     |
-| [memcached](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/memcached)                   |           Memcached           |
-| [mongoDB](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/mongodb)                       |            MongoDB            |
-| [monit](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/monit)                           |             Monit             |
-| [mysql](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/mysql)                           |             MySQL             |
-| [nginx](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginx)                           |             NGINX             |
-| [nginxplus](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginxplus)                   |          NGINX Plus           |
-| [nginxunit](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginxunit)                   |          NGINX Unit           |
-| [nginxvts](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginxvts)                     |           NGINX VTS           |
-| [nsd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nsd)                               |       NSD (NLnet Labs)        |
-| [ntpd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ntpd)                             |          NTP daemon           |
-| [nvidia_smi](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nvidia_smi)                 |          Nvidia SMI           |
-| [nvme](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nvme)                             |         NVMe devices          |
-| [openldap](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/openldap)                     |           OpenLDAP            |
-| [openvpn](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/openvpn)                       |            OpenVPN            |
-| [openvpn_status_log](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/openvpn_status_log) |            OpenVPN            |
-| [pgbouncer](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pgbouncer)                   |           PgBouncer           |
-| [oracledb](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/oracledb)                     |           Oracle DB           |
-| [phpdaemon](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/phpdaemon)                   |           phpDaemon           |
-| [phpfpm](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/phpfpm)                         |            PHP-FPM            |
-| [pihole](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pihole)                         |            Pi-hole            |
-| [pika](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pika)                             |             Pika              |
-| [ping](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ping)                             |       Any network host        |
-| [prometheus](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/prometheus)                 |    Any Prometheus Endpoint    |
-| [portcheck](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/portcheck)                   |       Any TCP Endpoint        |
-| [postgres](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/postgres)                     |          PostgreSQL           |
-| [postfix](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/postfix)                       |            Postfix            |
-| [powerdns](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/powerdns)                     | PowerDNS Authoritative Server |
-| [powerdns_recursor](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/powerdns_recursor)   |       PowerDNS Recursor       |
-| [proxysql](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/proxysql)                     |           ProxySQL            |
-| [pulsar](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pulsar)                         |         Apache Pulsar         |
-| [puppet](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/puppet)                         |            Puppet             |
-| [rabbitmq](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/rabbitmq)                     |           RabbitMQ            |
-| [redis](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/redis)                           |             Redis             |
-| [rethinkdb](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/rethinkdb)                   |           RethinkDB           |
-| [riakkv](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/riakkv)                         |            Riak KV            |
-| [rspamd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/rspamd)                         |            Rspamd             |
-| [samba](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/samba)                           |             Samba             |
-| [scaleio](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/scaleio)                       |       Dell EMC ScaleIO        |
-| [sensors](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/sensors)                       |       Hardware Sensors        |
-| [SNMP](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/snmp)                             |             SNMP              |
-| [squid](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/squid)                           |             Squid             |
-| [squidlog](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/squidlog)                     |             Squid             |
-| [smartctl](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/smartctl)                     |   S.M.A.R.T Storage Devices   |
-| [spigotmc](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/spigotmc)                     |           SpigotMC            |
-| [storcli](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/storcli)                       |    Broadcom Hardware RAID     |
-| [supervisord](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/supervisord)               |          Supervisor           |
-| [systemdunits](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/systemdunits)             |      Systemd unit state       |
-| [tengine](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/tengine)                       |            Tengine            |
-| [tomcat](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/tomcat)                         |            Tomcat             |
-| [tor](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/tor)                               |              Tor              |
-| [traefik](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/traefik)                       |            Traefik            |
-| [typesense](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/typesense)                   |           Typesense           |
-| [unbound](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/unbound)                       |            Unbound            |
-| [upsd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/upsd)                             |          UPSd (Nut)           |
-| [uwsgi](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/uwsgi)                           |             uWSGI             |
-| [varnish](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/varnish)                       |            Varnish            |
-| [vcsa](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vcsa)                             |   vCenter Server Appliance    |
-| [vernemq](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vernemq)                       |            VerneMQ            |
-| [vsphere](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vsphere)                       |     VMware vCenter Server     |
-| [w1sensor](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/w1sensor)                     |        1-Wire Sensors         |
-| [web_log](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/weblog)                        |         Apache/NGINX          |
-| [wireguard](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/wireguard)                   |           WireGuard           |
-| [whoisquery](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/whoisquery)                 |         Domain Expiry         |
-| [windows](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/windows)                       |            Windows            |
-| [x509check](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/x509check)                   |     Digital Certificates      |
-| [zfspool](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/zfspool)                       |           ZFS Pools           |
-| [zookeeper](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/zookeeper)                   |           ZooKeeper           |
+| [adaptec_raid](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/adaptecraid)              |     Adaptec Hardware RAID     |
+| [activemq](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/activemq)                     |           ActiveMQ            |
+| [ap](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ap)                                 |          Wireless AP          |
+| [apache](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/apache)                         |            Apache             |
+| [apcupsd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/apcupsd)                       |           UPS (APC)           |
+| [beanstalk](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/beanstalk)                   |           Beanstalk           |
+| [bind](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/bind)                             |           ISC Bind            |
+| [boinc](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/boinc)                           |             BOINC             |
+| [cassandra](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/cassandra)                   |           Cassandra           |
+| [ceph](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ceph)                             |             Ceph              |
+| [chrony](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/chrony)                         |            Chrony             |
+| [clickhouse](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/clickhouse)                 |          ClickHouse           |
+| [cockroachdb](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/cockroachdb)               |          CockroachDB          |
+| [consul](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/consul)                         |            Consul             |
+| [coredns](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/coredns)                       |            CoreDNS            |
+| [couchbase](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/couchbase)                   |           Couchbase           |
+| [couchdb](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/couchdb)                       |            CouchDB            |
+| [dmcache](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dmcache)                       |            DMCache            |
+| [dnsdist](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dnsdist)                       |            Dnsdist            |
+| [dnsmasq](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dnsmasq)                       |     Dnsmasq DNS Forwarder     |
+| [dnsmasq_dhcp](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dnsmasq_dhcp)             |         Dnsmasq DHCP          |
+| [dns_query](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dnsquery)                    |         DNS Query RTT         |
+| [docker](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/docker)                         |         Docker Engine         |
+| [docker_engine](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/docker_engine)           |         Docker Engine         |
+| [dockerhub](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dockerhub)                   |          Docker Hub           |
+| [dovecot](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dovecot)                       |            Dovecot            |
+| [elasticsearch](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/elasticsearch)           |   Elasticsearch/OpenSearch    |
+| [envoy](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/envoy)                           |             Envoy             |
+| [exim](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/exim)                             |             Exim              |
+| [fail2ban](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/fail2ban)                     |        Fail2Ban Jails         |
+| [filecheck](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/filecheck)                   |     Files and Directories     |
+| [fluentd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/fluentd)                       |            Fluentd            |
+| [freeradius](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/freeradius)                 |          FreeRADIUS           |
+| [gearman](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/gearman)                       |            Gearman            |
+| [haproxy](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/haproxy)                       |            HAProxy            |
+| [hddtemp](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/hddtemp)                       |       Disks temperature       |
+| [hdfs](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/hdfs)                             |             HDFS              |
+| [hpssa](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/hpssa)                           |        HPE Smart Array        |
+| [httpcheck](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/httpcheck)                   |       Any HTTP Endpoint       |
+| [icecast](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/icecast)                       |            Icecast            |
+| [intelgpu](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/intelgpu)                     |     Intel integrated GPU      |
+| [ipfs](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ipfs)                             |             IPFS              |
+| [isc_dhcpd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/isc_dhcpd)                   |           ISC DHCP            |
+| [k8s_kubelet](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/k8s_kubelet)               |            Kubelet            |
+| [k8s_kubeproxy](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/k8s_kubeproxy)           |          Kube-proxy           |
+| [k8s_state](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/k8s_state)                   |   Kubernetes cluster state    |
+| [lighttpd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/lighttpd)                     |           Lighttpd            |
+| [litespeed](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/litespeed)                   |           Litespeed           |
+| [logind](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/logind)                         |        systemd-logind         |
+| [logstash](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/logstash)                     |           Logstash            |
+| [lvm](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/lvm)                               |      LVM logical volumes      |
+| [maxscale](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/maxscale)                     |           MaxScale            |
+| [megacli](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/megacli)                       |     MegaCli Hardware Raid     |
+| [memcached](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/memcached)                   |           Memcached           |
+| [mongoDB](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/mongodb)                       |            MongoDB            |
+| [monit](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/monit)                           |             Monit             |
+| [mysql](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/mysql)                           |             MySQL             |
+| [nginx](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nginx)                           |             NGINX             |
+| [nginxplus](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nginxplus)                   |          NGINX Plus           |
+| [nginxunit](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nginxunit)                   |          NGINX Unit           |
+| [nginxvts](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nginxvts)                     |           NGINX VTS           |
+| [nsd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nsd)                               |       NSD (NLnet Labs)        |
+| [ntpd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ntpd)                             |          NTP daemon           |
+| [nvidia_smi](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nvidia_smi)                 |          Nvidia SMI           |
+| [nvme](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nvme)                             |         NVMe devices          |
+| [openldap](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/openldap)                     |           OpenLDAP            |
+| [openvpn](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/openvpn)                       |            OpenVPN            |
+| [openvpn_status_log](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/openvpn_status_log) |            OpenVPN            |
+| [pgbouncer](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/pgbouncer)                   |           PgBouncer           |
+| [oracledb](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/oracledb)                     |           Oracle DB           |
+| [phpdaemon](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/phpdaemon)                   |           phpDaemon           |
+| [phpfpm](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/phpfpm)                         |            PHP-FPM            |
+| [pihole](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/pihole)                         |            Pi-hole            |
+| [pika](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/pika)                             |             Pika              |
+| [ping](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ping)                             |       Any network host        |
+| [prometheus](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/prometheus)                 |    Any Prometheus Endpoint    |
+| [portcheck](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/portcheck)                   |       Any TCP Endpoint        |
+| [postgres](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/postgres)                     |          PostgreSQL           |
+| [postfix](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/postfix)                       |            Postfix            |
+| [powerdns](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/powerdns)                     | PowerDNS Authoritative Server |
+| [powerdns_recursor](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/powerdns_recursor)   |       PowerDNS Recursor       |
+| [proxysql](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/proxysql)                     |           ProxySQL            |
+| [pulsar](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/pulsar)                         |         Apache Pulsar         |
+| [puppet](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/puppet)                         |            Puppet             |
+| [rabbitmq](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/rabbitmq)                     |           RabbitMQ            |
+| [redis](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/redis)                           |             Redis             |
+| [rethinkdb](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/rethinkdb)                   |           RethinkDB           |
+| [riakkv](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/riakkv)                         |            Riak KV            |
+| [rspamd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/rspamd)                         |            Rspamd             |
+| [samba](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/samba)                           |             Samba             |
+| [scaleio](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/scaleio)                       |       Dell EMC ScaleIO        |
+| [sensors](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/sensors)                       |       Hardware Sensors        |
+| [SNMP](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/collector/snmp)                             |             SNMP              |
+| [squid](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/squid)                           |             Squid             |
+| [squidlog](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/squidlog)                     |             Squid             |
+| [smartctl](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/smartctl)                     |   S.M.A.R.T Storage Devices   |
+| [spigotmc](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/spigotmc)                     |           SpigotMC            |
+| [storcli](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/storcli)                       |    Broadcom Hardware RAID     |
+| [supervisord](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/supervisord)               |          Supervisor           |
+| [systemdunits](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/systemdunits)             |      Systemd unit state       |
+| [tengine](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/tengine)                       |            Tengine            |
+| [tomcat](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/tomcat)                         |            Tomcat             |
+| [tor](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/tor)                               |              Tor              |
+| [traefik](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/traefik)                       |            Traefik            |
+| [typesense](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/typesense)                   |           Typesense           |
+| [unbound](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/unbound)                       |            Unbound            |
+| [upsd](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/upsd)                             |          UPSd (Nut)           |
+| [uwsgi](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/uwsgi)                           |             uWSGI             |
+| [varnish](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/varnish)                       |            Varnish            |
+| [vcsa](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/vcsa)                             |   vCenter Server Appliance    |
+| [vernemq](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/vernemq)                       |            VerneMQ            |
+| [vsphere](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/vsphere)                       |     VMware vCenter Server     |
+| [w1sensor](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/w1sensor)                     |        1-Wire Sensors         |
+| [web_log](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/weblog)                        |         Apache/NGINX          |
+| [wireguard](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/wireguard)                   |           WireGuard           |
+| [whoisquery](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/whoisquery)                 |         Domain Expiry         |
+| [windows](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/windows)                       |            Windows            |
+| [x509check](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/x509check)                   |     Digital Certificates      |
+| [zfspool](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/zfspool)                       |           ZFS Pools           |
+| [zookeeper](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/zookeeper)                   |           ZooKeeper           |
 
 </details>
 
diff --git a/src/go/plugin/go.d/collector/ping/config_schema.json b/src/go/plugin/go.d/collector/ping/config_schema.json
index 5a5ef3a155..b40f221444 100644
--- a/src/go/plugin/go.d/collector/ping/config_schema.json
+++ b/src/go/plugin/go.d/collector/ping/config_schema.json
@@ -13,7 +13,7 @@
       },
       "privileged": {
         "title": "Privileged mode",
-        "description": "If unset, sends unprivileged UDP ping packets (require [additional configuration](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ping#overview)); otherwise, sends raw ICMP ping packets ([not recommended](https://github.com/netdata/netdata/issues/15410)).",
+        "description": "If unset, sends unprivileged UDP ping packets (require [additional configuration](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ping#overview)); otherwise, sends raw ICMP ping packets ([not recommended](https://github.com/netdata/netdata/issues/15410)).",
         "type": "boolean",
         "default": false
       },
diff --git a/src/go/plugin/go.d/collector/smartctl/integrations/s.m.a.r.t..md b/src/go/plugin/go.d/collector/smartctl/integrations/s.m.a.r.t..md
index 86904d9df2..345ec3e22d 100644
--- a/src/go/plugin/go.d/collector/smartctl/integrations/s.m.a.r.t..md
+++ b/src/go/plugin/go.d/collector/smartctl/integrations/s.m.a.r.t..md
@@ -139,7 +139,7 @@ Install `smartmontools` version 7.0 or later using your distribution's package m
 
     > **Multiple Devices**: These examples only show mapping of one device (/dev/sda). You'll need to add additional `--device` options (in docker run) or entries in the `devices` list (in docker-compose.yml) for each storage device you want Netdata's smartctl collector to monitor.
 
-    > **NVMe Devices**: Do not map NVMe devices using this method. Netdata uses a [dedicated collector](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nvme#readme) to monitor NVMe devices.
+    > **NVMe Devices**: Do not map NVMe devices using this method. Netdata uses a [dedicated collector](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nvme#readme) to monitor NVMe devices.
 
 
 
diff --git a/src/go/plugin/go.d/collector/smartctl/metadata.yaml b/src/go/plugin/go.d/collector/smartctl/metadata.yaml
index 14214c4ef5..b363e60947 100644
--- a/src/go/plugin/go.d/collector/smartctl/metadata.yaml
+++ b/src/go/plugin/go.d/collector/smartctl/metadata.yaml
@@ -83,7 +83,7 @@ modules:
 
                   > **Multiple Devices**: These examples only show mapping of one device (/dev/sda). You'll need to add additional `--device` options (in docker run) or entries in the `devices` list (in docker-compose.yml) for each storage device you want Netdata's smartctl collector to monitor.
 
-                  > **NVMe Devices**: Do not map NVMe devices using this method. Netdata uses a [dedicated collector](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nvme#readme) to monitor NVMe devices.
+                  > **NVMe Devices**: Do not map NVMe devices using this method. Netdata uses a [dedicated collector](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nvme#readme) to monitor NVMe devices.
       configuration:
         file:
           name: go.d/smartctl.conf
diff --git a/src/go/plugin/go.d/config/go.d/activemq.conf b/src/go/plugin/go.d/config/go.d/activemq.conf
index 9bae9cc562..94466c4e67 100644
--- a/src/go/plugin/go.d/config/go.d/activemq.conf
+++ b/src/go/plugin/go.d/config/go.d/activemq.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/activemq#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/activemq#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/adaptec_raid.conf b/src/go/plugin/go.d/config/go.d/adaptec_raid.conf
index eafbd03032..55d1cba68a 100644
--- a/src/go/plugin/go.d/config/go.d/adaptec_raid.conf
+++ b/src/go/plugin/go.d/config/go.d/adaptec_raid.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/adaptecraid#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/adaptecraid#readme
 
 jobs:
   - name: adaptec_raid
diff --git a/src/go/plugin/go.d/config/go.d/ap.conf b/src/go/plugin/go.d/config/go.d/ap.conf
index ef8f2d9f8d..2efa19c635 100644
--- a/src/go/plugin/go.d/config/go.d/ap.conf
+++ b/src/go/plugin/go.d/config/go.d/ap.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ap#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ap#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/apache.conf b/src/go/plugin/go.d/config/go.d/apache.conf
index 86f4a75c43..3f0cceb53a 100644
--- a/src/go/plugin/go.d/config/go.d/apache.conf
+++ b/src/go/plugin/go.d/config/go.d/apache.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/apache#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/apache#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/apcupsd.conf b/src/go/plugin/go.d/config/go.d/apcupsd.conf
index 2b40366f45..fcce2222b4 100644
--- a/src/go/plugin/go.d/config/go.d/apcupsd.conf
+++ b/src/go/plugin/go.d/config/go.d/apcupsd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/apcupsd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/apcupsd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/beanstalk.conf b/src/go/plugin/go.d/config/go.d/beanstalk.conf
index 45e2254b82..e9a245c9ac 100644
--- a/src/go/plugin/go.d/config/go.d/beanstalk.conf
+++ b/src/go/plugin/go.d/config/go.d/beanstalk.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/beanstalk#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/beanstalk#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/bind.conf b/src/go/plugin/go.d/config/go.d/bind.conf
index 9e970e60eb..1f817bcf03 100644
--- a/src/go/plugin/go.d/config/go.d/bind.conf
+++ b/src/go/plugin/go.d/config/go.d/bind.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/bind#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/bind#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/boinc.conf b/src/go/plugin/go.d/config/go.d/boinc.conf
index be46d6a15d..d5770863fa 100644
--- a/src/go/plugin/go.d/config/go.d/boinc.conf
+++ b/src/go/plugin/go.d/config/go.d/boinc.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/boinc#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/boinc#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/cassandra.conf b/src/go/plugin/go.d/config/go.d/cassandra.conf
index 93283ee6c8..004703e50c 100644
--- a/src/go/plugin/go.d/config/go.d/cassandra.conf
+++ b/src/go/plugin/go.d/config/go.d/cassandra.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/cassandra#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/cassandra#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/ceph.conf b/src/go/plugin/go.d/config/go.d/ceph.conf
index 34cc3b08a0..064dbe67b3 100644
--- a/src/go/plugin/go.d/config/go.d/ceph.conf
+++ b/src/go/plugin/go.d/config/go.d/ceph.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ceph#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ceph#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/chrony.conf b/src/go/plugin/go.d/config/go.d/chrony.conf
index 099ba3583d..4b83a94dd7 100644
--- a/src/go/plugin/go.d/config/go.d/chrony.conf
+++ b/src/go/plugin/go.d/config/go.d/chrony.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/chrony#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/chrony#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/clickhouse.conf b/src/go/plugin/go.d/config/go.d/clickhouse.conf
index 4f416138bd..07631d53cc 100644
--- a/src/go/plugin/go.d/config/go.d/clickhouse.conf
+++ b/src/go/plugin/go.d/config/go.d/clickhouse.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/clickhouse#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/clickhouse#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/cockroachdb.conf b/src/go/plugin/go.d/config/go.d/cockroachdb.conf
index 8d04dbfe07..d4e4cd75ec 100644
--- a/src/go/plugin/go.d/config/go.d/cockroachdb.conf
+++ b/src/go/plugin/go.d/config/go.d/cockroachdb.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/cockroachdb#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/cockroachdb#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/consul.conf b/src/go/plugin/go.d/config/go.d/consul.conf
index 624b9a6d4e..ea32720ea3 100644
--- a/src/go/plugin/go.d/config/go.d/consul.conf
+++ b/src/go/plugin/go.d/config/go.d/consul.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/consul#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/consul#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/coredns.conf b/src/go/plugin/go.d/config/go.d/coredns.conf
index 9b9d6ef9a7..b0bc60e81f 100644
--- a/src/go/plugin/go.d/config/go.d/coredns.conf
+++ b/src/go/plugin/go.d/config/go.d/coredns.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/coredns#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/coredns#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/couchbase.conf b/src/go/plugin/go.d/config/go.d/couchbase.conf
index aec5c342c7..e69a5b4964 100644
--- a/src/go/plugin/go.d/config/go.d/couchbase.conf
+++ b/src/go/plugin/go.d/config/go.d/couchbase.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/couchbase#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/couchbase#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/couchdb.conf b/src/go/plugin/go.d/config/go.d/couchdb.conf
index 5b62ad1913..bc10f7859e 100644
--- a/src/go/plugin/go.d/config/go.d/couchdb.conf
+++ b/src/go/plugin/go.d/config/go.d/couchdb.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/couchdb#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/couchdb#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/dmcache.conf b/src/go/plugin/go.d/config/go.d/dmcache.conf
index 8b39726cb3..87cd120554 100644
--- a/src/go/plugin/go.d/config/go.d/dmcache.conf
+++ b/src/go/plugin/go.d/config/go.d/dmcache.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dmcache#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dmcache#readme
 
 jobs:
   - name: dmcache
diff --git a/src/go/plugin/go.d/config/go.d/dns_query.conf b/src/go/plugin/go.d/config/go.d/dns_query.conf
index ca24265bf4..cf4c9a99d0 100644
--- a/src/go/plugin/go.d/config/go.d/dns_query.conf
+++ b/src/go/plugin/go.d/config/go.d/dns_query.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsquery#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dnsquery#readme
 
 #jobs:
 # - name: example
diff --git a/src/go/plugin/go.d/config/go.d/dnsdist.conf b/src/go/plugin/go.d/config/go.d/dnsdist.conf
index cc991e018e..ac51cc68a2 100644
--- a/src/go/plugin/go.d/config/go.d/dnsdist.conf
+++ b/src/go/plugin/go.d/config/go.d/dnsdist.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsdist#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dnsdist#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/dnsmasq.conf b/src/go/plugin/go.d/config/go.d/dnsmasq.conf
index 3b9b3d3260..905552b32b 100644
--- a/src/go/plugin/go.d/config/go.d/dnsmasq.conf
+++ b/src/go/plugin/go.d/config/go.d/dnsmasq.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsmasq#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dnsmasq#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/dnsmasq_dhcp.conf b/src/go/plugin/go.d/config/go.d/dnsmasq_dhcp.conf
index 1f51415dc3..394847f23e 100644
--- a/src/go/plugin/go.d/config/go.d/dnsmasq_dhcp.conf
+++ b/src/go/plugin/go.d/config/go.d/dnsmasq_dhcp.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dnsmasq_dhcp#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dnsmasq_dhcp#readme
 
 jobs:
   - name: dnsmasq_dhcp
diff --git a/src/go/plugin/go.d/config/go.d/docker.conf b/src/go/plugin/go.d/config/go.d/docker.conf
index 084373f749..656f0233fe 100644
--- a/src/go/plugin/go.d/config/go.d/docker.conf
+++ b/src/go/plugin/go.d/config/go.d/docker.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/docker#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/docker#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/docker_engine.conf b/src/go/plugin/go.d/config/go.d/docker_engine.conf
index ba7342a77b..90f534a4d5 100644
--- a/src/go/plugin/go.d/config/go.d/docker_engine.conf
+++ b/src/go/plugin/go.d/config/go.d/docker_engine.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/docker_engine#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/docker_engine#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/dockerhub.conf b/src/go/plugin/go.d/config/go.d/dockerhub.conf
index 96b29e26b5..0c93e4f7ac 100644
--- a/src/go/plugin/go.d/config/go.d/dockerhub.conf
+++ b/src/go/plugin/go.d/config/go.d/dockerhub.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dockerhub#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dockerhub#readme
 
 #jobs:
 #  - name: dockerhub
diff --git a/src/go/plugin/go.d/config/go.d/dovecot.conf b/src/go/plugin/go.d/config/go.d/dovecot.conf
index 5dd31bd7da..ab420907cd 100644
--- a/src/go/plugin/go.d/config/go.d/dovecot.conf
+++ b/src/go/plugin/go.d/config/go.d/dovecot.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/dovecot#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/dovecot#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/elasticsearch.conf b/src/go/plugin/go.d/config/go.d/elasticsearch.conf
index 26ff2c9cd2..74281a7ad3 100644
--- a/src/go/plugin/go.d/config/go.d/elasticsearch.conf
+++ b/src/go/plugin/go.d/config/go.d/elasticsearch.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/elasticsearch#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/elasticsearch#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/envoy.conf b/src/go/plugin/go.d/config/go.d/envoy.conf
index fc30a35020..4087476917 100644
--- a/src/go/plugin/go.d/config/go.d/envoy.conf
+++ b/src/go/plugin/go.d/config/go.d/envoy.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/envoy#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/envoy#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/exim.conf b/src/go/plugin/go.d/config/go.d/exim.conf
index db88131528..3147a8ed1e 100644
--- a/src/go/plugin/go.d/config/go.d/exim.conf
+++ b/src/go/plugin/go.d/config/go.d/exim.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/exim#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/exim#readme
 
 jobs:
   - name: exim
diff --git a/src/go/plugin/go.d/config/go.d/fail2ban.conf b/src/go/plugin/go.d/config/go.d/fail2ban.conf
index ac3d126b74..f953411ac5 100644
--- a/src/go/plugin/go.d/config/go.d/fail2ban.conf
+++ b/src/go/plugin/go.d/config/go.d/fail2ban.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/fail2ban#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/fail2ban#readme
 
 jobs:
   - name: fail2ban
diff --git a/src/go/plugin/go.d/config/go.d/filecheck.conf b/src/go/plugin/go.d/config/go.d/filecheck.conf
index ed33675ef2..f8404c1c4c 100644
--- a/src/go/plugin/go.d/config/go.d/filecheck.conf
+++ b/src/go/plugin/go.d/config/go.d/filecheck.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/filecheck#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/filecheck#readme
 
 #jobs:
 # - name: files_example
diff --git a/src/go/plugin/go.d/config/go.d/fluentd.conf b/src/go/plugin/go.d/config/go.d/fluentd.conf
index a75dde619e..35abfe7a94 100644
--- a/src/go/plugin/go.d/config/go.d/fluentd.conf
+++ b/src/go/plugin/go.d/config/go.d/fluentd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/fluentd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/fluentd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/freeradius.conf b/src/go/plugin/go.d/config/go.d/freeradius.conf
index ba8b066d0f..51607ae720 100644
--- a/src/go/plugin/go.d/config/go.d/freeradius.conf
+++ b/src/go/plugin/go.d/config/go.d/freeradius.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/freeradius#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/freeradius#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/gearman.conf b/src/go/plugin/go.d/config/go.d/gearman.conf
index b816f27d1b..dad7138c2a 100644
--- a/src/go/plugin/go.d/config/go.d/gearman.conf
+++ b/src/go/plugin/go.d/config/go.d/gearman.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/gearman#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/gearman#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/geth.conf b/src/go/plugin/go.d/config/go.d/geth.conf
index e09fc055e7..43f1538616 100644
--- a/src/go/plugin/go.d/config/go.d/geth.conf
+++ b/src/go/plugin/go.d/config/go.d/geth.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/geth#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/geth#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/haproxy.conf b/src/go/plugin/go.d/config/go.d/haproxy.conf
index f2f8011e1e..5ae11c1e53 100644
--- a/src/go/plugin/go.d/config/go.d/haproxy.conf
+++ b/src/go/plugin/go.d/config/go.d/haproxy.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/haproxy#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/haproxy#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/hddtemp.conf b/src/go/plugin/go.d/config/go.d/hddtemp.conf
index 6a9830a8d0..d9e9a31bdf 100644
--- a/src/go/plugin/go.d/config/go.d/hddtemp.conf
+++ b/src/go/plugin/go.d/config/go.d/hddtemp.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hddtemp#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/hddtemp#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/hdfs.conf b/src/go/plugin/go.d/config/go.d/hdfs.conf
index 93a6d24b05..c93f529211 100644
--- a/src/go/plugin/go.d/config/go.d/hdfs.conf
+++ b/src/go/plugin/go.d/config/go.d/hdfs.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hdfs#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/hdfs#readme
 
 #jobs:
 #  - name: namenode
diff --git a/src/go/plugin/go.d/config/go.d/hpssa.conf b/src/go/plugin/go.d/config/go.d/hpssa.conf
index 6638b61660..b5e198432c 100644
--- a/src/go/plugin/go.d/config/go.d/hpssa.conf
+++ b/src/go/plugin/go.d/config/go.d/hpssa.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/hpssa#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/hpssa#readme
 
 jobs:
   - name: hpssa
diff --git a/src/go/plugin/go.d/config/go.d/httpcheck.conf b/src/go/plugin/go.d/config/go.d/httpcheck.conf
index 6aba8dca29..8ad7b9b730 100644
--- a/src/go/plugin/go.d/config/go.d/httpcheck.conf
+++ b/src/go/plugin/go.d/config/go.d/httpcheck.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/httpcheck#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/httpcheck#readme
 
 #jobs:
 #  - name: jira
diff --git a/src/go/plugin/go.d/config/go.d/icecast.conf b/src/go/plugin/go.d/config/go.d/icecast.conf
index aba3e1d2c6..2ce045e069 100644
--- a/src/go/plugin/go.d/config/go.d/icecast.conf
+++ b/src/go/plugin/go.d/config/go.d/icecast.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/icecast#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/icecast#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/intelgpu.conf b/src/go/plugin/go.d/config/go.d/intelgpu.conf
index a8b3144f2e..bdcc58c8d9 100644
--- a/src/go/plugin/go.d/config/go.d/intelgpu.conf
+++ b/src/go/plugin/go.d/config/go.d/intelgpu.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/intelgpu#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/intelgpu#readme
 
 jobs:
   - name: intelgpu
diff --git a/src/go/plugin/go.d/config/go.d/ipfs.conf b/src/go/plugin/go.d/config/go.d/ipfs.conf
index 127006de58..b7046df7e7 100644
--- a/src/go/plugin/go.d/config/go.d/ipfs.conf
+++ b/src/go/plugin/go.d/config/go.d/ipfs.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ipfs#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ipfs#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/isc_dhcpd.conf b/src/go/plugin/go.d/config/go.d/isc_dhcpd.conf
index 17a577bb4a..5b19a47a91 100644
--- a/src/go/plugin/go.d/config/go.d/isc_dhcpd.conf
+++ b/src/go/plugin/go.d/config/go.d/isc_dhcpd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/isc_dhcpd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/isc_dhcpd#readme
 
 #jobs:
 # - name: ipv4_example
diff --git a/src/go/plugin/go.d/config/go.d/k8s_kubelet.conf b/src/go/plugin/go.d/config/go.d/k8s_kubelet.conf
index 1c0f8cd1f8..5175eca44f 100644
--- a/src/go/plugin/go.d/config/go.d/k8s_kubelet.conf
+++ b/src/go/plugin/go.d/config/go.d/k8s_kubelet.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_kubelet#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/k8s_kubelet#readme
 
 #jobs:
 #  - url: http://127.0.0.1:10255/metrics
diff --git a/src/go/plugin/go.d/config/go.d/k8s_kubeproxy.conf b/src/go/plugin/go.d/config/go.d/k8s_kubeproxy.conf
index a0b9ee2405..a946b7d11b 100644
--- a/src/go/plugin/go.d/config/go.d/k8s_kubeproxy.conf
+++ b/src/go/plugin/go.d/config/go.d/k8s_kubeproxy.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_kubeproxy#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/k8s_kubeproxy#readme
 
 #jobs:
 #  - url: http://127.0.0.1:10249/metrics
diff --git a/src/go/plugin/go.d/config/go.d/k8s_state.conf b/src/go/plugin/go.d/config/go.d/k8s_state.conf
index fd1c305e01..34d0b6284c 100644
--- a/src/go/plugin/go.d/config/go.d/k8s_state.conf
+++ b/src/go/plugin/go.d/config/go.d/k8s_state.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/k8s_state#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/k8s_state#readme
 
 jobs:
   - name: k8s_state
diff --git a/src/go/plugin/go.d/config/go.d/lighttpd.conf b/src/go/plugin/go.d/config/go.d/lighttpd.conf
index 51866bfb73..bfac3f96a8 100644
--- a/src/go/plugin/go.d/config/go.d/lighttpd.conf
+++ b/src/go/plugin/go.d/config/go.d/lighttpd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/lighttpd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/lighttpd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/litespeed.conf b/src/go/plugin/go.d/config/go.d/litespeed.conf
index c525ff0acb..96c0339be3 100644
--- a/src/go/plugin/go.d/config/go.d/litespeed.conf
+++ b/src/go/plugin/go.d/config/go.d/litespeed.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/litespeed#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/litespeed#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/logind.conf b/src/go/plugin/go.d/config/go.d/logind.conf
index 219b37ae25..ce3d1064bc 100644
--- a/src/go/plugin/go.d/config/go.d/logind.conf
+++ b/src/go/plugin/go.d/config/go.d/logind.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/logind#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/logind#readme
 
 jobs:
   - name: logind
diff --git a/src/go/plugin/go.d/config/go.d/logstash.conf b/src/go/plugin/go.d/config/go.d/logstash.conf
index c67819e13d..b60127f852 100644
--- a/src/go/plugin/go.d/config/go.d/logstash.conf
+++ b/src/go/plugin/go.d/config/go.d/logstash.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/logstash#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/logstash#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/lvm.conf b/src/go/plugin/go.d/config/go.d/lvm.conf
index 54da37b1a0..463fdb5893 100644
--- a/src/go/plugin/go.d/config/go.d/lvm.conf
+++ b/src/go/plugin/go.d/config/go.d/lvm.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/lvm#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/lvm#readme
 
 jobs:
   - name: lvm
diff --git a/src/go/plugin/go.d/config/go.d/maxscale.conf b/src/go/plugin/go.d/config/go.d/maxscale.conf
index 97e7e17bd5..981d565cb4 100644
--- a/src/go/plugin/go.d/config/go.d/maxscale.conf
+++ b/src/go/plugin/go.d/config/go.d/maxscale.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/maxscale#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/maxscale#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/megacli.conf b/src/go/plugin/go.d/config/go.d/megacli.conf
index 8d26763b7d..d14bfdb95f 100644
--- a/src/go/plugin/go.d/config/go.d/megacli.conf
+++ b/src/go/plugin/go.d/config/go.d/megacli.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/megacli#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/megacli#readme
 
 jobs:
   - name: megacli
diff --git a/src/go/plugin/go.d/config/go.d/memcached.conf b/src/go/plugin/go.d/config/go.d/memcached.conf
index 60603be287..bd9785cf6b 100644
--- a/src/go/plugin/go.d/config/go.d/memcached.conf
+++ b/src/go/plugin/go.d/config/go.d/memcached.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/memcached#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/memcached#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/mongodb.conf b/src/go/plugin/go.d/config/go.d/mongodb.conf
index ae41e4c734..843407bc5a 100644
--- a/src/go/plugin/go.d/config/go.d/mongodb.conf
+++ b/src/go/plugin/go.d/config/go.d/mongodb.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/mongodb#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/mongodb#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/monit.conf b/src/go/plugin/go.d/config/go.d/monit.conf
index e7768d6183..7a2b7b0f2f 100644
--- a/src/go/plugin/go.d/config/go.d/monit.conf
+++ b/src/go/plugin/go.d/config/go.d/monit.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/monit#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/monit#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/mysql.conf b/src/go/plugin/go.d/config/go.d/mysql.conf
index bdba6df76f..4a9a641209 100644
--- a/src/go/plugin/go.d/config/go.d/mysql.conf
+++ b/src/go/plugin/go.d/config/go.d/mysql.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/mysql#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/mysql#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/nginx.conf b/src/go/plugin/go.d/config/go.d/nginx.conf
index 03b56d2385..da2dd51a9a 100644
--- a/src/go/plugin/go.d/config/go.d/nginx.conf
+++ b/src/go/plugin/go.d/config/go.d/nginx.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginx#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nginx#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/nginxplus.conf b/src/go/plugin/go.d/config/go.d/nginxplus.conf
index f0c0228531..2985f9068d 100644
--- a/src/go/plugin/go.d/config/go.d/nginxplus.conf
+++ b/src/go/plugin/go.d/config/go.d/nginxplus.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginxplus#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nginxplus#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/nginxunit.conf b/src/go/plugin/go.d/config/go.d/nginxunit.conf
index 04241a7fb3..f5382dfb79 100644
--- a/src/go/plugin/go.d/config/go.d/nginxunit.conf
+++ b/src/go/plugin/go.d/config/go.d/nginxunit.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginxunit#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nginxunit#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/nginxvts.conf b/src/go/plugin/go.d/config/go.d/nginxvts.conf
index 1b4ea7f1e6..4e51148520 100644
--- a/src/go/plugin/go.d/config/go.d/nginxvts.conf
+++ b/src/go/plugin/go.d/config/go.d/nginxvts.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nginxvts#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nginxvts#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/nsd.conf b/src/go/plugin/go.d/config/go.d/nsd.conf
index b3c0a7868f..ef8471bea2 100644
--- a/src/go/plugin/go.d/config/go.d/nsd.conf
+++ b/src/go/plugin/go.d/config/go.d/nsd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nsd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nsd#readme
 
 jobs:
   - name: nsd
diff --git a/src/go/plugin/go.d/config/go.d/ntpd.conf b/src/go/plugin/go.d/config/go.d/ntpd.conf
index d607450a57..4968f5d319 100644
--- a/src/go/plugin/go.d/config/go.d/ntpd.conf
+++ b/src/go/plugin/go.d/config/go.d/ntpd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ntpd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ntpd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/nvidia_smi.conf b/src/go/plugin/go.d/config/go.d/nvidia_smi.conf
index 39a7014364..e8a1e3826a 100644
--- a/src/go/plugin/go.d/config/go.d/nvidia_smi.conf
+++ b/src/go/plugin/go.d/config/go.d/nvidia_smi.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nvidia_smi#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nvidia_smi#readme
 
 jobs:
   - name: nvidia_smi
diff --git a/src/go/plugin/go.d/config/go.d/nvme.conf b/src/go/plugin/go.d/config/go.d/nvme.conf
index ef0146265d..e5d583bc55 100644
--- a/src/go/plugin/go.d/config/go.d/nvme.conf
+++ b/src/go/plugin/go.d/config/go.d/nvme.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/nvme#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/nvme#readme
 
 jobs:
   - name: nvme
diff --git a/src/go/plugin/go.d/config/go.d/openldap.conf b/src/go/plugin/go.d/config/go.d/openldap.conf
index 6d10059439..3fe7c2a03d 100644
--- a/src/go/plugin/go.d/config/go.d/openldap.conf
+++ b/src/go/plugin/go.d/config/go.d/openldap.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/openldap#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/openldap#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/openvpn.conf b/src/go/plugin/go.d/config/go.d/openvpn.conf
index 0bc65018e4..94104bfc00 100644
--- a/src/go/plugin/go.d/config/go.d/openvpn.conf
+++ b/src/go/plugin/go.d/config/go.d/openvpn.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/openvpn#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/openvpn#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/openvpn_status_log.conf b/src/go/plugin/go.d/config/go.d/openvpn_status_log.conf
index ae401780c5..c5e19d4230 100644
--- a/src/go/plugin/go.d/config/go.d/openvpn_status_log.conf
+++ b/src/go/plugin/go.d/config/go.d/openvpn_status_log.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/openvpn_status_log#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/openvpn_status_log#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/oracledb.conf b/src/go/plugin/go.d/config/go.d/oracledb.conf
index 945a77670a..9a9c792468 100644
--- a/src/go/plugin/go.d/config/go.d/oracledb.conf
+++ b/src/go/plugin/go.d/config/go.d/oracledb.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/oracledb#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/oracledb#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/pgbouncer.conf b/src/go/plugin/go.d/config/go.d/pgbouncer.conf
index fdc067d77d..497f982c46 100644
--- a/src/go/plugin/go.d/config/go.d/pgbouncer.conf
+++ b/src/go/plugin/go.d/config/go.d/pgbouncer.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pgbouncer#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/pgbouncer#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/phpdaemon.conf b/src/go/plugin/go.d/config/go.d/phpdaemon.conf
index 2bd8c13981..fcdb9e6ea9 100644
--- a/src/go/plugin/go.d/config/go.d/phpdaemon.conf
+++ b/src/go/plugin/go.d/config/go.d/phpdaemon.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/phpdaemon#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/phpdaemon#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/phpfpm.conf b/src/go/plugin/go.d/config/go.d/phpfpm.conf
index a159a5e405..54ca63bc7f 100644
--- a/src/go/plugin/go.d/config/go.d/phpfpm.conf
+++ b/src/go/plugin/go.d/config/go.d/phpfpm.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/phpfpm#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/phpfpm#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/pihole.conf b/src/go/plugin/go.d/config/go.d/pihole.conf
index 3ff57d9ae9..85e451c59c 100644
--- a/src/go/plugin/go.d/config/go.d/pihole.conf
+++ b/src/go/plugin/go.d/config/go.d/pihole.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pihole#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/pihole#readme
 
 #jobs:
 #  - name: pihole
diff --git a/src/go/plugin/go.d/config/go.d/pika.conf b/src/go/plugin/go.d/config/go.d/pika.conf
index 9f23d86097..276612c5f6 100644
--- a/src/go/plugin/go.d/config/go.d/pika.conf
+++ b/src/go/plugin/go.d/config/go.d/pika.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pika#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/pika#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/ping.conf b/src/go/plugin/go.d/config/go.d/ping.conf
index b87719ced7..e8f446a905 100644
--- a/src/go/plugin/go.d/config/go.d/ping.conf
+++ b/src/go/plugin/go.d/config/go.d/ping.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/ping#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/ping#readme
 
 #jobs:
 #  - name: example
diff --git a/src/go/plugin/go.d/config/go.d/portcheck.conf b/src/go/plugin/go.d/config/go.d/portcheck.conf
index 0800c9eeb9..a12d6add49 100644
--- a/src/go/plugin/go.d/config/go.d/portcheck.conf
+++ b/src/go/plugin/go.d/config/go.d/portcheck.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/portcheck#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/portcheck#readme
 
 #jobs:
 # - name: job1
diff --git a/src/go/plugin/go.d/config/go.d/postfix.conf b/src/go/plugin/go.d/config/go.d/postfix.conf
index 5eda596580..498ec044d8 100644
--- a/src/go/plugin/go.d/config/go.d/postfix.conf
+++ b/src/go/plugin/go.d/config/go.d/postfix.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/postfix#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/postfix#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/postgres.conf b/src/go/plugin/go.d/config/go.d/postgres.conf
index 8911d82b7e..687fbd8e82 100644
--- a/src/go/plugin/go.d/config/go.d/postgres.conf
+++ b/src/go/plugin/go.d/config/go.d/postgres.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/postgres#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/postgres#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/powerdns.conf b/src/go/plugin/go.d/config/go.d/powerdns.conf
index dd543c8a8e..4c37576576 100644
--- a/src/go/plugin/go.d/config/go.d/powerdns.conf
+++ b/src/go/plugin/go.d/config/go.d/powerdns.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/powerdns#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/powerdns#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/powerdns_recursor.conf b/src/go/plugin/go.d/config/go.d/powerdns_recursor.conf
index 19f044c6c2..d6844d0100 100644
--- a/src/go/plugin/go.d/config/go.d/powerdns_recursor.conf
+++ b/src/go/plugin/go.d/config/go.d/powerdns_recursor.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/powerdns_recursor#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/powerdns_recursor#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/prometheus.conf b/src/go/plugin/go.d/config/go.d/prometheus.conf
index ef051dff69..dfddf9f907 100644
--- a/src/go/plugin/go.d/config/go.d/prometheus.conf
+++ b/src/go/plugin/go.d/config/go.d/prometheus.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/prometheus#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/prometheus#readme
 
 #jobs:
 #  - name: node_exporter_local
diff --git a/src/go/plugin/go.d/config/go.d/proxysql.conf b/src/go/plugin/go.d/config/go.d/proxysql.conf
index d97bf32850..0ca48aae82 100644
--- a/src/go/plugin/go.d/config/go.d/proxysql.conf
+++ b/src/go/plugin/go.d/config/go.d/proxysql.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/proxysql#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/proxysql#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/pulsar.conf b/src/go/plugin/go.d/config/go.d/pulsar.conf
index 5dea6ade35..c15ff2efe1 100644
--- a/src/go/plugin/go.d/config/go.d/pulsar.conf
+++ b/src/go/plugin/go.d/config/go.d/pulsar.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/pulsar#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/pulsar#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/puppet.conf b/src/go/plugin/go.d/config/go.d/puppet.conf
index 09e64b7d0b..1a38b853be 100644
--- a/src/go/plugin/go.d/config/go.d/puppet.conf
+++ b/src/go/plugin/go.d/config/go.d/puppet.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/puppet#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/puppet#readme
 
 #jobs:
 #   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/rabbitmq.conf b/src/go/plugin/go.d/config/go.d/rabbitmq.conf
index e64a75662e..b086ae0730 100644
--- a/src/go/plugin/go.d/config/go.d/rabbitmq.conf
+++ b/src/go/plugin/go.d/config/go.d/rabbitmq.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/rabbitmq#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/rabbitmq#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/redis.conf b/src/go/plugin/go.d/config/go.d/redis.conf
index 8910b1547c..2fd64b125a 100644
--- a/src/go/plugin/go.d/config/go.d/redis.conf
+++ b/src/go/plugin/go.d/config/go.d/redis.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/redis#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/redis#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/rethinkdb.conf b/src/go/plugin/go.d/config/go.d/rethinkdb.conf
index 7d0502aca8..1c06e5915a 100644
--- a/src/go/plugin/go.d/config/go.d/rethinkdb.conf
+++ b/src/go/plugin/go.d/config/go.d/rethinkdb.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/rethinkdb#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/rethinkdb#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/riakkv.conf b/src/go/plugin/go.d/config/go.d/riakkv.conf
index 35f3b468fb..91dc63be77 100644
--- a/src/go/plugin/go.d/config/go.d/riakkv.conf
+++ b/src/go/plugin/go.d/config/go.d/riakkv.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/riakkv#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/riakkv#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/rspamd.conf b/src/go/plugin/go.d/config/go.d/rspamd.conf
index f4db129ca0..9f1c8ec96b 100644
--- a/src/go/plugin/go.d/config/go.d/rspamd.conf
+++ b/src/go/plugin/go.d/config/go.d/rspamd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/rspamd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/rspamd#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/samba.conf b/src/go/plugin/go.d/config/go.d/samba.conf
index c8a9236a2e..4cb616f77c 100644
--- a/src/go/plugin/go.d/config/go.d/samba.conf
+++ b/src/go/plugin/go.d/config/go.d/samba.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/samba#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/samba#readme
 
 jobs:
   - name: samba
diff --git a/src/go/plugin/go.d/config/go.d/scaleio.conf b/src/go/plugin/go.d/config/go.d/scaleio.conf
index 9db85cc4d9..1617025b2a 100644
--- a/src/go/plugin/go.d/config/go.d/scaleio.conf
+++ b/src/go/plugin/go.d/config/go.d/scaleio.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/scaleio#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/scaleio#readme
 
 #jobs:
 #  - name     : local
diff --git a/src/go/plugin/go.d/config/go.d/sensors.conf b/src/go/plugin/go.d/config/go.d/sensors.conf
index d1b4c4f144..a08dde4b24 100644
--- a/src/go/plugin/go.d/config/go.d/sensors.conf
+++ b/src/go/plugin/go.d/config/go.d/sensors.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/sensors#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/sensors#readme
 
 jobs:
   - name: sensors
diff --git a/src/go/plugin/go.d/config/go.d/smartctl.conf b/src/go/plugin/go.d/config/go.d/smartctl.conf
index 7f8ca5ada0..297da13eb7 100644
--- a/src/go/plugin/go.d/config/go.d/smartctl.conf
+++ b/src/go/plugin/go.d/config/go.d/smartctl.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/smartctl#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/smartctl#readme
 
 jobs:
   - name: smartctl
diff --git a/src/go/plugin/go.d/config/go.d/snmp.conf b/src/go/plugin/go.d/config/go.d/snmp.conf
index 395fb0f01b..726d3fe24e 100644
--- a/src/go/plugin/go.d/config/go.d/snmp.conf
+++ b/src/go/plugin/go.d/config/go.d/snmp.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/snmp#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/snmp#readme
 
 #jobs:
 #  - name: switch
diff --git a/src/go/plugin/go.d/config/go.d/spigotmc.conf b/src/go/plugin/go.d/config/go.d/spigotmc.conf
index 1ee2430680..787aeeb4d0 100644
--- a/src/go/plugin/go.d/config/go.d/spigotmc.conf
+++ b/src/go/plugin/go.d/config/go.d/spigotmc.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/spigotmc#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/spigotmc#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/squid.conf b/src/go/plugin/go.d/config/go.d/squid.conf
index 21c711d38c..d41e24accf 100644
--- a/src/go/plugin/go.d/config/go.d/squid.conf
+++ b/src/go/plugin/go.d/config/go.d/squid.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/squid#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/squid#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/squidlog.conf b/src/go/plugin/go.d/config/go.d/squidlog.conf
index 4c85e38491..a10da69441 100644
--- a/src/go/plugin/go.d/config/go.d/squidlog.conf
+++ b/src/go/plugin/go.d/config/go.d/squidlog.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/squidlog#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/squidlog#readme
 
 jobs:
   - name: squidlog
diff --git a/src/go/plugin/go.d/config/go.d/storcli.conf b/src/go/plugin/go.d/config/go.d/storcli.conf
index 704f7579d0..f179410e9c 100644
--- a/src/go/plugin/go.d/config/go.d/storcli.conf
+++ b/src/go/plugin/go.d/config/go.d/storcli.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/storcli#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/storcli#readme
 
 jobs:
   - name: storcli
diff --git a/src/go/plugin/go.d/config/go.d/supervisord.conf b/src/go/plugin/go.d/config/go.d/supervisord.conf
index 5d3969b7d4..a513ba5fdf 100644
--- a/src/go/plugin/go.d/config/go.d/supervisord.conf
+++ b/src/go/plugin/go.d/config/go.d/supervisord.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/supervisord#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/supervisord#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/systemdunits.conf b/src/go/plugin/go.d/config/go.d/systemdunits.conf
index 7aefd37ea9..b6d88b83d6 100644
--- a/src/go/plugin/go.d/config/go.d/systemdunits.conf
+++ b/src/go/plugin/go.d/config/go.d/systemdunits.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/systemdunits#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/systemdunits#readme
 
 jobs:
  - name: service-units
diff --git a/src/go/plugin/go.d/config/go.d/tengine.conf b/src/go/plugin/go.d/config/go.d/tengine.conf
index aefaf2ac7b..2a909c4736 100644
--- a/src/go/plugin/go.d/config/go.d/tengine.conf
+++ b/src/go/plugin/go.d/config/go.d/tengine.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/tengine#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/tengine#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/tomcat.conf b/src/go/plugin/go.d/config/go.d/tomcat.conf
index cae77e8621..95783d98f2 100644
--- a/src/go/plugin/go.d/config/go.d/tomcat.conf
+++ b/src/go/plugin/go.d/config/go.d/tomcat.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/tomcat#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/tomcat#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/tor.conf b/src/go/plugin/go.d/config/go.d/tor.conf
index 7aa949d96a..5beb0b8900 100644
--- a/src/go/plugin/go.d/config/go.d/tor.conf
+++ b/src/go/plugin/go.d/config/go.d/tor.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/tor#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/tor#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/traefik.conf b/src/go/plugin/go.d/config/go.d/traefik.conf
index 8c005db01a..a46d7b1507 100644
--- a/src/go/plugin/go.d/config/go.d/traefik.conf
+++ b/src/go/plugin/go.d/config/go.d/traefik.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/traefik#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/traefik#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/typesense.conf b/src/go/plugin/go.d/config/go.d/typesense.conf
index 1ca549803e..dc6a24f8c3 100644
--- a/src/go/plugin/go.d/config/go.d/typesense.conf
+++ b/src/go/plugin/go.d/config/go.d/typesense.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/typesense#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/typesense#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/unbound.conf b/src/go/plugin/go.d/config/go.d/unbound.conf
index 06552bfd92..0fc5c10113 100644
--- a/src/go/plugin/go.d/config/go.d/unbound.conf
+++ b/src/go/plugin/go.d/config/go.d/unbound.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/unbound#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/unbound#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/upsd.conf b/src/go/plugin/go.d/config/go.d/upsd.conf
index 6f7b31090e..4451a75462 100644
--- a/src/go/plugin/go.d/config/go.d/upsd.conf
+++ b/src/go/plugin/go.d/config/go.d/upsd.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/upsd#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/upsd#readme
 
 #jobs:
 #  - name: upsd
diff --git a/src/go/plugin/go.d/config/go.d/uwsgi.conf b/src/go/plugin/go.d/config/go.d/uwsgi.conf
index f318918047..53037459be 100644
--- a/src/go/plugin/go.d/config/go.d/uwsgi.conf
+++ b/src/go/plugin/go.d/config/go.d/uwsgi.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/uwsgi#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/uwsgi#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/varnish.conf b/src/go/plugin/go.d/config/go.d/varnish.conf
index 64950d6cd3..377ab0736f 100644
--- a/src/go/plugin/go.d/config/go.d/varnish.conf
+++ b/src/go/plugin/go.d/config/go.d/varnish.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/varnish#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/varnish#readme
 
 jobs:
   - name: local
diff --git a/src/go/plugin/go.d/config/go.d/vcsa.conf b/src/go/plugin/go.d/config/go.d/vcsa.conf
index 39ee86d91f..78e80d4bfa 100644
--- a/src/go/plugin/go.d/config/go.d/vcsa.conf
+++ b/src/go/plugin/go.d/config/go.d/vcsa.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vcsa#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/vcsa#readme
 
 #jobs:
 #  - name     : vcsa1
diff --git a/src/go/plugin/go.d/config/go.d/vernemq.conf b/src/go/plugin/go.d/config/go.d/vernemq.conf
index c954074f87..d2dda9dba6 100644
--- a/src/go/plugin/go.d/config/go.d/vernemq.conf
+++ b/src/go/plugin/go.d/config/go.d/vernemq.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vernemq#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/vernemq#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/config/go.d/vsphere.conf b/src/go/plugin/go.d/config/go.d/vsphere.conf
index cbc58a3540..e5d7810015 100644
--- a/src/go/plugin/go.d/config/go.d/vsphere.conf
+++ b/src/go/plugin/go.d/config/go.d/vsphere.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/vsphere#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/vsphere#readme
 
 #jobs:
 #  - name     : vcenter1
diff --git a/src/go/plugin/go.d/config/go.d/w1sensor.conf b/src/go/plugin/go.d/config/go.d/w1sensor.conf
index 005f58058e..db0ce9b2aa 100644
--- a/src/go/plugin/go.d/config/go.d/w1sensor.conf
+++ b/src/go/plugin/go.d/config/go.d/w1sensor.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/w1sensor#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/w1sensor#readme
 
 jobs:
   - name: w1sensor
diff --git a/src/go/plugin/go.d/config/go.d/web_log.conf b/src/go/plugin/go.d/config/go.d/web_log.conf
index 502fece496..55cabb9d12 100644
--- a/src/go/plugin/go.d/config/go.d/web_log.conf
+++ b/src/go/plugin/go.d/config/go.d/web_log.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/web_log#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/web_log#readme
 
 jobs:
   # NGINX
diff --git a/src/go/plugin/go.d/config/go.d/whoisquery.conf b/src/go/plugin/go.d/config/go.d/whoisquery.conf
index 41f7232da0..b193ad32b5 100644
--- a/src/go/plugin/go.d/config/go.d/whoisquery.conf
+++ b/src/go/plugin/go.d/config/go.d/whoisquery.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/whoisquery#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/whoisquery#readme
 
 #jobs:
 #  - name: example
diff --git a/src/go/plugin/go.d/config/go.d/windows.conf b/src/go/plugin/go.d/config/go.d/windows.conf
index 4671c20bce..fbd9396863 100644
--- a/src/go/plugin/go.d/config/go.d/windows.conf
+++ b/src/go/plugin/go.d/config/go.d/windows.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/windows#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/windows#readme
 
 #jobs:
 #  - name: win_server1
diff --git a/src/go/plugin/go.d/config/go.d/wireguard.conf b/src/go/plugin/go.d/config/go.d/wireguard.conf
index 07ed61d068..a0c9307ba2 100644
--- a/src/go/plugin/go.d/config/go.d/wireguard.conf
+++ b/src/go/plugin/go.d/config/go.d/wireguard.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/wireguard#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/wireguard#readme
 
 jobs:
   - name: wireguard
diff --git a/src/go/plugin/go.d/config/go.d/x509check.conf b/src/go/plugin/go.d/config/go.d/x509check.conf
index 5231b1052e..7306a7aa7b 100644
--- a/src/go/plugin/go.d/config/go.d/x509check.conf
+++ b/src/go/plugin/go.d/config/go.d/x509check.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/x509check#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/x509check#readme
 
 #jobs:
 #  - name: my_site_cert
diff --git a/src/go/plugin/go.d/config/go.d/zfspool.conf b/src/go/plugin/go.d/config/go.d/zfspool.conf
index e961d19718..4dba218853 100644
--- a/src/go/plugin/go.d/config/go.d/zfspool.conf
+++ b/src/go/plugin/go.d/config/go.d/zfspool.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/zfspool#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/zfspool#readme
 
 jobs:
   - name: zfspool
diff --git a/src/go/plugin/go.d/config/go.d/zookeeper.conf b/src/go/plugin/go.d/config/go.d/zookeeper.conf
index f200c78935..f0216dfd49 100644
--- a/src/go/plugin/go.d/config/go.d/zookeeper.conf
+++ b/src/go/plugin/go.d/config/go.d/zookeeper.conf
@@ -1,5 +1,5 @@
 ## All available configuration options, their descriptions and default values:
-## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/zookeeper#readme
+## https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/zookeeper#readme
 
 #jobs:
 #  - name: local
diff --git a/src/go/plugin/go.d/docs/how-to-write-a-module.md b/src/go/plugin/go.d/docs/how-to-write-a-module.md
index a861cf8c92..2bfdea5b40 100644
--- a/src/go/plugin/go.d/docs/how-to-write-a-module.md
+++ b/src/go/plugin/go.d/docs/how-to-write-a-module.md
@@ -12,7 +12,7 @@
 ## Write and test a simple collector
 
 > :exclamation: You can skip most of these steps if you first experiment directly with the existing
-> [example module](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules/example), which
+> [example module](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector/example), which
 > will
 > give you an idea of how things work.
 
@@ -21,7 +21,7 @@ Let's assume you want to write a collector named `example2`.
 The steps are:
 
 - Add the source code
-  to [`modules/example2/`](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/modules).
+  to [`modules/example2/`](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/collector).
   - [module interface](#module-interface).
   - [suggested module layout](#module-layout).
   - [helper packages](#helper-packages).
@@ -30,7 +30,7 @@ The steps are:
 - Add the module
   to [`config/go.d.conf`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/config/go.d.conf).
 - Import the module
-  in [`modules/init.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/init.go).
+  in [`modules/init.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/collector/init.go).
 - Update
   the [`available modules list`](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d#available-modules).
 - To build it, run `make` from the plugin root dir. This will create a new `go.d.plugin` binary that includes your newly
@@ -191,7 +191,7 @@ Suggested minimal layout:
 ### File `module_name.go`
 
 > :exclamation: See the
-> example [`example.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/example/example.go).
+> example [`example.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/collector/example/example.go).
 
 Don't overload this file with the implementation details.
 
@@ -204,14 +204,14 @@ Usually it contains only:
 ### File `charts.go`
 
 > :exclamation: See the
-> example: [`charts.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/example/charts.go).
+> example: [`charts.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/collector/example/charts.go).
 
 Put charts, charts templates and charts constructor functions in this file.
 
 ### File `init.go`
 
 > :exclamation: See the
-> example: [`init.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/example/init.go).
+> example: [`init.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/collector/example/init.go).
 
 All the module initialization details should go in this file.
 
@@ -238,7 +238,7 @@ func (e *Example) initSomeValue() error {
 ### File `collect.go`
 
 > :exclamation: See the
-> example: [`collect.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/example/collect.go).
+> example: [`collect.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/collector/example/collect.go).
 
 This file is the entry point for the metrics collection.
 
@@ -261,7 +261,7 @@ func (e *Example) collect() (map[string]int64, error) {
 ### File `module_name_test.go`
 
 > :exclamation: See the
-> example: [`example_test.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/modules/example/example_test.go).
+> example: [`example_test.go`](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/collector/example/example_test.go).
 >
 > if you have no experience in testing we recommend starting
 > with [testing package documentation](https://golang.org/pkg/testing/).
diff --git a/src/health/guides/httpcheck/httpcheck_web_service_bad_content.md b/src/health/guides/httpcheck/httpcheck_web_service_bad_content.md
index c838f83cce..170f74db61 100644
--- a/src/health/guides/httpcheck/httpcheck_web_service_bad_content.md
+++ b/src/health/guides/httpcheck/httpcheck_web_service_bad_content.md
@@ -27,4 +27,4 @@ sudo ./edit-config go.d/httpcheck.conf
 
 ### Useful resources
 
-1. [HTTP endpoint monitoring with Netdata](/src/go/plugin/go.d/modules/httpcheck/integrations/http_endpoints.md)
\ No newline at end of file
+1. [HTTP endpoint monitoring with Netdata](/src/go/plugin/go.d/collector/httpcheck/integrations/http_endpoints.md)
\ No newline at end of file
diff --git a/src/health/guides/httpcheck/httpcheck_web_service_bad_status.md b/src/health/guides/httpcheck/httpcheck_web_service_bad_status.md
index 8ac06a57ed..f2bd20146e 100644
--- a/src/health/guides/httpcheck/httpcheck_web_service_bad_status.md
+++ b/src/health/guides/httpcheck/httpcheck_web_service_bad_status.md
@@ -18,4 +18,4 @@ root@netdata # curl -v <your_http_endpoint>:<port>/<path>
 
 ### Useful resources
 
-1. [HTTP endpoint monitoring with Netdata](/src/go/plugin/go.d/modules/httpcheck/integrations/http_endpoints.md)
+1. [HTTP endpoint monitoring with Netdata](/src/go/plugin/go.d/collector/httpcheck/integrations/http_endpoints.md)
diff --git a/src/health/guides/httpcheck/httpcheck_web_service_slow.md b/src/health/guides/httpcheck/httpcheck_web_service_slow.md
index 8f46a0f14f..d0a04c23fe 100644
--- a/src/health/guides/httpcheck/httpcheck_web_service_slow.md
+++ b/src/health/guides/httpcheck/httpcheck_web_service_slow.md
@@ -14,5 +14,5 @@ To troubleshoot this issue, check for:
 
 ### Useful resources
 
-1. [HTTP endpoint monitoring with Netdata](/src/go/plugin/go.d/modules/httpcheck/integrations/http_endpoints.md)
+1. [HTTP endpoint monitoring with Netdata](/src/go/plugin/go.d/collector/httpcheck/integrations/http_endpoints.md)
 
diff --git a/src/health/guides/httpcheck/httpcheck_web_service_unreachable.md b/src/health/guides/httpcheck/httpcheck_web_service_unreachable.md
index de950e49ed..0f1f51b251 100644
--- a/src/health/guides/httpcheck/httpcheck_web_service_unreachable.md
+++ b/src/health/guides/httpcheck/httpcheck_web_service_unreachable.md
@@ -30,4 +30,4 @@ To troubleshoot this error, check the following:
 
 ### Useful resources
 
-1. [HTTP endpoint monitoring with Netdata](/src/go/plugin/go.d/modules/httpcheck/integrations/http_endpoints.md)
\ No newline at end of file
+1. [HTTP endpoint monitoring with Netdata](/src/go/plugin/go.d/collector/httpcheck/integrations/http_endpoints.md)
\ No newline at end of file