Some refactoring, added readme