Separate functionalities in different classes.
Merge remote-tracking branch 'origin/master'