renamed Application classes.  Updates for demos.