restructuring of core components