KCINFR-979: repackaging some incorrect apis, repackaging s2s to denote t...

...he api versus the impl
no kidding these question ids strung all over our app is sloppy.  Either way there is a ton of duplication in s2s that should be cleaned up ideally.