Project refactoring.
Update readme.md