diff --git a/openvpn/manifests/init.pp b/openvpn/manifests/init.pp
index 4029e77..413eeea 100644
--- a/openvpn/manifests/init.pp
+++ b/openvpn/manifests/init.pp
@@ -9,10 +9,20 @@ class openvpn::client {
     service { "openvpn":
         ensure  => running,
         enable  => true,
-        require => Package["openvpn"],
-	require => File["/etc/openvpn/openvpn.conf"],
-	require => File["/etc/openvpn/ta.key"],
-	require => File["/etc/openvpn/ca.crt"],
+	require => [Package["openvpn"],File["/etc/openvpn/openvpn.conf"],File["/etc/openvpn/ta.key"],File["/etc/openvpn/ca.crt"],],
+    }
+
+    if !$openvpn_server {
+        $openvpn_server = "127.0.0.1"
+    }
+    if !$openvpn_port {
+        $openvpn_port = "1194"
+    }
+    if !$openvpn_ca {
+        $openvpn_ca = "ca.crt"
+    }
+    if !$openvpn_ta {
+        $openvpn_ta = "ta.key"
     }
 
     file { "/etc/openvpn/openvpn.conf":
@@ -26,7 +36,7 @@ class openvpn::client {
     }
     file { "/etc/openvpn/ta.key":
         ensure  => present,
-        source  => "puppet:///files/openvpn/ta.key",
+        source  => "puppet:///openvpn/ta.key",
         mode    => 0640,
         owner   => root,
         group   => root,
@@ -34,22 +44,10 @@ class openvpn::client {
     }
     file { "/etc/openvpn/ca.crt":
         ensure  => present,
-        source  => "puppet:///files/openvpn/ca.crt",
+        source  => "puppet:///openvpn/ca.crt",
         mode    => 0640,
         owner   => root,
         group   => root,
         require => Package["openvpn"],
     }
-    if !$openvpn_server {
-        $openvpn_server = "127.0.0.1"
-    }
-    if !$openvpn_port {
-        $openvp_port = "1194"
-    }
-    if !$openvpn_ca {
-        $openvpn_ca = "ca.crt"
-    }
-    if !$openvpn_ta {
-        $openvp_ta = "ta.key"
-    }
 }