And move them in separate top level classes so that presubmit runs them. #minor-release PiperOrigin-RevId: 427482430
