Merge branch 'new_layout' into 'testing'

folder structure adapted

See merge request !5

1 job for testing in 1 second (queued for 1 second)

26cfabdb