init basic infrastructure
Merge branch 'feature/infrastructure' into develop
Merge branch 'develop'