Demo-data updated
Restructuring
Merge branch 'master' into demo