Fixed class names
Removed accidently copied files