Prep for UC Demo Theater

A lot of tidying up and refactoring.

Some additions to the Sample App for better demoing.