Change Refactor: Get rid of Model and View