diff --git a/manifests/params.pp b/manifests/params.pp
index a47b23a..5177ffc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -57,8 +57,9 @@ class postgresql_cd::params (
   $pl_data_dir              = '/var/lib/pgsql/data/'
 
   # files
-  $pl_pg_hba_conf        = "${pl_data_dir}/pg_hba.conf"
-  $pl_pg_hba_rule_conf      = 'postgresql_cd/pg_hba_rule.conf.erb'
+  $pl_pg_hba_conf           = "${pl_data_dir}/pg_hba.conf"
+  $pl_pg_hba_rule_conf      = 'postgresql_cd/server/pghba/pg_hba_rule.conf.erb'
+  $pl_pg_hba_conf_erb       = 'postgresql_cd/server/pghba/pg_hba.conf.erb'
 
   # includes must be last
   include postgresql_cd::main::config
diff --git a/templates/pg_hba.conf.erb b/templates/server/pghba/pg_hba.conf.erb
similarity index 100%
rename from templates/pg_hba.conf.erb
rename to templates/server/pghba/pg_hba.conf.erb
diff --git a/templates/pg_hba_rule.conf.erb b/templates/server/pghba/pg_hba_rule.conf.erb
similarity index 100%
rename from templates/pg_hba_rule.conf.erb
rename to templates/server/pghba/pg_hba_rule.conf.erb