Renamed the files and removed need for template file