Commit work done so far.
Moved Page classes to their own directory.
Fixed fallout from move of pages to Page folder.
Fixed broken pages and forms.