changing from framework structure to component structure