Changes to XAML stuff.

Moved some of the XAML files to the common folder.  Trying to reorganize
some of the XAML code.