Upgrading to MVC4 and .Net 4.5 and refactoring