consumer/provider restructure