Moving demo into a demo folder.
Made demo better.  Stuff works less horribly.