Restructuring for #665 and #681
Parser is runnable again
Authored by: numere 2022-04-03
Parent: [r1114]
Child: [r1116]
