Clean up and Rename

Deleted useless files and change to more accurate name.