Do some clean up reorganizing methods class data into new classes.