Fix Page import across all the files
Merge pull request #163 from willkg/fix-pages

Fix Page import across all the files