Rearrange EA-related classes.