Adjust the organizations of classes