Rework folder hierarchy

parent 1441436e
Pipeline #179554 failed with stages
in 10 minutes and 47 seconds