diff --git a/config/minion b/config/minion
old mode 100755
new mode 100644
diff --git a/states/zabbix_server/config.sls b/states/zabbix/config.sls
similarity index 100%
rename from states/zabbix_server/config.sls
rename to states/zabbix/config.sls
diff --git a/states/zabbix_server/defaults.yaml b/states/zabbix/defaults.yaml
similarity index 90%
rename from states/zabbix_server/defaults.yaml
rename to states/zabbix/defaults.yaml
index 8266b1e..3fd2f08 100644
--- a/states/zabbix_server/defaults.yaml
+++ b/states/zabbix/defaults.yaml
@@ -1,5 +1,5 @@
 ---
-zabbix_Ăserver:
+zabbix_server:
   pkgs:
     - zabbix-frontend-php
     - zabbix-server-pgsql
diff --git a/states/zabbix_server/init.sls b/states/zabbix/init.sls
similarity index 83%
rename from states/zabbix_server/init.sls
rename to states/zabbix/init.sls
index 8f80995..5bf7f86 100644
--- a/states/zabbix_server/init.sls
+++ b/states/zabbix/init.sls
@@ -3,5 +3,6 @@ include:
   - postgresql
   - php
   - .install
+  - .provision
   - .config
   - .service
diff --git a/states/zabbix_server/install.sls b/states/zabbix/install.sls
similarity index 99%
rename from states/zabbix_server/install.sls
rename to states/zabbix/install.sls
index 4286266..0a44040 100644
--- a/states/zabbix_server/install.sls
+++ b/states/zabbix/install.sls
@@ -1,6 +1,5 @@
 ---
 {%- from "zabbix_server/map.jinja" import zabbix_server with context %}
-
 zabbix_server_pkgs:
   pkg.latest:
     - pkgs: {{ zabbix_server.pkgs }}
diff --git a/states/zabbix_server/map.jinja b/states/zabbix/map.jinja
similarity index 100%
rename from states/zabbix_server/map.jinja
rename to states/zabbix/map.jinja
diff --git a/states/zabbix/provision.sls b/states/zabbix/provision.sls
new file mode 100644
index 0000000..e69de29
diff --git a/states/zabbix_server/service.sls b/states/zabbix/service.sls
similarity index 100%
rename from states/zabbix_server/service.sls
rename to states/zabbix/service.sls
diff --git a/states/zabbix_server/templates/zabbix_server.conf.j2 b/states/zabbix/templates/zabbix_server.conf.j2
similarity index 100%
rename from states/zabbix_server/templates/zabbix_server.conf.j2
rename to states/zabbix/templates/zabbix_server.conf.j2