Updated readme and some class names