Fixing demo for new directory structure