diff --git a/manifests/server/nagios.pp b/manifests/server/nagios.pp
deleted file mode 100644
index c72114c..0000000
--- a/manifests/server/nagios.pp
+++ /dev/null
@@ -1,122 +0,0 @@
-## confdroid_nagios::server::nagios.pp
-# Module name: confdroid_nagios
-# Author: 12ww1160 (12ww1160@confdroid.com)
-# @summary  Class manages nagios resources for the confdroid_nagios module.
-###############################################################################
-class confdroid_nagios::server::nagios (
-
-) inherits confdroid_nagios::params {
-  if $ng_nagios_server == $fqdn {
-    @@nagios_service { 'check_nagios_localhost':
-      check_command       => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
-      use                 => 'generic-service',
-      host_name           => 'localhost',
-      notification_period => '24x7',
-      service_description => 'localhost_nagios_service',
-      target              => $ng_target_service,
-      owner               => $ng_user,
-      group               => $ng_user,
-      mode                => '0640',
-      contacts            => $ng_contact_name,
-      notify              => Service[$ng_service],
-    }
-
-    @@nagios_service { 'root_partition_localhost':
-      ensure              => $ng_disk_ensure,
-      check_command       => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
-      use                 => 'generic-service',
-      host_name           => 'localhost',
-      contacts            => $ng_contact_name,
-      notification_period => '24x7',
-      service_description => 'localhost_root_partition',
-      servicegroups       => 'linux-services',
-      target              => $ng_target_service,
-      owner               => $ng_user,
-      group               => $ng_user,
-      mode                => '0640',
-      notify              => Service[$ng_service],
-    }
-
-    if $ng_enable_swap_check == true {
-      @@nagios_service { 'Swap_Usage_localhost':
-        ensure              => $ng_swap_ensure,
-        check_command       => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
-        use                 => 'generic-service',
-        host_name           => 'localhost',
-        contacts            => $ng_contact_name,
-        notification_period => '24x7',
-        service_description => 'localhost_swap_usage',
-        servicegroups       => 'linux-services',
-        target              => $ng_target_service,
-        owner               => $ng_user,
-        group               => $ng_user,
-        mode                => '0640',
-        notify              => Service[$ng_service],
-      }
-    }
-
-    @@nagios_service { 'Local_Users_localhost':
-      ensure              => $ng_users_ensure,
-      check_command       => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
-      use                 => 'generic-service',
-      host_name           => 'localhost',
-      contacts            => $ng_contact_name,
-      notification_period => '24x7',
-      service_description => 'localhost_local_users',
-      servicegroups       => 'linux-services',
-      target              => $ng_target_service,
-      owner               => $ng_user,
-      group               => $ng_user,
-      mode                => '0640',
-      notify              => Service[$ng_service],
-    }
-
-    @@nagios_service { 'Total_Processes_localhost':
-      ensure              => $ng_procs_tot_ensure,
-      check_command       => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
-      use                 => 'generic-service',
-      host_name           => 'localhost',
-      contacts            => $ng_contact_name,
-      notification_period => '24x7',
-      service_description => 'localhost_total_processes',
-      servicegroups       => 'linux-services',
-      target              => $ng_target_service,
-      owner               => $ng_user,
-      group               => $ng_user,
-      mode                => '0640',
-      notify              => Service[$ng_service],
-    }
-
-    @@nagios_service { 'Zombie_Processes_localhost':
-      ensure              => $ng_procs_z_ensure,
-      check_command       => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
-      use                 => 'generic-service',
-      host_name           => 'localhost',
-      contacts            => $ng_contact_name,
-      notification_period => '24x7',
-      service_description => 'localhost_zombie_processes',
-      servicegroups       => 'linux-services',
-      target              => $ng_target_service,
-      owner               => $ng_user,
-      group               => $ng_user,
-      mode                => '0640',
-      notify              => Service[$ng_service],
-    }
-
-    @@nagios_service { 'Current_Load_localhost':
-      ensure              => $ng_load_ensure,
-      check_command       => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
-      use                 => 'generic-service',
-      host_name           => 'localhost',
-      contacts            => $ng_contact_name,
-      notification_period => '24x7',
-      service_description => 'localhost_current_load',
-      servicegroups       => 'linux-services',
-      target              => $ng_target_service,
-      owner               => $ng_user,
-      group               => $ng_user,
-      mode                => '0640',
-      notify              => Service[$ng_service],
-    }
-  }
-}
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index 13cbdad..1c143fb 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -10,7 +10,6 @@ class confdroid_nagios::server::service (
   if $ng_nagios_server == $fqdn {
     require confdroid_nagios::server::access_rules
     require confdroid_nagios::nagios::config
-    require confdroid_nagios::server::nagios
 
     exec { 'ng_restart_httpd':
       command     => 'systemctl restart httpd',
@@ -44,6 +43,118 @@ class confdroid_nagios::server::service (
       notify              => Service[$ng_service],
     }
 
+    @@nagios_service { 'check_nagios_localhost':
+      check_command       => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      notification_period => '24x7',
+      service_description => 'localhost_nagios_service',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      contacts            => $ng_contact_name,
+      notify              => Service[$ng_service],
+    }
+
+    @@nagios_service { 'root_partition_localhost':
+      ensure              => $ng_disk_ensure,
+      check_command       => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_root_partition',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
+    if $ng_enable_swap_check == true {
+      @@nagios_service { 'Swap_Usage_localhost':
+        ensure              => $ng_swap_ensure,
+        check_command       => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
+        use                 => 'generic-service',
+        host_name           => 'localhost',
+        contacts            => $ng_contact_name,
+        notification_period => '24x7',
+        service_description => 'localhost_swap_usage',
+        servicegroups       => 'linux-services',
+        target              => $ng_target_service,
+        owner               => $ng_user,
+        group               => $ng_user,
+        mode                => '0640',
+        notify              => Service[$ng_service],
+      }
+    }
+
+    @@nagios_service { 'Local_Users_localhost':
+      ensure              => $ng_users_ensure,
+      check_command       => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_local_users',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
+    @@nagios_service { 'Total_Processes_localhost':
+      ensure              => $ng_procs_tot_ensure,
+      check_command       => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_total_processes',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
+    @@nagios_service { 'Zombie_Processes_localhost':
+      ensure              => $ng_procs_z_ensure,
+      check_command       => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_zombie_processes',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
+    @@nagios_service { 'Current_Load_localhost':
+      ensure              => $ng_load_ensure,
+      check_command       => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
+      use                 => 'generic-service',
+      host_name           => 'localhost',
+      contacts            => $ng_contact_name,
+      notification_period => '24x7',
+      service_description => 'localhost_current_load',
+      servicegroups       => 'linux-services',
+      target              => $ng_target_service,
+      owner               => $ng_user,
+      group               => $ng_user,
+      mode                => '0640',
+      notify              => Service[$ng_service],
+    }
+
     resources { ['nagios_host',
         'nagios_hostgroup',
         'nagios_hostdependency',