removed useless files & changed class names