Refactoring, some changes in readme.