First step of restructuring for #665 and #681
Authored by: numere 2022-04-02
Parent: [r1113]
Child: [r1115]