Renamed files for generic, add both templates