Clean up structure and use spring-cloud
Use spring-cloud's Java config
Merge branch 'spring-cloud'