Update demo + new directory structure