Move stanard demo files into subdir
Renamed standard demo files in line with import script
Merge branch 'master' of https://github.com/pmsoftware/odietamo