fixing imports, partway through changing email class