Moved to Demo Directory

I've updated the demo app a little to be clear (and build). Also moved to a subdirectory.