Moved two classes.