Adding Readme.md + refactoring