diff --git a/manifests/main/config.pp b/manifests/main/config.pp
index 2048324..9f40123 100644
--- a/manifests/main/config.pp
+++ b/manifests/main/config.pp
@@ -8,7 +8,6 @@ class confdroid_nagios::main::config (
 ) inherits confdroid_nagios::params {
   if $fqdn == $ng_nagios_server {
     include confdroid_nagios::server::service
-    include confdroid_nagios::nagios::resources::resource
   }
 
   include confdroid_nagios::client::target
diff --git a/manifests/nagios/objects/commands.pp b/manifests/nagios/objects/commands.pp
new file mode 100644
index 0000000..a8d4bf9
--- /dev/null
+++ b/manifests/nagios/objects/commands.pp
@@ -0,0 +1,222 @@
+## confdroid_nagios::nagios::objects::commands.pp
+# Module name: confdroid_nagios
+# Author: 12ww1160 (12ww1160@confdroid.com)
+
+# @summary  Class manages all commands known to NAGIOS through Puppet exports,
+#   and populates /etc/nagios/conf.d/nagios_commands.cfg.
+################################################################################
+class confdroid_nagios::nagios::objects::commands (
+
+) inherits confdroid_nagios::params {
+  if $fqdn == $ng_nagios_server {
+    @@nagios_command { 'notify-host-by-email':
+      ensure       => present,
+      command_name => 'notify-host-by-email',
+      command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **" $CONTACTEMAIL$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'notify-service-by-email':
+      ensure       => present,
+      command_name => 'notify-service-by-email',
+      command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check-host-alive':
+      ensure       => present,
+      command_name => 'check-host-alive',
+      command_line => '$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_disk':
+      ensure       => present,
+      command_name => 'check_disk',
+      command_line => '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_local_load':
+      ensure       => present,
+      command_name => 'check_local_load',
+      command_line => '$USER1$/check_load -w $ARG1$ -c $ARG2$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_local_procs':
+      ensure       => present,
+      command_name => 'check_local_procs',
+      command_line => '$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_local_users':
+      ensure       => present,
+      command_name => 'check_local_users',
+      command_line => '$USER1$/check_users -w $ARG1$ -c $ARG2$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_local_swap':
+      ensure       => present,
+      command_name => 'check_local_swap',
+      command_line => '$USER1$/check_swap -w $ARG1$ -c $ARG2$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_ftp':
+      ensure       => present,
+      command_name => 'check_ftp',
+      command_line => '$USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_snmp':
+      ensure       => present,
+      command_name => 'check_snmp',
+      command_line => '$USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_http':
+      ensure       => present,
+      command_name => 'check_http',
+      command_line => '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_ssh':
+      ensure       => present,
+      command_name => 'check_ssh',
+      command_line => '$USER1$/check_ssh $ARG1$ $HOSTADDRESS$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_ping':
+      ensure       => present,
+      command_name => 'check_ping',
+      command_line => '$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_tcp':
+      ensure       => present,
+      command_name => 'check_tcp',
+      command_line => '$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_udp':
+      ensure       => present,
+      command_name => 'check_udp',
+      command_line => '$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_nrpe':
+      ensure       => present,
+      command_name => 'check_nrpe',
+      command_line => '$USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ -c $ARG1$  -a $ARG2$ $ARG3$ $ARG4$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_nagios':
+      ensure       => present,
+      command_name => 'check_nagios',
+      command_line => '$USER1$/check_nagios -F $ARG1$ -e $ARG2$ -C $ARG3$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'check_bandwidth':
+      ensure       => present,
+      command_name => 'check_bandwidth',
+      command_line => '$USER1$/check_bandwidth.sh -t 30 -H $HOSTADDRESS$ linux  $ARG1$  $ARG2$ $ARG3$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'process-service-perfdata-file':
+      ensure       => present,
+      command_name => 'process-service-perfdata-file',
+      command_line => '/bin/mv /var/log/pnp4nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command { 'process-host-perfdata-file':
+      ensure       => present,
+      command_name => 'process-host-perfdata-file',
+      command_line => '/bin/mv /var/log/pnp4nagios/host-perfdata /var/spool/pnp4nagios/host-perfdata.$TIMET$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+
+    @@nagios_command {  'check_ntp_time':
+      ensure       => present,
+      command_name => 'check_ntp_time',
+      command_line => '$USER1$/check_ntp_time -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$',
+      owner        => 'nagios',
+      group        => 'nagios',
+      mode         => '0640',
+      target       => $ng_target_command,
+    }
+  }
+}
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index bb44dc2..ddfc561 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -9,6 +9,8 @@ class confdroid_nagios::server::service (
   require confdroid_nagios::server::files
   if $ng_nagios_server == $fqdn {
     require confdroid_nagios::server::access_rules
+    require confdroid_nagios::nagios::resources::resource
+    require confdroid_nagios::nagios::objects::commands
 
     exec { 'restart_httpd':
       command     => 'systemctl restart httpd',