diff --git a/hieradata/roles/apps.yaml b/hieradata/roles/apps.yaml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/hieradata/roles/apps.yaml
@@ -0,0 +1 @@
+---
diff --git a/hieradata/roles/puppet.yaml b/hieradata/roles/infra.yaml
similarity index 100%
rename from hieradata/roles/puppet.yaml
rename to hieradata/roles/infra.yaml
diff --git a/hieradata/roles/puppet/puppetmaster.yaml b/hieradata/roles/infra/puppet/master.yaml
similarity index 89%
rename from hieradata/roles/puppet/puppetmaster.yaml
rename to hieradata/roles/infra/puppet/master.yaml
index 25403d8..5a5f87c 100644
--- a/hieradata/roles/puppet/puppetmaster.yaml
+++ b/hieradata/roles/infra/puppet/master.yaml
@@ -9,8 +9,6 @@ profiles::puppet::autosign::domains:
 #  - 'somenode.main.unkin.net'
 
 profiles::puppet::enc::repo: https://git.unkin.net/unkinben/puppet-enc.git
-profiles::puppet::enc::release: '0.7.1'
-profiles::puppet::enc::force: true
 profiles::puppet::r10k::r10k_repo: https://git.unkin.net/unkinben/puppet-r10k.git
 profiles::puppet::g10k::bin_path: '/opt/puppetlabs/bin/g10k'
 profiles::puppet::g10k::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml'
diff --git a/site/roles/manifests/puppet/puppetmaster.pp b/site/roles/manifests/infra/puppet/master.pp
similarity index 81%
rename from site/roles/manifests/puppet/puppetmaster.pp
rename to site/roles/manifests/infra/puppet/master.pp
index b87f183..01e8877 100644
--- a/site/roles/manifests/puppet/puppetmaster.pp
+++ b/site/roles/manifests/infra/puppet/master.pp
@@ -1,6 +1,6 @@
 # a role to deploy the puppetmaster
 # work in progress
-class roles::puppet::puppetmaster {
+class roles::infra::puppet::master {
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetmaster
diff --git a/site/roles/manifests/puppet/puppetboard.pp b/site/roles/manifests/infra/puppetboard/server.pp
similarity index 76%
rename from site/roles/manifests/puppet/puppetboard.pp
rename to site/roles/manifests/infra/puppetboard/server.pp
index 34862c3..4742810 100644
--- a/site/roles/manifests/puppet/puppetboard.pp
+++ b/site/roles/manifests/infra/puppetboard/server.pp
@@ -1,5 +1,5 @@
 # a role to deploy the puppetboard
-class roles::puppet::puppetboard {
+class roles::infra::puppetboard::server {
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetboard
diff --git a/site/roles/manifests/puppet/puppetdb_api.pp b/site/roles/manifests/infra/puppetdb/api.pp
similarity index 80%
rename from site/roles/manifests/puppet/puppetdb_api.pp
rename to site/roles/manifests/infra/puppetdb/api.pp
index 991102d..65bee4c 100644
--- a/site/roles/manifests/puppet/puppetdb_api.pp
+++ b/site/roles/manifests/infra/puppetdb/api.pp
@@ -1,5 +1,5 @@
 # a role to deploy the puppetdb api service
-class roles::puppet::puppetdb_api {
+class roles::infra::puppetdb::api {
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetdb_api
diff --git a/site/roles/manifests/puppet/puppetdb_sql.pp b/site/roles/manifests/infra/puppetdb/sql.pp
similarity index 81%
rename from site/roles/manifests/puppet/puppetdb_sql.pp
rename to site/roles/manifests/infra/puppetdb/sql.pp
index db640a3..97ebc96 100644
--- a/site/roles/manifests/puppet/puppetdb_sql.pp
+++ b/site/roles/manifests/infra/puppetdb/sql.pp
@@ -1,5 +1,5 @@
 # a role to deploy the puppetdb postgresql service
-class roles::puppet::puppetdb_sql {
+class roles::infra::puppetdb::sql {
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetdb_sql
diff --git a/site/roles/manifests/puppet/puppetdb.pp b/site/roles/manifests/puppet/puppetdb.pp
deleted file mode 100644
index 29ece76..0000000
--- a/site/roles/manifests/puppet/puppetdb.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-# a role to deploy the puppetdb
-# work in progress
-class roles::puppet::puppetdb {
-    include profiles::defaults
-    include profiles::base
-    include profiles::puppet::puppetdb
-  }