new templates name, plus new files strcture