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

...he api versus the impl
@gathreya this is the best I could do.  I thought I might be able to do: ```FormMappingServiceImpl.class.getPackage().getName().replaceAll(".", "/")``` to get the package path.  Unfortunately you cannot do that in an annotation even when it is in a String constant.  Sort of makes sense really because this constant would be figured out at class load time