Refractored the files to match the real name of the Class