Remove unnecesary file
Change class name