Switch to spring-cloud organizations
Switch submodules to spring-cloud