chore(demos): rearrange some demos, random demo code cleanup, simplify demos