Moved views and models into separate files.  Replaced cut and paste code...

... with common classes.