Finish rewriting the existing Java classes.