Changed class and file name