Modified because there was the case of outputting an invalid template
Remove unnecessary files
Merge branch 'feature/fix-convert' into develop