Adding template files correctly this time