restructure demo folder