Restructuring

Restructuring e-mail deltas