Many changes, including transformation Main into class
Merge remote-tracking branch 'origin/master'