Reorganize template structure

Merge request reports

Loading