Revert "swap to default structure"

This reverts commit c6a4f74e

Default structure was no improvement

Merge request reports

Loading