refactoring class names
changed readme