Normalize layout

assigned to @benoit

created branch 48-normalize-layout to address this issue

mentioned in merge request !46 (merged)

mentioned in commit c6ab1240

closed with merge request !46 (merged)