Refactoring to group all viewable classes