Template xslt refactor

Signed-off-by: Pascal Piché <pascal@nitriques.com>
Still continue to refactor xslt

Signed-off-by: Pascal Piché <pascal@nitriques.com>