updated project structure
Merge branch 'master' into release