Changed to spring mvc 4.1.1. Some refactoring