Started restructure