Refactor the file structure
Update usage in README.md