Move pages stuff out of master