restructure master