Renaming options class. And removed useless files.