update project structure
Merge pull request #1 from cstoquer/master

update project structure