Restructure demo examples