[TASK] Rework TemplateFiles