Update some demos
Reorganizing content