Change readme, refactoring, bump version