Improve structuration of classes.