Partial goal of refactoring into a better MVC design complete