Moving new email classes to correct spot.