Removed useless includes. Remaned classes to something more appropiate.