OP-4611 clean up v3 into its own namespace