S2s service design

This migrates several s2s classes to spring managed beans