Renamed demo folders to not imply ordering