Views-related classes restructuring, first cut