rearrangements

Changed location of things, no major changes here in Model or
Controller.  Mostly view stuff.