diff --git a/tasks/install_default_mariadb.yml b/tasks/install/default_mariadb.yml
similarity index 100%
rename from tasks/install_default_mariadb.yml
rename to tasks/install/default_mariadb.yml
diff --git a/tasks/install_default_mysql.yml b/tasks/install/default_mysql.yml
similarity index 100%
rename from tasks/install_default_mysql.yml
rename to tasks/install/default_mysql.yml
diff --git a/tasks/install.yml b/tasks/install/main.yml
similarity index 91%
rename from tasks/install.yml
rename to tasks/install/main.yml
index 3343f6a..d65df9a 100644
--- a/tasks/install.yml
+++ b/tasks/install/main.yml
@@ -24,19 +24,19 @@
   apt_repository: repo='deb-src {{ percona_repository }} {{ ansible_distribution_release }} main' state=present
 
 - name: INCLUDE | Install MySQL from default repo
-  include: 'install_default_mysql.yml'
+  include: 'default_mysql.yml'
   when: mysql_origin == 'default' and mysql_vendor == 'mysql'
 
 - name: INCLUDE | Install MariaDB from Debian repo
-  include: 'install_default_mariadb.yml'
+  include: 'default_mariadb.yml'
   when: mysql_origin == 'default' and mysql_vendor == 'mariadb' and ansible_distribution_major_version > 7
 
 - name: INCLUDE | Install MariaDB from MariaDB repo
-  include: 'install_upstream_mariadb.yml'
+  include: 'upstream_mariadb.yml'
   when: mysql_origin == 'upstream' and mysql_vendor == 'mariadb'
 
 - name: INCLUDE | Install Percona Server from Percona repo
-  include: 'install_upstream_percona.yml'
+  include: 'upstream_percona.yml'
   when: mysql_origin ==  'upstream' and mysql_vendor == 'percona'
 
 - name: APT | Install few MySQL related tools
diff --git a/tasks/install_upstream_mariadb.yml b/tasks/install/upstream_mariadb.yml
similarity index 92%
rename from tasks/install_upstream_mariadb.yml
rename to tasks/install/upstream_mariadb.yml
index 2c772f3..77e08d8 100644
--- a/tasks/install_upstream_mariadb.yml
+++ b/tasks/install/upstream_mariadb.yml
@@ -10,5 +10,5 @@
   apt_repository: repo='deb-src {{ mariadb_repository }} {{ ansible_distribution_release }} main' state=present
 
 - name: INCLUDE | Normal Install
-  include: install_default_mariadb.yml
+  include: default_mariadb.yml
 
diff --git a/tasks/install_upstream_percona.yml b/tasks/install/upstream_percona.yml
similarity index 100%
rename from tasks/install_upstream_percona.yml
rename to tasks/install/upstream_percona.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index dd7a356..ab53d8e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,7 +9,7 @@
   changed_when: false
 
 - name: INCLUDE | Install
-  include: install.yml
+  include: install/main.yml
 
 - name: SERVICE | Ensure daemon is started
   service: name=mysql state=started
@@ -17,6 +17,7 @@
 - name: TEMPLATE | Deploy configuration
   template: src=etc/mysql/my.cnf.j2 dest=/etc/mysql/my.cnf
   register: config
+  notify: restart mysql
 
 - name: SERVICE | Restart now (prevent bugs) 
   service: name=mysql state=restarted