Fixed classe names.
Removed useless library