Started changing some repeated files to templates
Started changing some repeated files to templates