diff --git a/plugins/datasource/zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
similarity index 100%
rename from plugins/datasource/zabbix/datasource.js
rename to plugins/datasource-zabbix/datasource.js
diff --git a/plugins/datasource/zabbix/directives.js b/plugins/datasource-zabbix/directives.js
similarity index 100%
rename from plugins/datasource/zabbix/directives.js
rename to plugins/datasource-zabbix/directives.js
diff --git a/plugins/datasource/zabbix/helperFunctions.js b/plugins/datasource-zabbix/helperFunctions.js
similarity index 100%
rename from plugins/datasource/zabbix/helperFunctions.js
rename to plugins/datasource-zabbix/helperFunctions.js
diff --git a/plugins/datasource/zabbix/partials/annotations.editor.html b/plugins/datasource-zabbix/partials/annotations.editor.html
similarity index 100%
rename from plugins/datasource/zabbix/partials/annotations.editor.html
rename to plugins/datasource-zabbix/partials/annotations.editor.html
diff --git a/plugins/datasource/zabbix/partials/config.html b/plugins/datasource-zabbix/partials/config.html
similarity index 100%
rename from plugins/datasource/zabbix/partials/config.html
rename to plugins/datasource-zabbix/partials/config.html
diff --git a/plugins/datasource/zabbix/partials/query.editor.html b/plugins/datasource-zabbix/partials/query.editor.html
similarity index 100%
rename from plugins/datasource/zabbix/partials/query.editor.html
rename to plugins/datasource-zabbix/partials/query.editor.html
diff --git a/plugins/datasource/zabbix/partials/query.options.html b/plugins/datasource-zabbix/partials/query.options.html
similarity index 100%
rename from plugins/datasource/zabbix/partials/query.options.html
rename to plugins/datasource-zabbix/partials/query.options.html
diff --git a/plugins/datasource/zabbix/plugin.json b/plugins/datasource-zabbix/plugin.json
similarity index 100%
rename from plugins/datasource/zabbix/plugin.json
rename to plugins/datasource-zabbix/plugin.json
diff --git a/plugins/datasource/zabbix/queryCtrl.js b/plugins/datasource-zabbix/queryCtrl.js
similarity index 100%
rename from plugins/datasource/zabbix/queryCtrl.js
rename to plugins/datasource-zabbix/queryCtrl.js
diff --git a/plugins/datasource/zabbix/zabbixAPIWrapper.js b/plugins/datasource-zabbix/zabbixAPIWrapper.js
similarity index 100%
rename from plugins/datasource/zabbix/zabbixAPIWrapper.js
rename to plugins/datasource-zabbix/zabbixAPIWrapper.js
diff --git a/plugins/panels/triggers/editor.html b/plugins/panel-triggers/editor.html
similarity index 100%
rename from plugins/panels/triggers/editor.html
rename to plugins/panel-triggers/editor.html
diff --git a/plugins/panels/triggers/module.html b/plugins/panel-triggers/module.html
similarity index 100%
rename from plugins/panels/triggers/module.html
rename to plugins/panel-triggers/module.html
diff --git a/plugins/panels/triggers/module.js b/plugins/panel-triggers/module.js
similarity index 100%
rename from plugins/panels/triggers/module.js
rename to plugins/panel-triggers/module.js
diff --git a/plugins/panels/triggers/plugin.json b/plugins/panel-triggers/plugin.json
similarity index 100%
rename from plugins/panels/triggers/plugin.json
rename to plugins/panel-triggers/plugin.json
diff --git a/plugins/panels/triggers/trigger.colorpicker.html b/plugins/panel-triggers/trigger.colorpicker.html
similarity index 100%
rename from plugins/panels/triggers/trigger.colorpicker.html
rename to plugins/panel-triggers/trigger.colorpicker.html