+ migrate Pages to base package to reduce cyclic references