Reorganizing some of the core classes.