Merge branch 'UpdateBuildStructure' into 'master'

simplified build

See merge request !4
2 jobs for master in 44 seconds