Reorganized the folder structure for demos into something easier.