changed the organization of the project
Merge branch 'develop'