refactor of the templates
New templates files