Moves demo files into demo dir
Adds demo app and many improvements