KRACOEUS-6956: autowiring services.  Renaming a service with the same na...

...me as another service, moving a couple prop dev classes