Massive refactoring using Spring MVC and Spring Data