Fix join error, move 4 classes.