Code base restructuring