Refactor related to remove Controller, ViewModel etc
Merge remote-tracking branch 'origin/master'