(PDB-551) Move v4 files into shared ones in prep

Signed-off-by: Ken Barber <ken@bob.sh>