Refactoring; added readme