diff --git a/README.rst b/README.rst
index 472d0db..38d2413 100644
--- a/README.rst
+++ b/README.rst
@@ -148,6 +148,27 @@
               host: 'localhost'
               rights: 'all privileges'
 
+Database management
+---------------------
+
+User, Database management on independent mysql server
+
+.. code-block:: yaml
+
+    mysql:
+      server:
+        admin:
+          user: root
+          password: pass
+        database:
+          name:
+            encoding: 'utf8'
+            users:
+            - name: 'username'
+              password: 'password'
+              host: 'localhost'
+              rights: 'all privileges'
+
 Usage
 =====
 
diff --git a/mysql/common.sls b/mysql/common.sls
index 6a91967..5173cca 100644
--- a/mysql/common.sls
+++ b/mysql/common.sls
@@ -13,13 +13,6 @@
 
 {%- endif %}
 
-mysql_salt_config:
-  file.managed:
-    - name: /etc/salt/minion.d/mysql.conf
-    - template: jinja
-    - source: salt://mysql/files/salt-minion.conf
-    - mode: 600
-
 mysql_packages:
   pkg.installed:
   - names: {{ server.pkgs }}
diff --git a/mysql/server.sls b/mysql/server.sls
deleted file mode 100644
index 78da178..0000000
--- a/mysql/server.sls
+++ /dev/null
@@ -1,178 +0,0 @@
-{%- from "mysql/map.jinja" import server with context %}
-{%- if server.enabled %}
-
-include:
-- mysql.common
-
-{%- if server.ssl.enabled %}
-
-/etc/mysql/server-cert.pem:
-  file.managed:
-  {%- if server.ssl.cert is defined %}
-  - contents_pillar: mysql:server:ssl:cert
-  {%- else %}
-  - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.certificate }}.cert.pem
-  {%- endif %}
-  - require:
-    - pkg: mysql_packages
-
-/etc/mysql/server-key.pem:
-  file.managed:
-  {%- if server.ssl.cert is defined %}
-  - contents_pillar: mysql:server:ssl:key
-  {%- else %}
-  - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.certificate }}.key.pem
-  {%- endif %}
-  - require:
-    - pkg: mysql_packages
-
-{%- if server.replication.role in ['slave', 'both'] %}
-
-/etc/mysql/client-cert.pem:
-  file.managed:
-  {%- if server.ssl.client_cert is defined %}
-  - contents_pillar: mysql:server:ssl:client_cert
-  {%- else %}
-  - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.client_certificate }}.cert.pem
-  {%- endif %}
-  - require:
-    - pkg: mysql_packages
-
-/etc/mysql/client-key.pem:
-  file.managed:
-  {%- if server.ssl.client_key is defined %}
-  - contents_pillar: mysql:server:ssl:client_key
-  {%- else %}
-  - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.client_certificate }}.key.pem
-  {%- endif %}
-  - require:
-    - pkg: mysql_packages
-
-{%- endif %}
-
-/etc/mysql/cacert.pem:
-  file.managed:
-  {%- if server.ssl.cacert is defined %}
-  - contents_pillar: mysql:server:ssl:cacert
-  {%- else %}
-  - source: salt://pki/{{ server.ssl.authority }}/{{ server.ssl.authority }}-chain.cert.pem
-  {%- endif %}
-  - require:
-    - pkg: mysql_packages
-
-{%- endif %}
-
-
-{%- if server.replication.role in ['master', 'both'] %}
-
-{{ server.replication.user }}:
-  mysql_user.present:
-  - host: '%'
-  - password: {{ server.replication.password }}
-
-{{ server.replication.user }}_replication_grants:
-  mysql_grants.present:
-  - grant: replication slave
-  - database: '*.*'
-  - user: {{ server.replication.user }}
-  - host: '%'
-
-{%- endif %}
-
-{%- if server.replication.role in ['slave', 'both'] %}
-
-{%- if not salt['mysql.get_slave_status'] is defined %}
-
-{%- include "mysql/server/_connect_replication_slave.sls" %}
-
-{%- elif salt['mysql.get_slave_status']() == [] %}
-
-{%- include "mysql/server/_connect_replication_slave.sls" %}
-
-{%- else %}
-
-{%- if salt['mysql.get_slave_status']().get('Slave_SQL_Running', 'No') == 'Yes' and salt['mysql.get_slave_status']().get('Slave_IO_Running', 'No') == 'Yes' %}
-
-{%- else %}
-
-{%- include "mysql/server/_connect_replication_slave.sls" %}
-
-{%- endif %}
-
-{%- endif %}
-
-{%- endif %}
-
-
-{%- if not grains.get('noservices', False) %}
-{%- for database_name, database in server.get('database', {}).iteritems() %}
-
-mysql_database_{{ database_name }}:
-  mysql_database.present:
-  - name: {{ database_name }}
-  - require:
-    - service: mysql_service
-
-{%- for user in database.users %}
-
-mysql_user_{{ user.name }}_{{ database_name }}_{{ user.host }}:
-  mysql_user.present:
-  - host: '{{ user.host }}'
-  - name: '{{ user.name }}'
-  - password: {{ user.password }}
-  - require:
-    - service: mysql_service
-
-mysql_grants_{{ user.name }}_{{ database_name }}_{{ user.host }}:
-  mysql_grants.present:
-  - grant: {{ user.rights }}
-  - database: '{{ database_name }}.*'
-  - user: '{{ user.name }}'
-  - host: '{{ user.host }}'
-  - require:
-    - mysql_user: mysql_user_{{ user.name }}_{{ database_name }}_{{ user.host }}
-    - mysql_database: mysql_database_{{ database_name }}
-
-{%- endfor %}
-
-{%- if database.initial_data is defined %}
-
-/root/mysql/scripts/restore_{{ database_name }}.sh:
-  file.managed:
-  - source: salt://mysql/conf/restore.sh
-  - mode: 770
-  - template: jinja
-  - defaults:
-    database_name: {{ database_name }}
-  - require:
-    - file: mysql_dirs
-    - mysql_database: mysql_database_{{ database_name }}
-
-restore_mysql_database_{{ database_name }}:
-  cmd.run:
-  - name: /root/mysql/scripts/restore_{{ database_name }}.sh
-  - unless: "[ -f /root/mysql/flags/{{ database_name }}-installed ]"
-  - cwd: /root
-  - require:
-    - file: /root/mysql/scripts/restore_{{ database_name }}.sh
-
-{%- endif %}
-
-{%- endfor %}
-
-{%- for user in server.get('users', []) %}
-
-mysql_user_{{ user.name }}_{{ user.host }}:
-  mysql_user.present:
-  - host: '{{ user.host }}'
-  - name: '{{ user.name }}'
-  {%- if user.password is defined %}
-  - password: {{ user.password }}
-  {%- else %}
-  - allow_passwordless: True
-  {%- endif %}
-
-{%- endfor %}
-{%- endif %}
-
-{%- endif %}
diff --git a/mysql/server/database.sls b/mysql/server/database.sls
new file mode 100644
index 0000000..511d029
--- /dev/null
+++ b/mysql/server/database.sls
@@ -0,0 +1,68 @@
+{%- from "mysql/map.jinja" import server with context %}
+
+{%- if not grains.get('noservices', False) %}
+{%- for database_name, database in server.get('database', {}).iteritems() %}
+
+mysql_database_{{ database_name }}:
+  mysql_database.present:
+  - name: {{ database_name }}
+
+{%- for user in database.users %}
+
+mysql_user_{{ user.name }}_{{ database_name }}_{{ user.host }}:
+  mysql_user.present:
+  - host: '{{ user.host }}'
+  - name: '{{ user.name }}'
+  - password: {{ user.password }}
+
+mysql_grants_{{ user.name }}_{{ database_name }}_{{ user.host }}:
+  mysql_grants.present:
+  - grant: {{ user.rights }}
+  - database: '{{ database_name }}.*'
+  - user: '{{ user.name }}'
+  - host: '{{ user.host }}'
+  - require:
+    - mysql_user: mysql_user_{{ user.name }}_{{ database_name }}_{{ user.host }}
+    - mysql_database: mysql_database_{{ database_name }}
+
+{%- endfor %}
+
+{%- if database.initial_data is defined %}
+
+/root/mysql/scripts/restore_{{ database_name }}.sh:
+  file.managed:
+  - source: salt://mysql/conf/restore.sh
+  - mode: 770
+  - template: jinja
+  - defaults:
+    database_name: {{ database_name }}
+  - require:
+    - file: mysql_dirs
+    - mysql_database: mysql_database_{{ database_name }}
+
+restore_mysql_database_{{ database_name }}:
+  cmd.run:
+  - name: /root/mysql/scripts/restore_{{ database_name }}.sh
+  - unless: "[ -f /root/mysql/flags/{{ database_name }}-installed ]"
+  - cwd: /root
+  - require:
+    - file: /root/mysql/scripts/restore_{{ database_name }}.sh
+
+{%- endif %}
+
+{%- endfor %}
+
+{%- for user in server.get('users', []) %}
+
+mysql_user_{{ user.name }}_{{ user.host }}:
+  mysql_user.present:
+  - host: '{{ user.host }}'
+  - name: '{{ user.name }}'
+  {%- if user.password is defined %}
+  - password: {{ user.password }}
+  {%- else %}
+  - allow_passwordless: True
+  {%- endif %}
+
+{%- endfor %}
+{%- endif %}
\ No newline at end of file
diff --git a/mysql/server/init.sls b/mysql/server/init.sls
new file mode 100644
index 0000000..dd423b7
--- /dev/null
+++ b/mysql/server/init.sls
@@ -0,0 +1,4 @@
+{%- from "mysql/map.jinja" import server with context %}
+include:
+- mysql.server.service
+- mysql.server.database
diff --git a/mysql/server/service.sls b/mysql/server/service.sls
new file mode 100644
index 0000000..8d649cd
--- /dev/null
+++ b/mysql/server/service.sls
@@ -0,0 +1,114 @@
+{%- from "mysql/map.jinja" import server with context %}
+
+mysql_salt_config:
+  file.managed:
+    - name: /etc/salt/minion.d/mysql.conf
+    - template: jinja
+    - source: salt://mysql/files/salt-minion.conf
+    - mode: 600
+
+{%- if server.enabled %}
+
+include:
+- mysql.common
+
+{%- if server.ssl.enabled %}
+
+/etc/mysql/server-cert.pem:
+  file.managed:
+  {%- if server.ssl.cert is defined %}
+  - contents_pillar: mysql:server:ssl:cert
+  {%- else %}
+  - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.certificate }}.cert.pem
+  {%- endif %}
+  - require:
+    - pkg: mysql_packages
+
+/etc/mysql/server-key.pem:
+  file.managed:
+  {%- if server.ssl.cert is defined %}
+  - contents_pillar: mysql:server:ssl:key
+  {%- else %}
+  - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.certificate }}.key.pem
+  {%- endif %}
+  - require:
+    - pkg: mysql_packages
+
+{%- if server.replication.role in ['slave', 'both'] %}
+
+/etc/mysql/client-cert.pem:
+  file.managed:
+  {%- if server.ssl.client_cert is defined %}
+  - contents_pillar: mysql:server:ssl:client_cert
+  {%- else %}
+  - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.client_certificate }}.cert.pem
+  {%- endif %}
+  - require:
+    - pkg: mysql_packages
+
+/etc/mysql/client-key.pem:
+  file.managed:
+  {%- if server.ssl.client_key is defined %}
+  - contents_pillar: mysql:server:ssl:client_key
+  {%- else %}
+  - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.client_certificate }}.key.pem
+  {%- endif %}
+  - require:
+    - pkg: mysql_packages
+
+{%- endif %}
+
+/etc/mysql/cacert.pem:
+  file.managed:
+  {%- if server.ssl.cacert is defined %}
+  - contents_pillar: mysql:server:ssl:cacert
+  {%- else %}
+  - source: salt://pki/{{ server.ssl.authority }}/{{ server.ssl.authority }}-chain.cert.pem
+  {%- endif %}
+  - require:
+    - pkg: mysql_packages
+
+{%- endif %}
+
+
+{%- if server.replication.role in ['master', 'both'] %}
+
+{{ server.replication.user }}:
+  mysql_user.present:
+  - host: '%'
+  - password: {{ server.replication.password }}
+
+{{ server.replication.user }}_replication_grants:
+  mysql_grants.present:
+  - grant: replication slave
+  - database: '*.*'
+  - user: {{ server.replication.user }}
+  - host: '%'
+
+{%- endif %}
+
+{%- if server.replication.role in ['slave', 'both'] %}
+
+{%- if not salt['mysql.get_slave_status'] is defined %}
+
+{%- include "mysql/server/_connect_replication_slave.sls" %}
+
+{%- elif salt['mysql.get_slave_status']() == [] %}
+
+{%- include "mysql/server/_connect_replication_slave.sls" %}
+
+{%- else %}
+
+{%- if salt['mysql.get_slave_status']().get('Slave_SQL_Running', 'No') == 'Yes' and salt['mysql.get_slave_status']().get('Slave_IO_Running', 'No') == 'Yes' %}
+
+{%- else %}
+
+{%- include "mysql/server/_connect_replication_slave.sls" %}
+
+{%- endif %}
+
+{%- endif %}
+
+{%- endif %}
+
+{%- endif %}
\ No newline at end of file