Fixed bug & refactor
Update README.md
Removed unnecessary files