Phd spring cloud

Update to use spring-cloud

- Change direct instantiation in favor of DI in a few places