Reorganize demo/