MDL-31989: Changing and restructuring minor components