Renamed and restructured the demos.