without bigger changes, modules.yaml is as clean as possible