Grid and normalize restructure