diff --git a/roles/apache2/handlers/main.yml b/roles/old/apache2/handlers/main.yml
similarity index 100%
rename from roles/apache2/handlers/main.yml
rename to roles/old/apache2/handlers/main.yml
diff --git a/roles/apache2/tasks/main.yml b/roles/old/apache2/tasks/main.yml
similarity index 100%
rename from roles/apache2/tasks/main.yml
rename to roles/old/apache2/tasks/main.yml
diff --git a/roles/icinga/README.md b/roles/old/icinga/README.md
similarity index 100%
rename from roles/icinga/README.md
rename to roles/old/icinga/README.md
diff --git a/roles/icinga/files/cfg/contacts_icinga.cfg b/roles/old/icinga/files/cfg/contacts_icinga.cfg
similarity index 100%
rename from roles/icinga/files/cfg/contacts_icinga.cfg
rename to roles/old/icinga/files/cfg/contacts_icinga.cfg
diff --git a/roles/icinga/files/cfg/extinfo_icinga.cfg b/roles/old/icinga/files/cfg/extinfo_icinga.cfg
similarity index 100%
rename from roles/icinga/files/cfg/extinfo_icinga.cfg
rename to roles/old/icinga/files/cfg/extinfo_icinga.cfg
diff --git a/roles/icinga/files/cfg/generic-host_icinga.cfg b/roles/old/icinga/files/cfg/generic-host_icinga.cfg
similarity index 100%
rename from roles/icinga/files/cfg/generic-host_icinga.cfg
rename to roles/old/icinga/files/cfg/generic-host_icinga.cfg
diff --git a/roles/icinga/files/cfg/generic-service_icinga.cfg b/roles/old/icinga/files/cfg/generic-service_icinga.cfg
similarity index 100%
rename from roles/icinga/files/cfg/generic-service_icinga.cfg
rename to roles/old/icinga/files/cfg/generic-service_icinga.cfg
diff --git a/roles/icinga/files/cfg/gwsio2.cfg b/roles/old/icinga/files/cfg/gwsio2.cfg
similarity index 100%
rename from roles/icinga/files/cfg/gwsio2.cfg
rename to roles/old/icinga/files/cfg/gwsio2.cfg
diff --git a/roles/icinga/files/cfg/hostgroups_icinga.cfg b/roles/old/icinga/files/cfg/hostgroups_icinga.cfg
similarity index 100%
rename from roles/icinga/files/cfg/hostgroups_icinga.cfg
rename to roles/old/icinga/files/cfg/hostgroups_icinga.cfg
diff --git a/roles/icinga/files/cfg/localhost_icinga.cfg b/roles/old/icinga/files/cfg/localhost_icinga.cfg
similarity index 100%
rename from roles/icinga/files/cfg/localhost_icinga.cfg
rename to roles/old/icinga/files/cfg/localhost_icinga.cfg
diff --git a/roles/icinga/files/cfg/netgear.cfg b/roles/old/icinga/files/cfg/netgear.cfg
similarity index 100%
rename from roles/icinga/files/cfg/netgear.cfg
rename to roles/old/icinga/files/cfg/netgear.cfg
diff --git a/roles/icinga/files/cfg/r-ext.cfg b/roles/old/icinga/files/cfg/r-ext.cfg
similarity index 100%
rename from roles/icinga/files/cfg/r-ext.cfg
rename to roles/old/icinga/files/cfg/r-ext.cfg
diff --git a/roles/icinga/files/cfg/r-int.cfg b/roles/old/icinga/files/cfg/r-int.cfg
similarity index 100%
rename from roles/icinga/files/cfg/r-int.cfg
rename to roles/old/icinga/files/cfg/r-int.cfg
diff --git a/roles/icinga/files/cfg/s-adm.cfg b/roles/old/icinga/files/cfg/s-adm.cfg
similarity index 100%
rename from roles/icinga/files/cfg/s-adm.cfg
rename to roles/old/icinga/files/cfg/s-adm.cfg
diff --git a/roles/icinga/files/cfg/s-infra.cfg b/roles/old/icinga/files/cfg/s-infra.cfg
similarity index 100%
rename from roles/icinga/files/cfg/s-infra.cfg
rename to roles/old/icinga/files/cfg/s-infra.cfg
diff --git a/roles/icinga/files/cfg/s-itil.cfg b/roles/old/icinga/files/cfg/s-itil.cfg
similarity index 100%
rename from roles/icinga/files/cfg/s-itil.cfg
rename to roles/old/icinga/files/cfg/s-itil.cfg
diff --git a/roles/icinga/files/cfg/s-lb.cfg b/roles/old/icinga/files/cfg/s-lb.cfg
similarity index 100%
rename from roles/icinga/files/cfg/s-lb.cfg
rename to roles/old/icinga/files/cfg/s-lb.cfg
diff --git a/roles/icinga/files/cfg/s-mess.cfg b/roles/old/icinga/files/cfg/s-mess.cfg
similarity index 100%
rename from roles/icinga/files/cfg/s-mess.cfg
rename to roles/old/icinga/files/cfg/s-mess.cfg
diff --git a/roles/icinga/files/cfg/s-proxy.cfg b/roles/old/icinga/files/cfg/s-proxy.cfg
similarity index 100%
rename from roles/icinga/files/cfg/s-proxy.cfg
rename to roles/old/icinga/files/cfg/s-proxy.cfg
diff --git a/roles/icinga/files/cfg/services_icinga.cfg b/roles/old/icinga/files/cfg/services_icinga.cfg
similarity index 100%
rename from roles/icinga/files/cfg/services_icinga.cfg
rename to roles/old/icinga/files/cfg/services_icinga.cfg
diff --git a/roles/icinga/files/cfg/srv-2012.cfg b/roles/old/icinga/files/cfg/srv-2012.cfg
similarity index 100%
rename from roles/icinga/files/cfg/srv-2012.cfg
rename to roles/old/icinga/files/cfg/srv-2012.cfg
diff --git a/roles/icinga/files/cfg/timeperiods_icinga.cfg b/roles/old/icinga/files/cfg/timeperiods_icinga.cfg
similarity index 100%
rename from roles/icinga/files/cfg/timeperiods_icinga.cfg
rename to roles/old/icinga/files/cfg/timeperiods_icinga.cfg
diff --git a/roles/icinga/files/check_iftraffic3.pl b/roles/old/icinga/files/check_iftraffic3.pl
similarity index 100%
rename from roles/icinga/files/check_iftraffic3.pl
rename to roles/old/icinga/files/check_iftraffic3.pl
diff --git a/roles/icinga/files/commands.cfg b/roles/old/icinga/files/commands.cfg
similarity index 100%
rename from roles/icinga/files/commands.cfg
rename to roles/old/icinga/files/commands.cfg
diff --git a/roles/icinga/files/contacts_icinga.cfg b/roles/old/icinga/files/contacts_icinga.cfg
similarity index 100%
rename from roles/icinga/files/contacts_icinga.cfg
rename to roles/old/icinga/files/contacts_icinga.cfg
diff --git a/roles/icinga/files/dns.cfg b/roles/old/icinga/files/dns.cfg
similarity index 100%
rename from roles/icinga/files/dns.cfg
rename to roles/old/icinga/files/dns.cfg
diff --git a/roles/icinga/files/icinga.cfg b/roles/old/icinga/files/icinga.cfg
similarity index 100%
rename from roles/icinga/files/icinga.cfg
rename to roles/old/icinga/files/icinga.cfg
diff --git a/roles/icinga/files/icinga.conf b/roles/old/icinga/files/icinga.conf
similarity index 100%
rename from roles/icinga/files/icinga.conf
rename to roles/old/icinga/files/icinga.conf
diff --git a/roles/icinga/files/nt.cfg b/roles/old/icinga/files/nt.cfg
similarity index 100%
rename from roles/icinga/files/nt.cfg
rename to roles/old/icinga/files/nt.cfg
diff --git a/roles/icinga/files/services_icinga.cfg b/roles/old/icinga/files/services_icinga.cfg
similarity index 100%
rename from roles/icinga/files/services_icinga.cfg
rename to roles/old/icinga/files/services_icinga.cfg
diff --git a/roles/icinga/handlers/main.yml b/roles/old/icinga/handlers/main.yml
similarity index 100%
rename from roles/icinga/handlers/main.yml
rename to roles/old/icinga/handlers/main.yml
diff --git a/roles/icinga/tasks/main.yml b/roles/old/icinga/tasks/main.yml
similarity index 100%
rename from roles/icinga/tasks/main.yml
rename to roles/old/icinga/tasks/main.yml
diff --git a/roles/mariadb-ab/README.md b/roles/old/mariadb-ab/README.md
similarity index 100%
rename from roles/mariadb-ab/README.md
rename to roles/old/mariadb-ab/README.md
diff --git a/roles/mariadb-ab/_travis.yml b/roles/old/mariadb-ab/_travis.yml
similarity index 100%
rename from roles/mariadb-ab/_travis.yml
rename to roles/old/mariadb-ab/_travis.yml
diff --git a/roles/mariadb-ab/defaults/main.yml b/roles/old/mariadb-ab/defaults/main.yml
similarity index 100%
rename from roles/mariadb-ab/defaults/main.yml
rename to roles/old/mariadb-ab/defaults/main.yml
diff --git a/roles/mariadb-ab/files/my.cnf b/roles/old/mariadb-ab/files/my.cnf
similarity index 100%
rename from roles/mariadb-ab/files/my.cnf
rename to roles/old/mariadb-ab/files/my.cnf
diff --git a/roles/mariadb-ab/handlers/main.yml b/roles/old/mariadb-ab/handlers/main.yml
similarity index 100%
rename from roles/mariadb-ab/handlers/main.yml
rename to roles/old/mariadb-ab/handlers/main.yml
diff --git a/roles/mariadb-ab/meta/main.yml b/roles/old/mariadb-ab/meta/main.yml
similarity index 100%
rename from roles/mariadb-ab/meta/main.yml
rename to roles/old/mariadb-ab/meta/main.yml
diff --git a/roles/mariadb-ab/tasks/main.yml b/roles/old/mariadb-ab/tasks/main.yml
similarity index 100%
rename from roles/mariadb-ab/tasks/main.yml
rename to roles/old/mariadb-ab/tasks/main.yml
diff --git a/roles/mariadb-ab/tests/inventory b/roles/old/mariadb-ab/tests/inventory
similarity index 100%
rename from roles/mariadb-ab/tests/inventory
rename to roles/old/mariadb-ab/tests/inventory
diff --git a/roles/mariadb-ab/tests/test.yml b/roles/old/mariadb-ab/tests/test.yml
similarity index 100%
rename from roles/mariadb-ab/tests/test.yml
rename to roles/old/mariadb-ab/tests/test.yml
diff --git a/roles/mariadb-ab/vars/main.yml b/roles/old/mariadb-ab/vars/main.yml
similarity index 100%
rename from roles/mariadb-ab/vars/main.yml
rename to roles/old/mariadb-ab/vars/main.yml
diff --git a/roles/mariadb/README.md b/roles/old/mariadb/README.md
similarity index 100%
rename from roles/mariadb/README.md
rename to roles/old/mariadb/README.md
diff --git a/roles/mariadb/_travis.yml b/roles/old/mariadb/_travis.yml
similarity index 100%
rename from roles/mariadb/_travis.yml
rename to roles/old/mariadb/_travis.yml
diff --git a/roles/mariadb/defaults/main.yml b/roles/old/mariadb/defaults/main.yml
similarity index 100%
rename from roles/mariadb/defaults/main.yml
rename to roles/old/mariadb/defaults/main.yml
diff --git a/roles/mariadb/handlers/main.yml b/roles/old/mariadb/handlers/main.yml
similarity index 100%
rename from roles/mariadb/handlers/main.yml
rename to roles/old/mariadb/handlers/main.yml
diff --git a/roles/mariadb/meta/main.yml b/roles/old/mariadb/meta/main.yml
similarity index 100%
rename from roles/mariadb/meta/main.yml
rename to roles/old/mariadb/meta/main.yml
diff --git a/roles/mariadb/tasks/main.yml b/roles/old/mariadb/tasks/main.yml
similarity index 100%
rename from roles/mariadb/tasks/main.yml
rename to roles/old/mariadb/tasks/main.yml
diff --git a/roles/mariadb/tests/inventory b/roles/old/mariadb/tests/inventory
similarity index 100%
rename from roles/mariadb/tests/inventory
rename to roles/old/mariadb/tests/inventory
diff --git a/roles/mariadb/tests/test.yml b/roles/old/mariadb/tests/test.yml
similarity index 100%
rename from roles/mariadb/tests/test.yml
rename to roles/old/mariadb/tests/test.yml
diff --git a/roles/mariadb/vars/main.yml b/roles/old/mariadb/vars/main.yml
similarity index 100%
rename from roles/mariadb/vars/main.yml
rename to roles/old/mariadb/vars/main.yml
diff --git a/roles/mysql/defaults/main.yml b/roles/old/mysql/defaults/main.yml
similarity index 100%
rename from roles/mysql/defaults/main.yml
rename to roles/old/mysql/defaults/main.yml
diff --git a/roles/mysql/files/.my.cnf b/roles/old/mysql/files/.my.cnf
similarity index 100%
rename from roles/mysql/files/.my.cnf
rename to roles/old/mysql/files/.my.cnf
diff --git a/roles/mysql/handlers/main.yml b/roles/old/mysql/handlers/main.yml
similarity index 100%
rename from roles/mysql/handlers/main.yml
rename to roles/old/mysql/handlers/main.yml
diff --git a/roles/mysql/tasks/main.yml b/roles/old/mysql/tasks/main.yml
similarity index 100%
rename from roles/mysql/tasks/main.yml
rename to roles/old/mysql/tasks/main.yml
diff --git a/roles/php-fpm/handlers/main.yml b/roles/old/php-fpm/handlers/main.yml
similarity index 100%
rename from roles/php-fpm/handlers/main.yml
rename to roles/old/php-fpm/handlers/main.yml
diff --git a/roles/php-fpm/tasks/main.yml b/roles/old/php-fpm/tasks/main.yml
similarity index 100%
rename from roles/php-fpm/tasks/main.yml
rename to roles/old/php-fpm/tasks/main.yml
diff --git a/roles/php-fpm/templates/main.yml b/roles/old/php-fpm/templates/main.yml
similarity index 100%
rename from roles/php-fpm/templates/main.yml
rename to roles/old/php-fpm/templates/main.yml