Init project structure
Merge branch 'develop'