Merge "Split off remaining helper classes for special pages to separate files"