restructure demo