KRACOEUS-7120: more service refactoring for s2s

After this point, non-S2S code isn't using what I would consider to be "internal" code from S2S.  The next step is to start creating apis that S2S can consume and look at what S2S is currently consuming and why.