diff --git a/NEWS b/NEWS
index 6067ff9127be8450c939e0dba512c927397789a8..97b85478e358eefd0c9a1ced15f27bb98ccb9e62 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 release/001.003 (2014-03-07)
     Added jgoode2, pablos, djeanbap
+    Fix file paths to use modules
 
 release/001.002 (2014-03-06)
     Removed slackhar and swilkins.
diff --git a/manifests/init.pp b/manifests/init.pp
index 4110e5381263105f9cb9c99d3bd98b604e807d0b..b4cabbe77e6792778c37f324d58e4c2f4ef592fd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -52,7 +52,7 @@ class oracledb {
         $limitsfile = 'limits.conf'
       }
       file { '/etc/security/limits.conf':
-        source => "puppet:///oracledb/etc/$limitsfile",
+        source => "puppet:///modules/oracledb/etc/$limitsfile",
       }
     }
     ## rhel5
@@ -60,7 +60,7 @@ class oracledb {
       include oracledb::rhel5
 
       file {'/etc/security/limits.conf':
-        source =>  'puppet:///oracledb/etc/limits.conf.rhel5'
+        source =>  'puppet:///modules/oracledb/etc/limits.conf.rhel5'
       }
       base::sysctl { 'net.ipv4.ip_local_port_range':  ensure  => '9000 65500' }
     }
@@ -104,10 +104,10 @@ class oracledb {
   }
   file {
     '/etc/init.d/oracle':
-      source => "puppet:///oracledb/$oracleinit",
+      source => "puppet:///modules/oracledb/$oracleinit",
       mode   => '0755';
     '/etc/filter-syslog/oracle':
-      source => 'puppet:///oracledb/filter-syslog';
+      source => 'puppet:///modules/oracledb/filter-syslog';
   }
 
   service { 'oracle':
diff --git a/manifests/rac.pp b/manifests/rac.pp
index b78b99013c7386ac87aceee4f2d1f1d0b94a5f41..cd5ce852978e7264fde2e491395209f9594bef2c 100644
--- a/manifests/rac.pp
+++ b/manifests/rac.pp
@@ -9,26 +9,26 @@
 # file {
 #   '/u01/app/oracle/.ssh/authorized_keys':
 #            ensure   => file,
-#            source   => "puppet:///CLIENT/u01/app/oracle/dotssh/authorized_keys.${hostname}",
+#            source   => "puppet:///modules/CLIENT/u01/app/oracle/dotssh/authorized_keys.${hostname}",
 #            mode     => 640,
 #            owner    => oracle,
 #            require  => File['/u01/app/oracle/.ssh'];
 #         '/u01/app/oracle/.ssh/id_rsa.pub':
 #            ensure   => file,
-#            source   => "puppet:///CLIENT/u01/app/oracle/dotssh/id_rsa.pub.${hostname}",
+#            source   => "puppet:///modules/CLIENT/u01/app/oracle/dotssh/id_rsa.pub.${hostname}",
 #            mode     => 640,
 #            owner    => oracle,
 #            require  => File['/u01/app/oracle/.ssh'];
 #
 #   '/u01/11.2.0/grid/.ssh/authorized_keys':
 #      ensure   => file,
-#      source   => "puppet:///CLIENT/u01/11.2.0/grid/dotssh/authorized_keys.${hostname}",
+#      source   => "puppet:///modules/CLIENT/u01/11.2.0/grid/dotssh/authorized_keys.${hostname}",
 #      mode     => 640,
 #      owner    => grid,
 #      require  => File['/u01/11.2.0/grid/.ssh'];
 #   '/u01/11.2.0/grid/.ssh/id_rsa.pub':
 #      ensure   => file,
-#      source   => "puppet:///CLIENT/u01/11.2.0/grid/dotssh/id_rsa.pub.${hostname}",
+#      source   => "puppet:///modules/CLIENT/u01/11.2.0/grid/dotssh/id_rsa.pub.${hostname}",
 #      mode     => 640,
 #      owner    => grid,
 #      require  => File['/u01/11.2.0/grid/.ssh'];
@@ -53,7 +53,7 @@
 #  }
 ## bonding setup for NICs to setup LACP mode 1 on nic pairs
 # file { '/etc/modprobe.d/bonding.conf':
-#   source => 'puppet:///CLIENT/etc/modprobe.d/bonding.conf',
+#   source => 'puppet:///modules/CLIENT/etc/modprobe.d/bonding.conf',
 # }
 
 
@@ -101,11 +101,11 @@ class oracledb::rac inherits oracledb::rhel5 {
   }
 
   File['/etc/security/limits.conf'] {
-    source => 'puppet:///oracledb/etc/security/limits.conf'
+    source => 'puppet:///modules/oracledb/etc/security/limits.conf'
   }
 
   file { '/etc/oraInst.loc':
-    source  => 'puppet:///oracledb/etc/oraInst.loc',
+    source  => 'puppet:///modules/oracledb/etc/oraInst.loc',
     require => User['oracle'],
     owner   => 'root',
     mode    => '0644';
@@ -146,7 +146,7 @@ class oracledb::rac inherits oracledb::rhel5 {
 # override ntp config file to use -x flag
 class oracledb::rac::ntpd inherits base::ntp {
   File['/etc/sysconfig/ntpd'] {
-    source => 'puppet:///oracledb/etc/sysconfig/ntpd',
+    source => 'puppet:///modules/oracledb/etc/sysconfig/ntpd',
   }
 }
 
@@ -239,7 +239,7 @@ class oracledb::rac::users inherits user::virtual {
   file {
     '/etc/profile.d/oraclegrid.sh':
       ensure   => file,
-      source   => 'puppet:///oracledb/etc/profile.d/oraclegrid.sh',
+      source   => 'puppet:///modules/oracledb/etc/profile.d/oraclegrid.sh',
       mode     => '0755',
       owner    => 'root',
       group    => 'root';
diff --git a/manifests/tivoli.pp b/manifests/tivoli.pp
index dd17a3f767d562759c845ba69829941868864832..4016b3d98c228254123bc84dcb8bfff38cdcd7bc 100644
--- a/manifests/tivoli.pp
+++ b/manifests/tivoli.pp
@@ -35,7 +35,7 @@ class oracledb::tivoli {
 
   # Install the init script.
   file { '/etc/init.d/dsmc':
-    source => 'puppet:///tivoli_client/init.dsmc.RedHat',
+    source => 'puppet:///modules/tivoli_client/init.dsmc.RedHat',
     mode   => '0775',
     notify => Exec['add dsmc'],
   }
diff --git a/manifests/v11g.pp b/manifests/v11g.pp
index a5b19182e6b29b01c15d8c6aaab91f5656e8fd67..5213a98894e848b86b05f1fd0dae8c425c737a5a 100644
--- a/manifests/v11g.pp
+++ b/manifests/v11g.pp
@@ -38,7 +38,7 @@ class oracledb::v11g inherits oracledb  {
         ensure  => '9000 65500'
       }
       file {'/etc/security/limits.conf':
-        source => 'puppet:///oracledb/etc/limits.conf.rhel6'
+        source => 'puppet:///modules/oracledb/etc/limits.conf.rhel6'
       }
     }
     '5' : {