Updated README.md, source refactored