Figure restructure