Move it java sources into place, adjust for lack of test-jar
apply standard headers
reduce to package private, to be clear these aren't leaking out (duplicated yes, but not leaking)