Merge branch 'earndt-standardize-directory-structure' into 'dev'

[Supp]  Standardizes directory structure [@earndt]

See merge request !14
Status Job ID Name Coverage
  Docker
canceled #3599
docker-build