[Yujun] Organized some classes.