Not breaking MVC architecture anymore. Everything is where it is supposed to.