Merge branch '35-improve-ci-template-organization' into 'master'

Resolve "Improve CI template organization"

Closes #35

See merge request !64
4 jobs for master in 8 seconds (queued for 3 seconds)