Renaming a bunch of stuff, and add a CompositeView demo.