Finish routes refactoring to Spring MVC