[Pki-devel] [PATCH] 180 Reorganized common templates.