CMS-1925 Move view classes into own module