Modified templates
Renamed files