Refactored classnames and updated readme