Refactor to separate website from corpus pages