Adding the MVC Architecture