Add #163: Use subdirectories in the certificate-directory