General Update

Changes to demo data, folder structure etc.