Merge branch 'restructuring-part-1' into 'master'

Restructuring part 1

See merge request !86
1 job for master
in 4 minutes and 17 seconds, using 0.0 compute credits, and was queued for 0 seconds