re-organized demos