Inbetween step before demos set up refactor

All demo metadata is put together as an xml file. This commit contains
the original code with the metadata, and the code which generates the
new xml from it.