Reorganized classes.