Initial revision of the spring boot refactor