#914 - Page / PageTemplate / PageField refactoring