Update demo

Reorganize demo files.