diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp
index 5af3429..729f2c2 100644
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -7,6 +7,6 @@ class puppet_cd::main::dirs (
 
 ) inherits puppet_cd::params  {
 
-  include puppet_cd::main::install
+  require puppet_cd::main::install
 
 }
diff --git a/manifests/main/files.pp b/manifests/main/files.pp
index f437985..5e0e127 100644
--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -7,14 +7,14 @@ class puppet_cd::main::files (
 
 ) inherits puppet_cd::params  {
 
-  include puppet_cd::main::dirs
+  require puppet_cd::main::dirs
 
-#  if $fqdn == $pt_puppetmaster {
-#    # server files
-#  }
+  if $fqdn == $pt_puppetmaster {
+    # server files
+  }
 
-#  if $fqdn != $pt_puppetmaster {
-#    # client files
-#  }
+  if $fqdn != $pt_puppetmaster {
+    # client files
+  }
 
 }
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index 2a4991b..a503eca 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -9,8 +9,8 @@ class puppet_cd::server::service (
 
   if $fqdn == $pt_puppetmaster {
 
-    include puppet_cd::firewall::iptables
-    include puppet_cd::main::files
+    require puppet_cd::firewall::iptables
+    require puppet_cd::main::files
 
     # manage puppet server service