diff --git a/tasks/main.yml b/tasks/main.yml
index ab53d8e..cb53367 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -30,16 +30,9 @@
 - name: TEMPLATE Create .my.cnf for root
   template: src=root/my.cnf dest=/root/.my.cnf owner=root group=root mode=0600 backup=yes
 
-- name: INCLUDE | Detect if server supports GTID
-  include: detect_gtid.yml
-
-- name: INCLUDE | Replication Master
-  include: replication_master.yml
-  when: mysql_replication_master
-
-- name: INCLUDE | Replication slave
-  include: replication_slave.yml
-  when: mysql_replication_slave
+- name: INCLUDE | Replication
+  include: replication/main.yml
+  when: mysql_replication_master or mysql_replication_slave
 
 - name: INCLUDE | Secure install
   include: 'secure.yml'
diff --git a/tasks/detect_gtid.yml b/tasks/replication/main.yml
similarity index 64%
rename from tasks/detect_gtid.yml
rename to tasks/replication/main.yml
index 29b6c12..1c63d6d 100644
--- a/tasks/detect_gtid.yml
+++ b/tasks/replication/main.yml
@@ -10,3 +10,11 @@
     ( mysql_vendor == 'mariadb' and vc.msg[0][1] | version_compare('10.0.2', 'ge') ) or
     ( vc.msg[0][1] | version_compare('5.6.5', 'ge') )
 
+- name: INCLUDE | Replication Master
+  include: master.yml
+  when: mysql_replication_master
+
+- name: INCLUDE | Replication slave
+  include: slave.yml
+  when: mysql_replication_slave
+
diff --git a/tasks/replication/master.yml b/tasks/replication/master.yml
new file mode 100644
index 0000000..85ac2a6
--- /dev/null
+++ b/tasks/replication/master.yml
@@ -0,0 +1,5 @@
+---
+
+- name: TEMPLATE | Deploy master configuration
+  template: src=../templates/etc/mysql/conf.d/50-master.cnf.j2 dest=/etc/mysql/conf.d/50-master.cnf
+  notify: restart mysql
diff --git a/tasks/replication_slave.yml b/tasks/replication/slave.yml
similarity index 91%
rename from tasks/replication_slave.yml
rename to tasks/replication/slave.yml
index 0a4c31e..8be6b51 100644
--- a/tasks/replication_slave.yml
+++ b/tasks/replication/slave.yml
@@ -5,7 +5,7 @@
   when: mysql_slave_readonly
 
 - name: TEMPLATE | Deploy slave configuration
-  template: src=etc/mysql/conf.d/51-slave.cnf.j2 dest=/etc/mysql/conf.d/51-slave.cnf
+  template: src=../templates/etc/mysql/conf.d/51-slave.cnf.j2 dest=/etc/mysql/conf.d/51-slave.cnf
   notify: restart mysql
 
 - name: MYSQL_REPLICATION | Get slave status
diff --git a/tasks/slave/debiancnf.yml b/tasks/replication/slave/debiancnf.yml
similarity index 100%
rename from tasks/slave/debiancnf.yml
rename to tasks/replication/slave/debiancnf.yml
diff --git a/tasks/slave/import_data.yml b/tasks/replication/slave/import_data.yml
similarity index 100%
rename from tasks/slave/import_data.yml
rename to tasks/replication/slave/import_data.yml
diff --git a/tasks/slave/mariadb_gtid.yml b/tasks/replication/slave/mariadb_gtid.yml
similarity index 100%
rename from tasks/slave/mariadb_gtid.yml
rename to tasks/replication/slave/mariadb_gtid.yml
diff --git a/tasks/slave/replication.yml b/tasks/replication/slave/replication.yml
similarity index 100%
rename from tasks/slave/replication.yml
rename to tasks/replication/slave/replication.yml
diff --git a/tasks/replication_master.yml b/tasks/replication_master.yml
deleted file mode 100644
index f9c1b95..0000000
--- a/tasks/replication_master.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- name: TEMPLATE | Deploy master configuration
-  template: src=etc/mysql/conf.d/50-master.cnf.j2 dest=/etc/mysql/conf.d/50-master.cnf
-  notify: restart mysql