Update README.md
Change project structure a little
Merge remote-tracking branch 'upstream/master'