Changing the names of the files to reflect classes