KCINFR-979: moving some s2s xml files

moving some s2s xml files in preparation for s2s work