move some method to new classes.