Updating demo for new file structure