Refactoring, readme update.