directory layout
Merge branch 'master' into ifm-5.4-import