diff --git a/manifests/icinga2/agent.pp b/manifests/icinga2/agent.pp
index e3d2305..fba1020 100644
--- a/manifests/icinga2/agent.pp
+++ b/manifests/icinga2/agent.pp
@@ -1,49 +1,49 @@
 # Icinga2 agent configuration
 class profile::icinga2::agent {
   $features = hiera('icinga2::features')
   $icinga2_network = hiera('icinga2::network')
   $parent_zone = hiera('icinga2::parent_zone')
   $parent_endpoints = hiera('icinga2::parent_endpoints')
 
   include profile::icinga2::apt_config
 
   class {'::icinga2':
     confd    => false,
     features => $features,
   }
 
   class { '::icinga2::feature::api':
     accept_config   => true,
     accept_commands => true,
     zones           => {
       'ZoneName' => {
         endpoints => ['NodeName'],
         parent    => $parent_zone,
       },
     },
   }
 
   create_resources('::icinga2::object::endpoint', $parent_endpoints)
   ::icinga2::object::zone {$parent_zone:
     endpoints => keys($parent_endpoints),
   }
 
   @@::icinga2::object::endpoint {$::fqdn:
-    target => "/etc/icinga2/conf.d/${::fqdn}.conf",
+    target => "/etc/icinga2/zones.d/${parent_zone}/${::fqdn}.conf",
   }
 
   @@::icinga2::object::zone {$::fqdn:
     endpoints => [$::fqdn],
     parent    => $parent_zone,
-    target    => "/etc/icinga2/conf.d/${::fqdn}.conf",
+    target    => "/etc/icinga2/zones.d/${parent_zone}/${::fqdn}.conf",
   }
 
   @@::icinga2::object::host {$::fqdn:
     address => ip_for_network($icinga2_network),
-    target  => "/etc/icinga2/conf.d/${::fqdn}.conf",
+    target  => "/etc/icinga2/zones.d/${parent_zone}/${::fqdn}.conf",
   }
 
   icinga2::object::zone { 'global-templates':
     global => true,
   }
 }
diff --git a/manifests/icinga2/master.pp b/manifests/icinga2/master.pp
index 6b53b4e..d1e3264 100644
--- a/manifests/icinga2/master.pp
+++ b/manifests/icinga2/master.pp
@@ -1,62 +1,76 @@
 # An icinga master host
 class profile::icinga2::master {
   $zonename = hiera('icinga2::master::zonename')
   $features = hiera('icinga2::features')
   $icinga2_network = hiera('icinga2::network')
 
   $icinga2_db_username = hiera('icinga2::master::db::username')
   $icinga2_db_password = hiera('icinga2::master::db::password')
   $icinga2_db_database = hiera('icinga2::master::db::database')
 
   include profile::icinga2::apt_config
   include profile::icinga2::objects
 
   include ::postgresql::server
 
   ::postgresql::server::db {$icinga2_db_database:
     user     => $icinga2_db_username,
     password => postgresql_password($icinga2_db_username, $icinga2_db_password)
   }
 
   class {'::icinga2':
     confd     => false,
     features  => $features,
     constants => {
       'ZoneName' => $zonename,
     },
+    zones     => {},
   }
 
   class { '::icinga2::feature::api':
     accept_commands => true,
   }
 
   class { '::icinga2::feature::idopgsql':
     user          => $icinga2_db_username,
     password      => $icinga2_db_password,
     database      => $icinga2_db_database,
     import_schema => true,
     require       => Postgresql::Server::Db[$icinga2_db_database],
   }
 
   @@::icinga2::object::endpoint {$::fqdn:
-    target => "/etc/icinga2/conf.d/${::fqdn}.conf",
+    target => "/etc/icinga2/zones.d/${zonename}/${::fqdn}.conf",
   }
 
   @@::icinga2::object::zone {$zonename:
     endpoints => [$::fqdn],
-    target    => "/etc/icinga2/conf.d/${::fqdn}.conf",
+    target    => "/etc/icinga2/zones.d/${zonename}/${::fqdn}.conf",
   }
 
   @@::icinga2::object::host {$::fqdn:
     address => ip_for_network($icinga2_network),
-    target  => "/etc/icinga2/conf.d/${::fqdn}.conf",
+    target  => "/etc/icinga2/zones.d/${zonename}/${::fqdn}.conf",
   }
 
   ::Icinga2::Object::Host <<| |>>
   ::Icinga2::Object::Endpoint <<| |>>
   ::Icinga2::Object::Zone <<| |>>
 
   ::icinga2::object::zone { 'global-templates':
     global => true,
   }
+
+  file {[
+    '/etc/icinga2/zones.d/global-templates',
+    "/etc/icinga2/zones.d/${zonename}",
+  ]:
+    ensure => directory,
+    owner  => 'nagios',
+    group  => 'nagios',
+    mode   => '0750',
+    tag    => 'icinga2::config::file',
+  }
+
+
 }
diff --git a/manifests/icinga2/objects.pp b/manifests/icinga2/objects.pp
index 1cafaf0..6d89e55 100644
--- a/manifests/icinga2/objects.pp
+++ b/manifests/icinga2/objects.pp
@@ -1,40 +1,32 @@
 # Icinga2 object definitions
 class profile::icinga2::objects {
-  file {'/etc/icinga2/zones.d/global-templates':
-    ensure => directory,
-    owner  => 'nagios',
-    group  => 'nagios',
-    mode   => '0750',
-    tag    => 'icinga2::config::file',
-  }
-
   ::icinga2::object::service { 'ping4':
     import        => ['generic-service'],
     apply         => true,
     check_command => 'ping',
     assign        => ['host.address'],
     target        => '/etc/icinga2/zones.d/global-templates/services.conf',
   }
 
   ::icinga2::object::service { 'linux_load':
     import           => ['generic-service'],
     service_name     => 'load',
     apply            => true,
     check_command    => 'load',
     command_endpoint => 'host.name',
     assign           => ['host.vars.os == Linux'],
     ignore           => ['host.vars.noagent'],
     target           => '/etc/icinga2/zones.d/global-templates/services.conf',
   }
 
   ::icinga2::object::service { 'linux_disks':
     import           => ['generic-service'],
     apply            => 'disk_name => config in host.vars.disks',
     check_command    => 'disk',
     command_endpoint => 'host.name',
     vars             => 'vars + config',
     assign           => ['host.vars.os == Linux'],
     ignore           => ['host.vars.noagent'],
     target           => '/etc/icinga2/zones.d/global-templates/services.conf',
   }
 }