Merge branch 'devel' into 'testing'

Restructure the codes

See merge request !88
1 job for testing in 27 seconds