diff --git a/roles/icinga-fk/files/cfg/contacts_icinga.cfg b/roles/icinga/files/cfg/contacts_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/contacts_icinga.cfg
rename to roles/icinga/files/cfg/contacts_icinga.cfg
diff --git a/roles/icinga-fk/files/cfg/extinfo_icinga.cfg b/roles/icinga/files/cfg/extinfo_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/extinfo_icinga.cfg
rename to roles/icinga/files/cfg/extinfo_icinga.cfg
diff --git a/roles/icinga-fk/files/cfg/generic-host_icinga.cfg b/roles/icinga/files/cfg/generic-host_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/generic-host_icinga.cfg
rename to roles/icinga/files/cfg/generic-host_icinga.cfg
diff --git a/roles/icinga-fk/files/cfg/generic-service_icinga.cfg b/roles/icinga/files/cfg/generic-service_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/generic-service_icinga.cfg
rename to roles/icinga/files/cfg/generic-service_icinga.cfg
diff --git a/roles/icinga-fk/files/cfg/gwsio2.cfg b/roles/icinga/files/cfg/gwsio2.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/gwsio2.cfg
rename to roles/icinga/files/cfg/gwsio2.cfg
diff --git a/roles/icinga-fk/files/cfg/hostgroups_icinga.cfg b/roles/icinga/files/cfg/hostgroups_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/hostgroups_icinga.cfg
rename to roles/icinga/files/cfg/hostgroups_icinga.cfg
diff --git a/roles/icinga-fk/files/cfg/localhost_icinga.cfg b/roles/icinga/files/cfg/localhost_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/localhost_icinga.cfg
rename to roles/icinga/files/cfg/localhost_icinga.cfg
diff --git a/roles/icinga-fk/files/cfg/netgear.cfg b/roles/icinga/files/cfg/netgear.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/netgear.cfg
rename to roles/icinga/files/cfg/netgear.cfg
diff --git a/roles/icinga-fk/files/cfg/r-ext.cfg b/roles/icinga/files/cfg/r-ext.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/r-ext.cfg
rename to roles/icinga/files/cfg/r-ext.cfg
diff --git a/roles/icinga-fk/files/cfg/r-int.cfg b/roles/icinga/files/cfg/r-int.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/r-int.cfg
rename to roles/icinga/files/cfg/r-int.cfg
diff --git a/roles/icinga-fk/files/cfg/s-adm.cfg b/roles/icinga/files/cfg/s-adm.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/s-adm.cfg
rename to roles/icinga/files/cfg/s-adm.cfg
diff --git a/roles/icinga-fk/files/cfg/s-infra.cfg b/roles/icinga/files/cfg/s-infra.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/s-infra.cfg
rename to roles/icinga/files/cfg/s-infra.cfg
diff --git a/roles/icinga-fk/files/cfg/s-proxy.cfg b/roles/icinga/files/cfg/s-proxy.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/s-proxy.cfg
rename to roles/icinga/files/cfg/s-proxy.cfg
diff --git a/roles/icinga-fk/files/cfg/s-test.cfg b/roles/icinga/files/cfg/s-test.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/s-test.cfg
rename to roles/icinga/files/cfg/s-test.cfg
diff --git a/roles/icinga-fk/files/cfg/services_icinga.cfg b/roles/icinga/files/cfg/services_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/services_icinga.cfg
rename to roles/icinga/files/cfg/services_icinga.cfg
diff --git a/roles/icinga-fk/files/cfg/srv-2012.cfg b/roles/icinga/files/cfg/srv-2012.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/srv-2012.cfg
rename to roles/icinga/files/cfg/srv-2012.cfg
diff --git a/roles/icinga-fk/files/cfg/timeperiods_icinga.cfg b/roles/icinga/files/cfg/timeperiods_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/cfg/timeperiods_icinga.cfg
rename to roles/icinga/files/cfg/timeperiods_icinga.cfg
diff --git a/roles/icinga-fk/files/check_iftraffic3.pl b/roles/icinga/files/check_iftraffic3.pl
similarity index 100%
rename from roles/icinga-fk/files/check_iftraffic3.pl
rename to roles/icinga/files/check_iftraffic3.pl
diff --git a/roles/icinga-fk/files/commands.cfg b/roles/icinga/files/commands.cfg
similarity index 100%
rename from roles/icinga-fk/files/commands.cfg
rename to roles/icinga/files/commands.cfg
diff --git a/roles/icinga-fk/files/contacts_icinga.cfg b/roles/icinga/files/contacts_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/contacts_icinga.cfg
rename to roles/icinga/files/contacts_icinga.cfg
diff --git a/roles/icinga-fk/files/dns.cfg b/roles/icinga/files/dns.cfg
similarity index 100%
rename from roles/icinga-fk/files/dns.cfg
rename to roles/icinga/files/dns.cfg
diff --git a/roles/icinga-fk/files/icinga.cfg b/roles/icinga/files/icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/icinga.cfg
rename to roles/icinga/files/icinga.cfg
diff --git a/roles/icinga-fk/files/icinga.conf b/roles/icinga/files/icinga.conf
similarity index 100%
rename from roles/icinga-fk/files/icinga.conf
rename to roles/icinga/files/icinga.conf
diff --git a/roles/icinga-fk/files/nt.cfg b/roles/icinga/files/nt.cfg
similarity index 100%
rename from roles/icinga-fk/files/nt.cfg
rename to roles/icinga/files/nt.cfg
diff --git a/roles/icinga-fk/files/services_icinga.cfg b/roles/icinga/files/services_icinga.cfg
similarity index 100%
rename from roles/icinga-fk/files/services_icinga.cfg
rename to roles/icinga/files/services_icinga.cfg
diff --git a/roles/icinga-fk/handlers/main.yml b/roles/icinga/handlers/main.yml
similarity index 100%
rename from roles/icinga-fk/handlers/main.yml
rename to roles/icinga/handlers/main.yml
diff --git a/roles/icinga-fk/tasks/main.yml b/roles/icinga/tasks/main.yml
similarity index 100%
rename from roles/icinga-fk/tasks/main.yml
rename to roles/icinga/tasks/main.yml