Migrate to spring-boot