TemplateUtils update
Import of new naming structure and History dir