Added a comment
Reorganized classes and separated the Receivers.