Moved some classes.