[t3128] Some restructuring
fixups
fixups