Component restructuring