Prep for UC Demo Theater

Lots of refactoring and renaming