Rename Class

Rename some class
Delete unused file

Delete unused file