Reorganize demo blocks