Moved templates, updated templates