[t3128] Some restructuring