moved a few classes to EA