Pull the VDMJ Client back into core/ (see #351).