Adjust to new directory structure.
enabled an automatic merge when the pipeline for 2b8025ef succeeds
canceled the automatic merge
mentioned in commit 883843f2
merged