Add README.md and refactor