arraged project structure; some tiny changes.
fixed a mistake
Merge pull request #3 from xingrz/master

Arranged project structure and other changes