Project restructuring, adding MEF