Consolidated page classes into fewer page files