Merge pull request #1 from chaserhkj/master

updated project structure.
issue3