Email: move Email.java to persistence (common)