Update of Readme and some classname changes