KRACOEUS-7065 moving some s2s code into s2s

This pull request is just moving s2s code into s2s but no other code reorganization is being done at this time.