Reorganize Sender side classes