Refactored names of the classes to fit the Model, View, Controller
paradigm