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

...he api versus the impl
I have been for a couple reasons: 1) so they still compile and 2) so devs can refer to them when creating controllers