re-organized demo location