Views-related classes restructuring, first cut
Merge pull request #285 from kordero/19975

Views-related classes restructuring, first cut