diff --git a/sudoers.d/20_zabbix b/sudoers.d/20_zabbix
index b471ad9cec86c60622c9a667789e68702c147180..1e091fb8cee99198e3f7f077d6b87741e817ca49 100644
--- a/sudoers.d/20_zabbix
+++ b/sudoers.d/20_zabbix
@@ -1,5 +1,5 @@
-zabbix ALL= NOPASSWD: /opt/bin/batman-gateway-mode-enabled.sh
-zabbix ALL= NOPASSWD: /opt/bin/batman-maximum-gateway-metric.sh
-zabbix ALL= NOPASSWD: /opt/bin/batman-visible-gateway-count.sh
-zabbix ALL= NOPASSWD: /opt/bin/route-table42-reachable6.sh
-zabbix ALL= NOPASSWD: /opt/bin/route-table42-reachable.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/batman-gateway-mode-enabled.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/batman-maximum-gateway-metric.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/batman-visible-gateway-count.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/route-table42-reachable6.sh
+zabbix ALL= NOPASSWD: /opt/bin/zabbix/route-table42-reachable.sh
diff --git a/zabbix_agentd.d/userparameter_batman.conf b/zabbix_agentd.d/userparameter_batman.conf
index cf30a90fb7bb241b706e9871145ad47c3e83945b..8e45cc88e1ca597e02fa156ed1e1c0974b75f293 100644
--- a/zabbix_agentd.d/userparameter_batman.conf
+++ b/zabbix_agentd.d/userparameter_batman.conf
@@ -1,4 +1,4 @@
-UserParameter=batman-gateway-mode-enabled,sudo /opt/bin/batman-gateway-mode-enabled.sh
-UserParameter=batman-maximum-gateway-metric,sudo /opt/bin/batman-maximum-gateway-metric.sh
-UserParameter=batman-visible-gateway-count,sudo /opt/bin/batman-visible-gateway-count.sh
+UserParameter=batman-gateway-mode-enabled,sudo /opt/bin/zabbix/batman-gateway-mode-enabled.sh
+UserParameter=batman-maximum-gateway-metric,sudo /opt/bin/zabbix/batman-maximum-gateway-metric.sh
+UserParameter=batman-visible-gateway-count,sudo /opt/bin/zabbix/batman-visible-gateway-count.sh
 
diff --git a/zabbix_agentd.d/userparameter_conntrack.conf b/zabbix_agentd.d/userparameter_conntrack.conf
index 1749e14af3004d4154355e6ad4baa9a9e4243435..523ed5fa3e45a78e7534ef427d07aa62ac16852f 100644
--- a/zabbix_agentd.d/userparameter_conntrack.conf
+++ b/zabbix_agentd.d/userparameter_conntrack.conf
@@ -1,2 +1,2 @@
-UserParameter=ip_conntrack_count,/opt/bin/conntrack_count.sh
-UserParameter=ip_conntrack_max,/opt/bin/conntrack_max.sh
+UserParameter=ip_conntrack_count,/opt/bin/zabbix/conntrack_count.sh
+UserParameter=ip_conntrack_max,/opt/bin/zabbix/conntrack_max.sh
diff --git a/zabbix_agentd.d/userparameter_dhcp.conf b/zabbix_agentd.d/userparameter_dhcp.conf
index a0bb3e1b128cf75bb63d1c875aa357e051a84e2c..63db7ba93cf683adb19a4171a77ec2c4193e1e82 100644
--- a/zabbix_agentd.d/userparameter_dhcp.conf
+++ b/zabbix_agentd.d/userparameter_dhcp.conf
@@ -1,3 +1,3 @@
-UserParameter=dhcp_lease_free,/opt/bin/dhcp-pool-usage-percent.sh free
-UserParameter=dhcp_lease_used,/opt/bin/dhcp-pool-usage-percent.sh used
-UserParameter=dhcp_server_running,/opt/bin/dhcp_server_running.sh
+UserParameter=dhcp_lease_free,/opt/bin/zabbix/dhcp-pool-usage-percent.sh free
+UserParameter=dhcp_lease_used,/opt/bin/zabbix/dhcp-pool-usage-percent.sh used
+UserParameter=dhcp_server_running,/opt/bin/zabbix/dhcp_server_running.sh
diff --git a/zabbix_agentd.d/userparameter_route-table42.conf b/zabbix_agentd.d/userparameter_route-table42.conf
index 06c41798d847f46e11cdc50cba1586ae77809531..82a89882fb67b5666d8054a2c8314ab7b81a21d9 100644
--- a/zabbix_agentd.d/userparameter_route-table42.conf
+++ b/zabbix_agentd.d/userparameter_route-table42.conf
@@ -1,2 +1,2 @@
-UserParameter=route-table42-reachable,sudo /opt/bin/route-table42-reachable.sh
-UserParameter=route-table42-reachable6,sudo /opt/bin/route-table42-reachable6.sh
+UserParameter=route-table42-reachable,sudo /opt/bin/zabbix/route-table42-reachable.sh
+UserParameter=route-table42-reachable6,sudo /opt/bin/zabbix/route-table42-reachable6.sh