After trying the new layout, it came to my attention that we need to be more correct in our naming of the PKI certificates that we're placing on the system.
The new directory scheme was set for /etc/pki/simp_apps/<app_name>/pki. This is not correct as to what we're actually placing in there (x.509 material) and should be changed to /etc/pki/simp_apps/<app_name>/x509.
This will have a ripple effect but will prevent further large breaking changes down the road when we want to support additional certificate types (GPG, PKCS12, JAVA Keystores, etc...).
Done in simp_apache
Done in rsyslog
Done in libreswan
done in simp_elasticsearch
done in grafana