Improving the organization of classes