Restructured following guidlines in the spring-boot docs