convert from component to organisation to better match GW