Moved two base classes.