class and filenames updated