Re-organize demo