diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp
index 74999e9..775a3b4 100644
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -6,9 +6,162 @@
 class confdroid_nagios::main::dirs (
 
 ) inherits confdroid_nagios::params {
+  require confdroid_nagios::main::user
   if $ng_nagios_server == $fqdn {
-    require confdroid_nagios::main::user
+    # /etc/nagios/conf.d
+    file { $ng_conf_d_dir:
+      ensure   => directory,
+      path     => $ng_conf_d_dir,
+      owner    => 'root',
+      group    => $ng_user,
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_etc_t,
+      seluser  => system_u,
+    }
 
+    # /etc/nagios/objects
+
+    file { $ng_objects_dir:
+      ensure   => directory,
+      path     => $ng_objects_dir,
+      owner    => 'root',
+      group    => $ng_user,
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_etc_t,
+      seluser  => system_u,
+    }
+
+    # /etc/nagios/private
+
+    file { $ng_private_dir:
+      ensure   => directory,
+      path     => $ng_private_dir,
+      owner    => 'root',
+      group    => $ng_user,
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_etc_t,
+      seluser  => system_u,
+      }
+
+    # include dir
+
+    file { $ng_usr_incl:
+      ensure   => directory,
+      path     => $ng_usr_incl,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => usr_t,
+      seluser  => system_u,
+    }
+
+    # log dir
+
+    file { $ng_log_dir:
+      ensure   => directory,
+      path     => $ng_log_dir,
+      owner    => $ng_user,
+      group    => $ng_user,
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_log_t,
+      seluser  => system_u,
+    }
+
+    # log archives
+
+    file { $ng_log_archives:
+      ensure   => directory,
+      path     => $ng_log_archives,
+      owner    => $ng_user,
+      group    => $ng_user,
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_log_t,
+      seluser  => system_u,
+    }
+
+    # /usr/share/nagios
+
+    file { $ng_usr_share:
+      ensure   => directory,
+      path     => $ng_usr_share,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => usr_t,
+      seluser  => system_u,
+    }
+
+    #  /usr/share/nagios/html
+
+    file { $ng_share_html:
+      ensure   => directory,
+      path     => $ng_share_html,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => usr_t,
+      seluser  => system_u,
+    }
+
+    # run dir for pid file
+
+    file { $ng_run_dir:
+      ensure   => directory,
+      path     => $ng_run_dir,
+      owner    => 'nagios',
+      group    => 'nagios',
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_var_run_t,
+      seluser  => system_u,
+    }
+
+    # cmd dir
+
+    file { $ng_cmd_dir:
+      ensure   => directory,
+      path     => $ng_cmd_dir,
+      owner    => 'nagios',
+      group    => 'nagios',
+      mode     => '0775',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_spool_t,
+      seluser  => system_u,
+    }
+
+    # checkresults dir
+
+    file { $ng_checkresults_dir:
+      ensure   => directory,
+      path     => $ng_checkresults_dir,
+      owner    => 'nagios',
+      group    => 'nagios',
+      mode     => '0770',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_spool_t,
+      seluser  => system_u,
+    }
+  }
+  else {
     file { $ng_main_dir:
       ensure   => directory,
       path     => $ng_main_dir,
@@ -48,161 +201,5 @@ class confdroid_nagios::main::dirs (
       seltype  => nagios_spool_t,
       seluser  => system_u,
     }
-
-    if $::fqdn == $ng_nagios_server {
-      # /etc/nagios/conf.d
-
-      file { $ng_conf_d_dir:
-        ensure   => directory,
-        path     => $ng_conf_d_dir,
-        owner    => 'root',
-        group    => $ng_user,
-        mode     => '0750',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => nagios_etc_t,
-        seluser  => system_u,
-      }
-
-      # /etc/nagios/objects
-
-      file { $ng_objects_dir:
-        ensure   => directory,
-        path     => $ng_objects_dir,
-        owner    => 'root',
-        group    => $ng_user,
-        mode     => '0750',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => nagios_etc_t,
-        seluser  => system_u,
-      }
-
-      # /etc/nagios/private
-
-      file { $ng_private_dir:
-        ensure   => directory,
-        path     => $ng_private_dir,
-        owner    => 'root',
-        group    => $ng_user,
-        mode     => '0750',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => nagios_etc_t,
-        seluser  => system_u,
-      }
-
-      # include dir
-
-      file { $ng_usr_incl:
-        ensure   => directory,
-        path     => $ng_usr_incl,
-        owner    => 'root',
-        group    => 'root',
-        mode     => '0755',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => usr_t,
-        seluser  => system_u,
-      }
-
-      # log dir
-
-      file { $ng_log_dir:
-        ensure   => directory,
-        path     => $ng_log_dir,
-        owner    => $ng_user,
-        group    => $ng_user,
-        mode     => '0750',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => nagios_log_t,
-        seluser  => system_u,
-      }
-
-      # log archives
-
-      file { $ng_log_archives:
-        ensure   => directory,
-        path     => $ng_log_archives,
-        owner    => $ng_user,
-        group    => $ng_user,
-        mode     => '0750',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => nagios_log_t,
-        seluser  => system_u,
-      }
-
-      # /usr/share/nagios
-
-      file { $ng_usr_share:
-        ensure   => directory,
-        path     => $ng_usr_share,
-        owner    => 'root',
-        group    => 'root',
-        mode     => '0755',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => usr_t,
-        seluser  => system_u,
-      }
-
-      #  /usr/share/nagios/html
-
-      file { $ng_share_html:
-        ensure   => directory,
-        path     => $ng_share_html,
-        owner    => 'root',
-        group    => 'root',
-        mode     => '0755',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => usr_t,
-        seluser  => system_u,
-      }
-
-      # run dir for pid file
-
-      file { $ng_run_dir:
-        ensure   => directory,
-        path     => $ng_run_dir,
-        owner    => 'nagios',
-        group    => 'nagios',
-        mode     => '0750',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => nagios_var_run_t,
-        seluser  => system_u,
-      }
-
-      # cmd dir
-
-      file { $ng_cmd_dir:
-        ensure   => directory,
-        path     => $ng_cmd_dir,
-        owner    => 'nagios',
-        group    => 'nagios',
-        mode     => '0775',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => nagios_spool_t,
-        seluser  => system_u,
-      }
-
-      # checkresults dir
-
-      file { $ng_checkresults_dir:
-        ensure   => directory,
-        path     => $ng_checkresults_dir,
-        owner    => 'nagios',
-        group    => 'nagios',
-        mode     => '0770',
-        selrange => s0,
-        selrole  => object_r,
-        seltype  => nagios_spool_t,
-        seluser  => system_u,
-      }
-    }
   }
 }
diff --git a/manifests/main/install.pp b/manifests/main/install.pp
index 7de4830..21656ae 100644
--- a/manifests/main/install.pp
+++ b/manifests/main/install.pp
@@ -10,16 +10,28 @@ class confdroid_nagios::main::install (
     require confdroid_resources
     # if our FQDN matches the configured Nagios server FQDN, install both server-
     # and client packages.
-    if $fqdn == $ng_nagios_server {
-      # we'll need httpd installed
-      require confdroid_apache
+    # we'll need httpd installed
+    require confdroid_apache
 
-      package {$ng_reqpackages_server:
-        ensure => $ng_pkg_ensure,
-      }
-      package {$ng_reqpackages_client:
-        ensure => $ng_pkg_ensure,
-      }
+    package {$ng_reqpackages_server:
+      ensure => $ng_pkg_ensure,
+    }
+    package {$ng_reqpackages_client:
+      ensure => $ng_pkg_ensure,
+    }
+  }
+
+  # if we are not the nagios server, install only client packages
+
+  if $fqdn != $ng_nagios_server {
+    package {$reqpackages_client:
+      ensure => $pkg_ensure,
+    }
+
+    # if we want to use NRPE, install it
+
+    if $ng_include_nrpe == true {
+      require cd_nrpe
     }
   }
 }