v 1.0

Changed class names