Folder renamed templates to files
Mark with methods to help checking registered marks.