Merge branch 'folder-hierarchy' into 'develop'

Fixed folder hierarchy

See merge request !2
Status Job ID Name Coverage
  Build
canceled #2971
build

 
  Test
canceled #2973
allowed to fail
code_quality

canceled #2972
test