Refactor main package
Change README.md file