Restructured applications demonstrators to not be a task, but be a deliverable in existing task