Reworking the naming of the files.
Reworking the naming of the files.
Changed models to be singular