Divided viewer classes into more packages