Renamed Controller -> Presenter to better reflect its role
Moved a method