convertin to spring-boot, step 2: marge controllers